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

Data:

2009-11-24 12:24:57 (16 years ago)

Autor:

alina

Opis:

re #215 zmiana parametrow w konstruktorze PlatnosciController?, dostosowanie testow do zmiany

Pliki:

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

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

@@ -23 +23 @@
     {
         public const string ISPAID = "payment_deposited";       //transakcja potwierdzona do rozliczenia
-        private readonly PlatnosciDataContext _context;
-        private readonly IDataContext _context1;
-        private readonly IRepository<PotwierdzeniaEcard> _rep;
-        private readonly IRepository<PlatnosciEcard> _repPl;
+        private readonly IRepository<vPlatnosciEcard> _repVPayment;       
+        private readonly IRepository<PlatnosciEcard> _repPayment;
+        private readonly IRepository<PotwierdzeniaEcard> _repConfirm;       
         private FunkcjePlatnosci _func;
         private string weryfikacja;
@@ -37 +36 @@
         public PlatnoscController()
         {
-            _context = new PlatnosciDataContext();
-            _rep = new Repository<PotwierdzeniaEcard>(new DataContext1());
-            _repPl = new Repository<PlatnosciEcard>(new DataContext1());
-            _func = new FunkcjePlatnosci();
-                      
-        }
-        public PlatnoscController(IDataContext datacontext, int czy_test)
-        {
-            _rep = new Repository<PotwierdzeniaEcard>(datacontext);
-            _repPl = new Repository<PlatnosciEcard>(datacontext);
-            _context1 = datacontext;
+            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
+            _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext1());
+            _func = new FunkcjePlatnosci();                      
+        }
+        public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, int czy_test)
+        {
+            _repVPayment = repVPayment;
+            _repPayment = repPayment;
+            _repConfirm = repConfirm;
             _func = new FunkcjePlatnosci();
             test = czy_test;
@@ -57 +55 @@
             int id1 = ConvertId(id);
 
-            vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
+            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
             if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
 
@@ -65 +63 @@
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);  
 
-            var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1);
+            var tablica_potwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
             if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
             {
@@ -81 +79 @@
             language = _func.setLanguage(language);
             ustawTlumaczenia(test);
-            vPlatnosciEcard platnosc = _rep.FindInvoiceById(payer.Id_faktury).SingleOrDefault();
+            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
             if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
             
@@ -111 +109 @@
             ustawTlumaczenia(test);
             int id1 = ConvertId(id);
-            vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
+            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
             if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));            
             
@@ -122 +120 @@
             ustawTlumaczenia(test);
             int id1 = ConvertId(id);
-            vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
+            vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
             if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
             
@@ -163 +161 @@
             potwierdzenie.WITHCVC = WITHCVC;
 
-            _rep.Insert(potwierdzenie);
+            _repConfirm.Insert(potwierdzenie);
             UpdateStatus(ORDERNUMBER, CURRENTSTATE);
             return View();
@@ -229 +227 @@
         public void UpdateStatus(int ordernumber, string currentstate)
         {
-            PlatnosciEcard platnosc = _repPl.FindOne(ordernumber);
+            PlatnosciEcard platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
             if (platnosc != null && currentstate == ISPAID)
             {
                 platnosc.Status = true;
                 platnosc.Status_data = DateTime.Now;
-                _repPl.SubmitChanges();
+                _repPayment.SubmitChanges();
                 
                 System.Diagnostics.Debug.WriteLine("IsUpdate");