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

Data:

2009-11-16 16:06:37 (16 years ago)

Autor:

alina

Opis:

re #215 rozdzielenie testow, modyfikacja testu dotycząca dodania potwierdzenia i edycji statusu platnosci,
zmiana wysłania formularza do eCardu

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Controllers

Pliki:

• MerchantController.cs (zmodyfikowane) (7 diffs)
• PlatnoscController.cs (zmodyfikowane) (2 diffs)

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

@@ -29 +29 @@
         public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
         public const string KODOWANIE = "ISO-8859-2";
+        private int ORDERNUMBER = 122;
 
         private string merchantId;
@@ -43 +44 @@
         public ActionResult Merchant(Payer payer, string language)
         {
+            System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language);
             language = _func.setLanguage(language);
 
@@ -71 +73 @@
 
             string link = ConfigurationManager.AppSettings["StatusLink"];
-            string LinkFail = link + "?status=fail";
-            string LinkOk = link + "?status=ok";
+            string LinkFail = link + "?id=" + newPayment.IDFaktury + "&status=fail";
+            string LinkOk = link + "?id=" + newPayment.IDFaktury + "&status=ok";
 
             var merchantViewData = InitMerchantViewData(newPayment, hash, merchantId, LinkFail, LinkOk);
+            wyslij(merchantViewData, hash, merchantId);
             return View(merchantViewData);            
         }
@@ -90 +93 @@
             newPayment.SURNAME = payer.LastName;
             newPayment.AUTODEPOSIT = true;
-            newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); //"PL";
+            newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); 
             newPayment.CHARSET = KODOWANIE;
             newPayment.COUNTRY = KOD_POLSKA;
@@ -119 +122 @@
             
             //wartosci testowe
-            merchantViewData.nowaPlatnosc.ORDERNUMBER = 4;
-            merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "22";
+            merchantViewData.nowaPlatnosc.ORDERNUMBER = ORDERNUMBER;
+            merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "222";
             merchantViewData.nowaPlatnosc.AMOUNT = 300;
             merchantViewData.nowaPlatnosc.CURRENCY = "985";
-            merchantViewData.nowaPlatnosc.SESSIONID = "";
+            merchantViewData.nowaPlatnosc.SESSIONID = "ff";
             merchantViewData.merchantId = "171485000";
             merchantViewData.LinkFail = "";
@@ -141 +144 @@
 
             //dane testowe
-            string adres = "https://pay.ecard.pl/servlet/HS?orderNumber=4";
+            string adres = "https://pay.ecard.pl/servlet/HS?orderNumber="+ORDERNUMBER;
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres);
             string dane = "&orderDescription=&amount=300&currency=985&merchantId=171485000&password=ashSeth2";                
@@ -159 +162 @@
                      
             return strResponse;
-        }               
+        }
+        private void wyslij(MerchantViewData m, string hash, string id)
+        {
+            string adres = "https://pay.ecard.pl/servlet/PSTEST?ORDERDESCRIPTION="+m.nowaPlatnosc.ORDERDESCRIPTION;
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres);
+            string dane = "&AMOUNT=300&CURRENCY=985&ORDERNUMBER="+ORDERNUMBER+"&NAME="+m.nowaPlatnosc.NAME+"&SURNAME="+m.nowaPlatnosc.SURNAME+"&LANGUAGE=PL&CHARSET=ISO-8859-2";
+            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=171485000&AUTODEPOSIT=" + m.nowaPlatnosc.AUTODEPOSIT + "&LINKFAIL=";
+            dane += "&LINKOK=&SESSIONID=";
+            Response.Redirect(adres + dane);
+        }
     }
 }

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

@@ -106 +106 @@
             if (payer != null)
             {                
-                System.Diagnostics.Debug.WriteLine("P;atnosciController:Show");
+                System.Diagnostics.Debug.WriteLine("PlatnosciController:Show");
                 return RedirectToAction("Merchant", "Merchant", payer);
-            }
-                
+            }                
             else return View("Error");
         }
@@ -235 +234 @@
         public void UpdateStatus(int ordernumber, string validationcode)
         {
-            var platnosc = _repPl.FindOne(i => i.ORDERNUMBER == ordernumber);
+            var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault();
+            //Pl.FindOne(i => i.ORDERNUMBER == ordernumber);
             if (platnosc != null && platnosc.Status == true && validationcode == "000")
             {