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

Data:

2009-12-23 11:59:36 (16 years ago)

Autor:

marek

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Models

Pliki:

• ErrorViewData.cs (zmodyfikowane) (1 diff)
• InvoiceDetailsViewData.cs (zmodyfikowane) (1 diff)
• MerchantHelper.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs) (2 diffs)
• PaymentsUtils.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs) (6 diffs)

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

@@ -1 @@
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
     public class ErrorViewData
     {
-       public string Error { get; set; }
-       public int InvoiceId { get; set; } 
+        public string Error { get; set; }
+        public int InvoiceId { get; set; } 
     }
 }

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

@@ -2 +2 @@
 using adMoto.Payments.Core.Data;
 
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
     public class InvoiceDetailsViewData
     {
-        public Invoice vPlatnosciEcard { get; set; }
+        public Invoice Invoice { get; set; }
         public Payer Payer {get; set;}
-        public string brutto { get; set; }
-        public string termin { get; set; }
-        public string info { get; set; }
+        public string Brutto { get; set; }
+        public string Termin { get; set; }
+        public string Info { get; set; }
     }
 }

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

@@ -8 +8 @@
 using adMoto.Payments.Core.Interfaces;
 
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
-    public class eCardData
+    public class MerchantHelper
     {
         public const string HASH_ERROR_INFO = "payment not exist";
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly PaymentsUtils _paymentsUtils;
         private IRepository<PlatnosciEcard> _repPayment;
 
-        public eCardData(IRepository<PlatnosciEcard> repPayment)
+        public MerchantHelper(IRepository<PlatnosciEcard> repPayment)
         {
             _repPayment = repPayment;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment);
         }
 
@@ -43 +43 @@
             var merchant = new Merchant();
 
-            var waluta = _funkcjePlatnosci.SetAmount(invoice);
-            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
+            var waluta = _paymentsUtils.SetAmount(invoice);
+            var newPayment = _paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
 
             merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
 
 #if DEBUG
-    //TODO: find better method to set SystemKsiegowy when testing or developing
+            //TODO: find better method to set SystemKsiegowy when testing or developing
             merchant.SystemKsiegowy = "2";
 #endif

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

@@ -10 +10 @@
 
 
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
-    public class FunkcjePlatnosci
+    public class PaymentsUtils
     {
         public const string EUR = "978";
@@ -21 +21 @@
         public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
         public const string KODOWANIE = "ISO-8859-2";
-        private IRepository<PlatnosciEcard> _repPayment;
+        private readonly IRepository<PlatnosciEcard> _repPayment;
         private readonly ITranslateManager _translateManager;
 
-        public FunkcjePlatnosci()
+        public PaymentsUtils()
         {
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
@@ -30 +30 @@
         }
 
-        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment)
+        public PaymentsUtils(IRepository<PlatnosciEcard> repPayment)
         {
             _repPayment = repPayment;
             _translateManager = new Translation();    
         }
-        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
+        public PaymentsUtils(IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
         {
             _repPayment = repPayment;
@@ -58 +58 @@
         public Waluta SetAmount(Invoice platnosc)
         {
-            var waluta = new Waluta();
-            waluta.Currency = GetCurrency(platnosc.waluta_miano);
+            var waluta = new Waluta {Currency = GetCurrency(platnosc.waluta_miano)};
 
-            if (waluta.Currency == PLN)
-                waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
-            else
-                waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
+            waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100);
             
             return waluta;
@@ -174 +170 @@
         }
 
-        public ErrorViewData IsError(Invoice platnosc, String UserName)
+        public ErrorViewData IsError(Invoice platnosc, String userName)
         {
             var errortxt = "";
@@ -180 +176 @@
             if (platnosc == null)
                 errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
-            else if (!UserIdentity(platnosc, UserName))
+            else if (!UserIdentity(platnosc, userName))
                 errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");