Zbiór zmian 952 dla trunk/eCard/eCardMVC/Platnosci/Models

Data:

2009-12-15 14:06:23 (16 years ago)

Autor:

alina

Opis:

re #215 testy i male przerobki (zmiana logo itp.)

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Models

Pliki:

• FunkcjePlatnosci.cs (zmodyfikowane) (5 diffs)
• eCardData.cs (zmodyfikowane) (4 diffs)

trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs

@@ -20 +20 @@
         public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
         public const string KODOWANIE = "ISO-8859-2";
+        private IRepository<PlatnosciEcard> _repPayment;
+        private readonly ITranslateManager _translateManager;
 
+        public FunkcjePlatnosci()
+        {
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
+            _translateManager = new Translation();     
+        }
+
+        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment)
+        {
+            _repPayment = repPayment;
+            _translateManager = new Translation();    
+        }
+        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
+        {
+            _repPayment = repPayment;
+            _translateManager = translate;
+        }
         public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
         {
@@ -39 +57 @@
         public Waluta SetAmount(vPlatnosciEcard platnosc)
         {
-            var waluta = new Waluta {Amount = Convert.ToInt32(platnosc.Brutto*100)};
-
+            var waluta = new Waluta();
+            
             if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN")
             {
@@ -59 +77 @@
             else
             {
+                waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
                 waluta.Currency = PLN;
             }
@@ -123 +142 @@
             return er;
         }
-        public PlatnosciEcard CreateAndAddNewPyment(vPlatnosciEcard platnosc, Waluta waluta, Payer payer, IRepository<PlatnosciEcard> _repPayment, string sessionId)
+        public PlatnosciEcard CreateAndAddNewPyment(vPlatnosciEcard platnosc, Waluta waluta, Payer payer, string sessionId)
         {
             var newPayment = new PlatnosciEcard();
@@ -145 +164 @@
             newPayment.Status_data = null;
 
-            if (newPayment != null)
-            {
-                _repPayment.Insert(newPayment);
-                return newPayment;
-            }
-            return null;
+            _repPayment.Insert(newPayment);
+            return newPayment;
+        }
+        public ErrorViewData IsError(vPlatnosciEcard platnosc, String UserName)
+        {
+            var errortxt = "";
+
+            if (platnosc == null)
+                errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
+            else if (!UserIdentity(platnosc, UserName))
+                errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");
+
+            return InitErrorViewData(errortxt, 0);
         }
     }

trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs

@@ -1 +1 @@
 using System;
 using System.Web;
-using Platnosci.Core.Linq;
-using System.Configuration;
-using Platnosci.Core.Interface;
 using System.Net;
 using System.IO;
 using System.Linq;
 using System.Web.Mvc;
+using System.Configuration;
+using Platnosci.Core.Linq;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Models
@@ -20 +20 @@
         {
             _repPayment = repPayment;
-            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
         }
 
@@ -41 +41 @@
         public Merchant CreateMerchantData(vPlatnosciEcard invoice, Payer payer, string lang, string sessionId)
         {
+            var merchant = new Merchant();
+           
             var waluta = _funkcjePlatnosci.SetAmount(invoice);
-            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, _repPayment, sessionId);
+            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
 
-            var merchant = new Merchant();
             merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
             if (ConfigurationManager.AppSettings["wersja"] == "TEST")
@@ -66 +67 @@
             merchant.LinkOk = linkOk;
             merchant.LinkFail = linkFail;
+
+            if (merchant != null) merchant.IsValid();
 
             return merchant;