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

Data:

2009-12-07 13:04:16 (16 years ago)

Autor:

marek

Opis:

re #215 - drobny refactoring

Pliki:

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

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

@@ -1 +1 @@
 using System;
 using System.Linq;
-using System.Text;
-using System.Web;
 using System.Web.Mvc;
-using System.Web.Mvc.Ajax;
 using Platnosci.Models;
 using Platnosci.Core.Linq;
 using Platnosci.Core.Interface;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Web.UI;
-using System.Threading;
-using System.Data.Linq;
-using System.Web.Configuration;
-using System.Web.Routing;
 
 namespace Platnosci.Controllers
@@ -24 +14 @@
         public const string ISPAID = "payment_deposited";       //transakcja potwierdzona do rozliczenia
         private readonly IRepository<vPlatnosciEcard> _repVPayment;       
-        private IRepository<PlatnosciEcard> _repPayment;
+        private readonly IRepository<PlatnosciEcard> _repPayment;
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
-        private ITranslateManager translation;
-        private FunkcjePlatnosci _func;
+        private readonly ITranslateManager _translateManager;
+        private readonly FunkcjePlatnosci _funkcjePlatnosci;
               
         public PlatnoscController()
@@ -34 +24 @@
             _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
             _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext1());
-            _func = new FunkcjePlatnosci();
-            translation = new Translation();         
+            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _translateManager = new Translation();         
         }
         public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate)
@@ -42 +32 @@
             _repPayment = repPayment;
             _repConfirm = repConfirm;
-            _func = new FunkcjePlatnosci();
-            translation = translate;
+            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _translateManager = translate;
         }
         public ActionResult Show(string id, string language)
         {
-            language = _func.setLanguage(language);
-            int id1 = ConvertId(id);
-
-            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
-            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
-
-            string kwota = "";
-            kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
-            var payer = InitPayer("", "", platnosc.ID_faktury);
+            _funkcjePlatnosci.setLanguage(language);
+            var id1 = ConvertId(id);
+
+            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 tablica_potwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
-            if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
-            {
-                string data_zaplaty = String.Format("{0:dd-MM-yyyy}", tablica_potwierdzenia[0].AUTHTIME);
-                invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia","zaplacono"), platnosc.Faktura_Numer, data_zaplaty);
-                invoiceDeatailsViewData.termin = data_zaplaty;
+            var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
+            if (tablicaPotwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
+            {
+                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;
                 return View("Paid", invoiceDeatailsViewData);
             }       
@@ -72 +63 @@
         public ActionResult Show(Payer payer, string language)
         {
-            language = _func.setLanguage(language);
-            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
+            _funkcjePlatnosci.setLanguage(language);
+            
+            var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
+            
+            if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
             
             if (String.IsNullOrEmpty(payer.FirstName))
             {
-                ModelState.AddModelError("Payer.FirstName", translation.Translate("tlumaczenia", "err_imieWK"));
+                ModelState.AddModelError("Payer.FirstName", _translateManager.Translate("tlumaczenia", "err_imieWK"));
             }
             if (String.IsNullOrEmpty(payer.LastName))
             {
-                ModelState.AddModelError("Payer.LastName", translation.Translate("tlumaczenia", "err_nazwiskoWK"));
+                ModelState.AddModelError("Payer.LastName", _translateManager.Translate("tlumaczenia", "err_nazwiskoWK"));
             }
             if (ModelState.IsValid == false)
             {
-                string kwota = "";
-                kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
+                var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
                 var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota );
                 return View("Show",viewData); 
-            } 
-            if (payer != null)
-            {                
-                System.Diagnostics.Debug.WriteLine("PlatnosciController:Show");
-                return RedirectToAction("Merchant", "Merchant", payer);
-            }                
-            else return View("Error");
-        }
+            }
+
+            return RedirectToAction("Merchant", "Merchant", payer);
+        }
+
         public ActionResult Ok(string id, string language, string o)
         {
-            int order = ConvertId(o);
-            language = _func.setLanguage(language);
-            int id1 = ConvertId(id);
-            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
-            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));            
+            var order = ConvertId(o);
+            
+            _funkcjePlatnosci.setLanguage(language);
+            
+            var id1 = ConvertId(id);
+            
+            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            
+            if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));            
             
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
@@ -114 +107 @@
                 if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
                 {
-                    invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+                    invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
                 }
                 else
                 {
-                    if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = translation.Translate("tlumaczenia", "weryfikacja");
+                    if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
                 }
             }
@@ -126 +119 @@
         public ActionResult Fail(string id, string language)
         {
-            language = _func.setLanguage(language);
-            int id1 = ConvertId(id);
-            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
-            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
+            _funkcjePlatnosci.setLanguage(language);
+            var id1 = ConvertId(id);
+            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
 
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
@@ -140 +133 @@
         public ActionResult Status()
         {
-            string CURRENTSTATE = "";
-            int ORDERNUMBER = 0;
-            
-            PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard();
+            var potwierdzenie = new PotwierdzeniaEcard();
             var content = new ContentResult();
             try
@@ -151 +141 @@
                 if (!String.IsNullOrEmpty(Request.Form["BIN"])) potwierdzenie.BIN = Request.Form["BIN"];
                 if (!String.IsNullOrEmpty(Request.Form["COMMTYPE"])) potwierdzenie.COMMTYPE = Request.Form["COMMTYPE"];
-                if (!String.IsNullOrEmpty(Request.Form["CURRENTSTATE"]))
-                {
-                    CURRENTSTATE = Request.Form["CURRENTSTATE"];
-                    potwierdzenie.CURRENTSTATE = CURRENTSTATE;
-                }
+                if (!String.IsNullOrEmpty(Request.Form["CURRENTSTATE"])) potwierdzenie.CURRENTSTATE = Request.Form["CURRENTSTATE"];
                 if (!String.IsNullOrEmpty(Request.Form["DATATRANSMISJI"])) potwierdzenie.DATATRANSMISJI = Convert.ToDateTime(Request.Form["DATATRANSMISJI"]);
                 if (!String.IsNullOrEmpty(Request.Form["EVENTTYPE"])) potwierdzenie.EVENTTYPE = Convert.ToBoolean(Request.Form["EVENTTYPE"]);
                 if (!String.IsNullOrEmpty(Request.Form["MERCHANTNUMBER"])) potwierdzenie.MERCHANTNUMBER = Request.Form["MERCHANTNUMBER"];
-                if (!String.IsNullOrEmpty(Request.Form["ORDERNUMBER"]))
-                {
-                    ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]);
-                    potwierdzenie.ORDERNUMBER = ORDERNUMBER;
-                }
+                if (!String.IsNullOrEmpty(Request.Form["ORDERNUMBER"])) potwierdzenie.ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]);
                 if (!String.IsNullOrEmpty(Request.Form["PAYMENTNUMBER"])) potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Request.Form["PAYMENTNUMBER"]);
                 if (!String.IsNullOrEmpty(Request.Form["PAYMENTTYPE"])) potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Request.Form["PAYMENTTYPE"]);
@@ -172 +154 @@
 
                 _repConfirm.Insert(potwierdzenie);
-                UpdateStatus(ORDERNUMBER, CURRENTSTATE);
+
+                if (potwierdzenie.ORDERNUMBER.HasValue)
+                    UpdateStatus(potwierdzenie.ORDERNUMBER.Value, potwierdzenie.CURRENTSTATE);
+
                 content.Content = "OK";                
             }
@@ -182 +167 @@
             return content;
         }
-        private Payer InitPayer(string FirstName, string LastName, int Id_faktury)
-        {
-            Payer payer = new Payer();
-            payer.FirstName = "";
-            payer.LastName = "";
-            payer.Id_faktury = Id_faktury;
+
+        private static Payer InitPayer(int idFaktury)
+        {
+            var payer = new Payer {Id_faktury = idFaktury};
             return payer;
         }
-        private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
+
+        private static InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
@@ -199 +183 @@
             return invoiceDeatailsViewData;
         }
+
         public int ConvertId(string id)
         {
-            int id1 = 0;
-            try
-            {
-                id1 = (id != null) ? Convert.ToInt32(id) : 0;
-            }
-            catch
-            {
-            }
-            return id1;
-        }
-        public ErrorViewData Iserror(vPlatnosciEcard platnosc)
-        {
-            string errortxt = "";
-            if (platnosc == null) errortxt = translation.Translate("tlumaczenia", "brakdanych");
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name)) errortxt = translation.Translate("tlumaczenia","weryfikacja");
-            ErrorViewData errorViewData = _func.InitErrorViewData(errortxt);
-            return errorViewData;
-        }
+            int id1;
+            return Int32.TryParse(id, out id1) ? id1 : 0;
+        }
+
+        public ErrorViewData IsError(vPlatnosciEcard platnosc)
+        {
+            var errortxt = "";
+            
+            if (platnosc == null) 
+                errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
+            else if (!_funkcjePlatnosci.UserIdentity(platnosc, HttpContext.User.Identity.Name)) 
+                errortxt = _translateManager.Translate("tlumaczenia","weryfikacja");
+
+            return _funkcjePlatnosci.InitErrorViewData(errortxt);
+        }
+
         public void UpdateStatus(int ordernumber, string currentstate)
         {
-            PlatnosciEcard platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
-            if (platnosc != null && currentstate == ISPAID)
-            {
-                platnosc.Status = true;
-                platnosc.Status_data = DateTime.Now;
-                _repPayment.SubmitChanges();
-                
-                System.Diagnostics.Debug.WriteLine("IsUpdate");
-            }
-        }
+            var platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
+
+            if (platnosc == null || currentstate != ISPAID) return;
+
+            platnosc.Status = true;
+            platnosc.Status_data = DateTime.Now;
+            _repPayment.SubmitChanges();
+        }
+
         public int CheckConfirm(int idfaktury, int order)
         {
-            PlatnosciEcard pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
+            var pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
+
             if (pl != null)
             {
-                PotwierdzeniaEcard confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();
+                var confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();
                 if (confirm == null) return 0; //potwierdzenie nie przyszlo z eCardu
             }
@@ -243 +226 @@
                 return 2; //nie ma platnosci o takim idfaktury i ordernumber
             }
+            
             return 1;    //potwierdzenie przyszlo z eCardu
-        }
-        public IRepository<vPlatnosciEcard> getRepVPayment()
-        {
-            return this._repVPayment;
-        }
-        public IRepository<PlatnosciEcard> getRepPayment()
-        {
-            return this._repPayment;
-        }
-        public IRepository<PotwierdzeniaEcard> getRepConfirm()
-        {
-            return this._repConfirm;
-        }   
+        }  
     }
 }