Zbiór zmian 881 dla trunk/eCard

Data:

2009-11-17 15:38:24 (16 years ago)

Autor:

alina

Opis:

re #215 poprawienie akcji do wyswietlenia statusu transakcji

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

• Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
• Controllers/PlatnoscController.cs (zmodyfikowane) (3 diffs)
• Global.asax.cs (zmodyfikowane) (1 diff)
• Web.config (zmodyfikowane) (1 diff)

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

@@ -76 +76 @@
                 else merchantId = "171485000";
 
-            string link = ConfigurationManager.AppSettings["StatusLink"];
-            string LinkFail = link + "?id=" + newPayment.IDFaktury + "&status=fail";
-            string LinkOk = link + "?id=" + newPayment.IDFaktury + "&status=ok";
+            string LinkFail = ConfigurationManager.AppSettings["Strona"];
+            LinkFail += "/" + language + ConfigurationManager.AppSettings["LinkFail"];
+            LinkFail += "/" + newPayment.IDFaktury;
+
+            string LinkOk = ConfigurationManager.AppSettings["Strona"];
+            LinkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"];
+            LinkOk += "/" + newPayment.IDFaktury; ;
 
             var merchantViewData = InitMerchantViewData(newPayment, hash, merchantId, LinkFail, LinkOk);

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

@@ -61 +61 @@
         {
             language = _func.setLanguage(language);
-            int id1 = ConvertId(id); 
+            int id1 = ConvertId(id);
 
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
@@ -115 +115 @@
             int id1 = ConvertId(id);
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            string s = "";
-            
             if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));            
             
@@ -131 +129 @@
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
             return View(invoiceDeatailsViewData);
-        }
-        public ActionResult Potwierdzenie(string status, string id)
-        {
-            if (status == "ok")
-            {
-                return RedirectToAction("Ok", "Platnosc", new { id });
-            }
-            else if (status == "fail")
-            {
-                return RedirectToAction("Fail", "Platnosc", new { id });
-            }
-            ErrorViewData errorViewData = _func.InitErrorViewData(brakdanych);
-            return View("Error1", errorViewData);
         }
         public ActionResult Status()

trunk/eCard/eCardMVC/Platnosci/Global.asax.cs

@@ -18 +18 @@
         public static void RegisterRoutes(RouteCollection routes)
         {
-            string link = "info.aspx"; //ConfigurationManager.AppSettings["StatusLink"];
             routes.IgnoreRoute("elmah.axd");
             routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
             string lang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower();
            
-            routes.MapRoute(
-               "info",                                           
-               link, 
-               new { controller = "Platnosc", action = "Potwierdzenie" }
-            );
             routes.MapRoute(
                 "eCard",                                            

trunk/eCard/eCardMVC/Platnosci/Web.config

@@ -36 +36 @@
     <add key="StatusLink" value="http://platnosci.admoto.pl/info.aspx"/>
     <add key="Css" value="admoto"/>
+
+    <add key="Strona" value="http://pay.truck-expo.com"/>
+    <add key="Strona" value="http://platnosci.admoto.pl"/>
+    
+    <add key="LinkFail" value="/Platnosc/Fail"/>
+    <add key="LinkOk" value="/Platnosc/Ok"/>
    
   </appSettings>