Zbiór zmian 957 dla trunk/eCard/eCardMVC/Platnosci

Data:

2009-12-21 11:02:46 (16 years ago)

Autor:

alina

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

• Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
• Controllers/PlatnoscController.cs (zmodyfikowane) (2 diffs)
• Models/FunkcjePlatnosci.cs (zmodyfikowane) (3 diffs)
• Models/eCardData.cs (zmodyfikowane) (3 diffs)

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

@@ -29 +29 @@
             _eCardData = new eCardData(_repPayment);
         }
-        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate, eCardData ecardData)
+        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
         {
             _repVPayment = repVPayment;
             _repPayment = repPayment;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);            
-            _eCardData = ecardData;
+            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
+            _eCardData = new eCardData(_repPayment);
         }
-
         public ActionResult Merchant(Payer payer, string language)
         {

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

@@ -44 +44 @@
 
             var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
-            if (!String.IsNullOrEmpty(errorViewData.Error)) return View("Error1", errorViewData);
+            if (!String.IsNullOrEmpty(errorViewData.Error)) 
+                return View("Error1", errorViewData);
             
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);  
@@ -108 +109 @@
                 invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
            
-            return View(invoiceDeatailsViewData);      
+            return View(invoiceDeatailsViewData);       
         }
         public ActionResult Fail(string id, string language) 

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

@@ -43 +43 @@
             var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
             
-            if (waluta > 0 && (miano != "" || miano != "PLN"))
-            {
-                brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano + ")";
-            }
+            if (waluta > 0 && (miano != "" || miano.ToUpper() != "PLN"))
+                brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
+
             return brutto;
         }
@@ -58 +57 @@
         {
             var waluta = new Waluta();
+            waluta.Currency = GetCurrency(platnosc.waluta_miano);
 
-            waluta.Currency = GetCurrency(platnosc.waluta_miano);
             if (waluta.Currency == PLN)
                 waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
@@ -114 +113 @@
                     break;
             }
-
             return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
         }

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

@@ -26 +26 @@
         {
             if (merchant == null) 
-                throw new ArgumentNullException("merchant");
+                throw new ArgumentNullException("parametr merchant is null in GetUrl method");
             
             var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION;
@@ -51 +51 @@
 
             merchant.Payment = newPayment;
-            getMerchantInfo(merchant);
+            GetMerchantInfo(merchant);
             SetHash(merchant);
 
@@ -72 +72 @@
             return merchant;
         }
-        public void getMerchantInfo(Merchant merchant)
+        public void GetMerchantInfo(Merchant merchant)
         {
             if (merchant.SystemKsiegowy == "2")