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

Data:

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

Autor:

marek

Opis:

re #215

Pliki:

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

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

@@ -5 +5 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Models;
 using Elmah;
-using Platnosci.Models;
-
-namespace Platnosci.Controllers
+
+namespace adMoto.Payments.Web.Controllers
 {
     public class PlatnoscController : Controller
@@ -17 +17 @@
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
         private readonly ITranslateManager _translateManager;
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly PaymentsUtils _paymentsUtils;
 
         public PlatnoscController()
@@ -24 +24 @@
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext());
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment);
             _translateManager = new Translation();
         }
@@ -33 +33 @@
             _repConfirm = repConfirm;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
+            _paymentsUtils = new PaymentsUtils(_repPayment, _translateManager);
 
         }
@@ -40 +40 @@
         public ActionResult Show(string id, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
 
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error))
                 return View("Error1", errorViewData);
@@ -55 +55 @@
             {
                 var dataZaplaty = String.Format("{0:dd-MM-yyyy}", tablicaPotwierdzenia[0].AUTHTIME);
-                invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);
-                invoiceDeatailsViewData.termin = dataZaplaty;
+                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);
+                invoiceDeatailsViewData.Termin = dataZaplaty;
                 return View("Paid", invoiceDeatailsViewData);
             }
@@ -66 +66 @@
         public ActionResult Show(Payer payer, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
 
             if (String.IsNullOrEmpty(payer.FirstName))
@@ -81 +81 @@
             {
                 var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-                var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+                var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
 
                 if (!String.IsNullOrEmpty(errorViewData.Error))
@@ -94 +94 @@
         {
             var orderId = ConvertId(order);
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
             if (platnosc == null)
-                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
+                return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
@@ -107 +107 @@
 
             if (CheckConfirm(id1, orderId) == 0)   //nie ma potwierdzenia z eCardu
-                invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.Invoice.Faktura_Numer);
 
             else if (CheckConfirm(id1, orderId) == 2)
-                invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
+                invoiceDeatailsViewData.Info = _translateManager.Translate("tlumaczenia", "weryfikacja");
 
             return View(invoiceDeatailsViewData);
@@ -117 +117 @@
         public ActionResult Fail(string id, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
@@ -123 +123 @@
             if (platnosc == null)
                 return View("Error1",
-                            _funkcjePlatnosci.InitErrorViewData(
+                            _paymentsUtils.InitErrorViewData(
                                 _translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
@@ -203 +203 @@
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
-            invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
+            invoiceDeatailsViewData.Invoice = platnosc;
             invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
-            invoiceDeatailsViewData.brutto = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
+            invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
             return invoiceDeatailsViewData;
         }