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

Data:

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

Autor:

marek

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Controllers

Pliki:

• AccountController.cs (zmodyfikowane) (7 diffs)
• HomeController.cs (zmodyfikowane) (1 diff)
• MerchantController.cs (zmodyfikowane) (4 diffs)
• PlatnoscController.cs (zmodyfikowane) (13 diffs)

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

@@ -6 +6 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
-using Platnosci.Models;
+using adMoto.Payments.Web.Models;
 
-namespace Platnosci.Controllers
+namespace adMoto.Payments.Web.Controllers
 {
     [HandleError]
@@ -14 +14 @@
     {
         private readonly IRepository<Invoice> _repository;
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly PaymentsUtils _paymentsUtils;
 
         public IFormsAuthentication FormsAuth
@@ -26 +26 @@
             _repository = new Repository<Invoice>(new DataContext());
             FormsAuth = new FormsAuthenticationService();
-            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _paymentsUtils = new PaymentsUtils();
         }
 
-        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, FunkcjePlatnosci func)
+        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils func)
         {
             _repository = repository;
             FormsAuth = formsAuth ?? new FormsAuthenticationService();
-            _funkcjePlatnosci = func;
+            _paymentsUtils = func;
         }
 
@@ -41 +41 @@
                 return RedirectToAction("LogOn", "Account", new { language = "pl" });
 
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             return View();
         }
@@ -50 +50 @@
         public ActionResult LogOn(string nip, string numerFaktury, string returnUrl, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var platnosc = new Invoice();
             if (!ValidateLogOn(nip, numerFaktury))
@@ -60 +60 @@
             platnosc = login;
             if (platnosc == null) return View();
-            _funkcjePlatnosci.SetUserLogger(nip, numerFaktury);
+            _paymentsUtils.SetUserLogger(nip, numerFaktury);
 
             FormsAuth.SignIn(nip, false);
@@ -98 +98 @@
         }
     }
+
     public interface IFormsAuthentication
     {

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

@@ -1 @@
-using System;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
-namespace Platnosci.Controllers
+namespace adMoto.Payments.Web.Controllers
 {
     [HandleError]

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

@@ -5 +5 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
-using Platnosci.Models;
+using adMoto.Payments.Web.Models;
 
-namespace Platnosci.Controllers
+namespace adMoto.Payments.Web.Controllers
 {
     [Authorize]
@@ -14 +14 @@
         private readonly IRepository<Invoice> _repVPayment;
         private readonly IRepository<PlatnosciEcard> _repPayment; 
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
-        private readonly eCardData _eCardData;
+        private readonly PaymentsUtils _paymentsUtils;
+        private readonly MerchantHelper _merchantHelper;
         private readonly ITranslateManager _translateManager;
 
@@ -22 +22 @@
             _repVPayment = new Repository<Invoice>(new DataContext());
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment);
             _translateManager = new Translation();
-            _eCardData = new eCardData(_repPayment);
+            _merchantHelper = new MerchantHelper(_repPayment);
         }
         public MerchantController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
@@ -31 +31 @@
             _repPayment = repPayment;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
-            _eCardData = new eCardData(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment, _translateManager);
+            _merchantHelper = new MerchantHelper(_repPayment);
         }
         public ActionResult Merchant(Payer payer, string language)
         {
-            language = _funkcjePlatnosci.SetLanguage(language);
+            language = _paymentsUtils.SetLanguage(language);
 
             var id1 = Convert.ToInt32(payer.Id_faktury);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _funkcjePlatnosci.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error)) 
                 return View("Error1", errorViewData);
 
-            var merchant = _eCardData.CreateMerchantData(platnosc, payer, language, Session.SessionID);
+            var merchant = _merchantHelper.CreateMerchantData(platnosc, payer, language, Session.SessionID);
             
-            if (merchant == null || (merchant != null && (!String.IsNullOrEmpty(merchant.Error)))) 
-                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
+            if (merchant == null || !String.IsNullOrEmpty(merchant.Error)) 
+                return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
             
-            var adres = _eCardData.GetUrl(merchant); 
+            var adres = _merchantHelper.GetUrl(merchant); 
             Response.Redirect(adres);           
             return new EmptyResult();          

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;
         }