Zbiór zmian 951 dla trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

Data:

2009-12-14 16:03:54 (16 years ago)

Autor:

alina

Opis:

re #215 dodanie testów, mała przebudowa akcji Merchant (wydzielenie funkcji)

Pliki:

• trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (5 diffs)

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

@@ -42 +42 @@
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
-
-            var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
-            
-            var payer = InitPayer(platnosc.ID_faktury);
-            
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);  
+            
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);  
 
             var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
@@ -80 +76 @@
             {
                 var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
-                var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota );
+                var viewData = InitInvoiceDetailsViewData(platnosc);
                 return View("Show",viewData); 
             }
@@ -99 +95 @@
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));            
             
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
 
             //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
@@ -119 +115 @@
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
 
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
             return View(invoiceDeatailsViewData);
         }
@@ -169 +165 @@
         }
 
-        private static InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
+        private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc)
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
             invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
-            invoiceDeatailsViewData.Payer = payer;
-            invoiceDeatailsViewData.Status = status;
-            invoiceDeatailsViewData.brutto = brutto;
+            invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
+            invoiceDeatailsViewData.brutto = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
             return invoiceDeatailsViewData;
         }