Zbiór zmian 967

Data:

2009-12-22 15:05:08 (16 years ago)

Autor:

marek

Opis:

re #215 - dodanie link ok w stylu: http://localhost:3646/pl/Platnosc/Ok/77218/852/?

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

• Controllers/PlatnoscController.cs (zmodyfikowane) (6 diffs)
• Global.asax.cs (zmodyfikowane) (1 diff)
• Models/eCardData.cs (zmodyfikowane) (3 diffs)
• Platnosci.Web.csproj.user (zmodyfikowane) (1 diff)
• Web.config (zmodyfikowane) (2 diffs)

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

@@ -9 +9 @@
 {
     
-    [Authorize]
+    //[Authorize]
     public class PlatnoscController : Controller
     {
@@ -36 +36 @@
             
         }
+
+        [Authorize]
         public ActionResult Show(string id, string language)
         {
-            language = _funkcjePlatnosci.SetLanguage(language);
+            _funkcjePlatnosci.SetLanguage(language);
             var id1 = ConvertId(id);
 
@@ -63 +65 @@
         public ActionResult Show(Payer payer, string language)
         {
-            language = _funkcjePlatnosci.SetLanguage(language);            
+            _funkcjePlatnosci.SetLanguage(language);            
             
             if (String.IsNullOrEmpty(payer.FirstName))
@@ -88 +90 @@
         }
 
-        public ActionResult Ok(string id, string language, string o)
-        {
-            var order = ConvertId(o);            
-            language = _funkcjePlatnosci.SetLanguage(language);            
+        public ActionResult Ok(string id, string order, string language)
+        {
+            var orderId = ConvertId(order);            
+            _funkcjePlatnosci.SetLanguage(language);            
             var id1 = ConvertId(id);            
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
@@ -103 +105 @@
             //jesli tak, to sprawdzamy czy przyszlo potwierdzenie z eCardu.             
             
-            if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
+            if (CheckConfirm(id1, orderId) == 0)   //nie ma potwierdzenia z eCardu
                 invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
                 
-            else if (CheckConfirm(id1, order) == 2) 
+            else if (CheckConfirm(id1, orderId) == 2) 
                 invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
            
             return View(invoiceDeatailsViewData);       
         }
-        public ActionResult Fail(string id, string language) 
-        {
-            language = _funkcjePlatnosci.SetLanguage(language); 
+
+        public ActionResult Fail(string id, string language)
+        {
+            _funkcjePlatnosci.SetLanguage(language);
             var id1 = ConvertId(id);
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();            
-            
+            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+
             if (platnosc == null)
-                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));    
-          
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc); 
-            return View(invoiceDeatailsViewData); 
-        }
-        public ActionResult Form()
-        {
-            return View();
-        }
+                return View("Error1",
+                            _funkcjePlatnosci.InitErrorViewData(
+                                _translateManager.Translate("tlumaczenia", "brakdanych"), 0));
+
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+            return View(invoiceDeatailsViewData);
+        }
+
         public ActionResult Status()
         { 
-
             var potwierdzenie = new PotwierdzeniaEcard();
             var content = new ContentResult();
@@ -150 +151 @@
                 if (!String.IsNullOrEmpty(Request.Form["WITHCVC"])) potwierdzenie.WITHCVC = Request.Form["WITHCVC"];
 
+
+                if (!potwierdzenie.ORDERNUMBER.HasValue || potwierdzenie.ORDERNUMBER.Value<=0)
+                {
+                    content.Content = "FALSE";
+                    return content; 
+                }
+
                 _repConfirm.Insert(potwierdzenie);
 

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

@@ -26 +26 @@
                 "eCard/Status.aspx",                                
                 new { controller = "Platnosc", action = "Status" }  
-            );            
+            );
+
+            routes.MapRoute(
+                "ConfirmationOk",
+                "{language}/Platnosc/Ok/{id}/{order}/",
+                new { controller = "Platnosc", action = "Ok", id="", order="", language="" }
+            );
+
+            routes.MapRoute(
+                "ConfirmationFail",
+                "{language}/Platnosc/Fail/{id}/",
+                new { controller = "Platnosc", action = "Ok", id = "", order = "", language = "" }
+            );
+
             routes.MapRoute(
                 "Default",                                                               

trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs

@@ -47 +47 @@
 
 #if DEBUG
-            //TODO: find better method to set SystemKsiegowy when testing or developing
+    //TODO: find better method to set SystemKsiegowy when testing or developing
             merchant.SystemKsiegowy = "2";
 #endif
@@ -60 +60 @@
             var linkFail = ConfigurationManager.AppSettings["Strona"];
             linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"];
-            linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek+"&";
+            linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek + "&";
 
             var linkOk = ConfigurationManager.AppSettings["Strona"];
             linkOk += "/" + lang + ConfigurationManager.AppSettings["LinkOk"];
-            linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek+"&";
+            linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek + "&";
 
             merchant.LinkOk = linkOk;
@@ -73 +73 @@
             return merchant;
         }
+
         public void GetMerchantInfo(Merchant merchant)
         {

trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user

@@ -14 +14 @@
           <SQLDebugging>False</SQLDebugging>
           <PublishCopyOption>RunFiles</PublishCopyOption>
-          <PublishTargetLocation>
-          </PublishTargetLocation>
-          <PublishDeleteAllFiles>False</PublishDeleteAllFiles>
-          <PublishCopyAppData>True</PublishCopyAppData>
+          <PublishTargetLocation>C:\Inetpub\wwwroot\eCard\</PublishTargetLocation>
+          <PublishDeleteAllFiles>True</PublishDeleteAllFiles>
+          <PublishCopyAppData>False</PublishCopyAppData>
           <ExternalProgram>
           </ExternalProgram>

trunk/eCard/eCardMVC/Platnosci/Web.config

@@ -35 +35 @@
     <!--<add key="eCard.Url" value="https://pay.ecard.pl/payment/PS"/>-->
     <!--Wersja DEV-->
-    <add key="wersja" value="TEST"/>
     <add key="eCard.Url" value="https://pay.ecard.pl/servlet/PSTEST"/>
-
-    <!--<add key="Strona" value="http://pay.truck-expo.com"/>
-    <add key="Css" value="truck"/>-->
     
     <add key="Strona" value="http://platnosci.admoto.pl"/>
@@ -45 +41 @@
     <add key="LinkFail" value="/Platnosc/Fail"/>
     <add key="LinkOk" value="/Platnosc/Ok"/>
-   
   </appSettings>
   <elmah>