Zbiór zmian 984 dla trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs

Data:

2009-12-28 15:17:15 (16 years ago)

Autor:

alina

Opis:

re #215 ujednolicenie nazw obiektow, modyfikacje dotyczace testow interfejsowych (dodanie tymczasowych rekowrdow do bazy na czas testowania )

Pliki:

• trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs (zmodyfikowane) (2 diffs)

trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs

@@ -40 +40 @@
             _translateManager = translate;
         }
-        public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
+        public string BruttoToString(decimal? kwota, decimal? waluta_brutto, string miano)
         {
             var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
 
             if (!String.IsNullOrEmpty(miano))
-                if (waluta > 0 && miano.ToUpper() != "PLN")
-                    brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
+                if (waluta_brutto > 0 && miano.ToUpper() != "PLN")
+                    brutto += "(" + (waluta_brutto.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
             
             return brutto;
         }
 
-        public bool UserIdentity(Invoice platnosc, string userName)
+        public bool UserIdentity(Invoice invoice, string userName)
         {
-            return platnosc != null && platnosc.nip == userName;
+            return invoice != null && invoice.nip == userName;
         }
 
-        public Waluta SetAmount(Invoice platnosc)
+        public Waluta SetAmount(Invoice invoice)
         {
-            var waluta = new Waluta {Currency = GetCurrency(platnosc.waluta_miano)};
+            var waluta = new Waluta {Currency = GetCurrency(invoice.waluta_miano)};
 
-            waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100);
+            waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(invoice.Brutto * 100) : Convert.ToInt32(invoice.waluta_brutto * 100);
             
             return waluta;
@@ -144 +144 @@
             return er;
         }
-        public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId)
+        public PlatnosciEcard CreateAndAddNewPyment(Invoice invoice, Waluta waluta, Payer payer, string sessionId)
         {
-            var newPayment = new PlatnosciEcard();
-            newPayment.IDFaktury = platnosc.ID_faktury;
-            newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
-            newPayment.nip = platnosc.nip;
-            newPayment.nrZlecenia = "";
-            newPayment.AMOUNT = waluta.Amount;
-            newPayment.CURRENCY = waluta.Currency;
-            newPayment.SESSIONID = sessionId;
-            newPayment.NAME = payer.FirstName;
-            newPayment.SURNAME = payer.LastName;
-            newPayment.AUTODEPOSIT = true;
-            newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard
-            newPayment.CHARSET = KODOWANIE;
-            newPayment.COUNTRY = KOD_POLSKA;
-            newPayment.JS = true;
-            newPayment.PAYMENTTYPE = CARDS;
-            newPayment.Data = DateTime.Now;
-            newPayment.Status = null;
-            newPayment.Status_data = null;
+            var payment = new PlatnosciEcard();
+            payment.IDFaktury = invoice.ID_faktury;
+            payment.ORDERDESCRIPTION = invoice.Faktura_Numer;
+            payment.nip = invoice.nip;
+            payment.nrZlecenia = "";
+            payment.AMOUNT = waluta.Amount;
+            payment.CURRENCY = waluta.Currency;
+            payment.SESSIONID = sessionId;
+            payment.NAME = payer.FirstName;
+            payment.SURNAME = payer.LastName;
+            payment.AUTODEPOSIT = true;
+            payment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard
+            payment.CHARSET = KODOWANIE;
+            payment.COUNTRY = KOD_POLSKA;
+            payment.JS = true;
+            payment.PAYMENTTYPE = CARDS;
+            payment.Data = DateTime.Now;
+            payment.Status = null;
+            payment.Status_data = null;
 
-            _repPayment.Insert(newPayment);
-            return newPayment;
+            _repPayment.Insert(payment);
+            return payment;
         }
 
-        public ErrorViewData IsError(Invoice platnosc, String userName)
+        public ErrorViewData IsError(Invoice invoice, String userName)
         {
             var errortxt = "";
 
-            if (platnosc == null)
+            if (invoice == null)
                 errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
-            else if (!UserIdentity(platnosc, userName))
+            else if (!UserIdentity(invoice, userName))
                 errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");