Zbiór zmian 949 dla trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

Data:

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

Autor:

marek

Opis:

re #215 - drobny refactoring

Pliki:

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

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

@@ -28 +28 @@
         public MerchantController()
         {
-            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
-            _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
+            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext());
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _funkcjePlatnosci = new FunkcjePlatnosci();
             _translateManager = new Translation();
@@ -79 +79 @@
             linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek;
 
-            if (merchant != null && !String.IsNullOrEmpty(merchant.merchntId))
+            if (merchant != null && !String.IsNullOrEmpty(merchant.Id))
                 SendRequest(newPayment, hash, merchant, linkFail, linkOk);
             else 
@@ -130 +130 @@
             var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
             dane += "&currency=" + platnosc.CURRENCY;
-            dane += string.Format("&merchantId={0}&password={1}", merchant.merchntId, merchant.merchantPassword);
+            dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
 
             var bdata = System.Text.Encoding.ASCII.GetBytes(dane);
@@ -154 +154 @@
             var dane = "&AMOUNT=" + m.AMOUNT + "&CURRENCY=" + m.CURRENCY + "&ORDERNUMBER=" + m.ORDERNUMBER;
             dane += "&NAME=" + m.NAME + "&SURNAME=" + m.SURNAME + "&LANGUAGE=" + m.LANGUAGE + "&CHARSET=ISO-8859-2";
-            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchant.merchntId + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
+            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
             dane += "&LINKFAIL=" + linkfail + "&LINKOK=" + linkok + "&SESSIONID=" + m.SESSIONID;
             Response.Redirect(adres + dane);
@@ -174 +174 @@
             if (systemKs == "2")
             {
-                merchant.merchntId = "171485000";
-                merchant.merchantPassword = "ashSeth2";
+                merchant.Id = "171485000";
+                merchant.Password = "ashSeth2";
             }
             else
             {
-                merchant.merchntId = "170906000";
-                merchant.merchantPassword = "JaYpqfs0";
+                merchant.Id = "170906000";
+                merchant.Password = "JaYpqfs0";
             }              
             return merchant;