Zbiór zmian 956

Data:

2009-12-21 08:36:16 (16 years ago)

Autor:

alina

Opis:

re #215 drobne poprawki

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

• Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
• Controllers/PlatnoscController.cs (zmodyfikowane) (4 diffs)
• Models/FunkcjePlatnosci.cs (zmodyfikowane) (2 diffs)
• Models/eCardData.cs (zmodyfikowane) (1 diff)
• Views/Platnosc/Fail.aspx (zmodyfikowane) (1 diff)
• Views/Platnosc/Ok.aspx (zmodyfikowane) (2 diffs)

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

@@ -51 +51 @@
             var merchant = _eCardData.CreateMerchantData(platnosc, payer, language, Session.SessionID);
             
-            if (merchant == null || (merchant != null && (!String.IsNullOrEmpty(merchant.Error))))
+            if (merchant == null || (merchant != null && (!String.IsNullOrEmpty(merchant.Error)))) 
                 return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
             

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

@@ -62 +62 @@
         public ActionResult Show(Payer payer, string language)
         {
-            language = _funkcjePlatnosci.SetLanguage(language);
-            
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-            var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
-            if (!String.IsNullOrEmpty(errorViewData.Error)) return View("Error1", errorViewData);
+            language = _funkcjePlatnosci.SetLanguage(language);            
             
             if (String.IsNullOrEmpty(payer.FirstName))
                 ModelState.AddModelError("Payer.FirstName", _translateManager.Translate("tlumaczenia", "err_imieWK"));
-            
+            else if (payer.FirstName.Length > 25)
+                ModelState.AddModelError("Payer.FirstName", String.Format(_translateManager.Translate("tlumaczenia", "ToLongValue"), "25"));
+           
             if (String.IsNullOrEmpty(payer.LastName))
                 ModelState.AddModelError("Payer.LastName", _translateManager.Translate("tlumaczenia", "err_nazwiskoWK"));
-            
-            if (payer.FirstName.Length > 25)
-                ModelState.AddModelError("Payer.FirstName", String.Format(_translateManager.Translate("tlumaczenia", "ToLongValue"),"25"));
-           
-            if (payer.LastName.Length > 30)
-                ModelState.AddModelError("Payer.LastName", String.Format(_translateManager.Translate("tlumaczenia", "ToLongValue"),"30"));
-            
+            else if (payer.LastName.Length > 30)
+                ModelState.AddModelError("Payer.LastName", String.Format(_translateManager.Translate("tlumaczenia", "ToLongValue"), "30"));
+
             if (ModelState.IsValid == false)
             {
-                var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
-                var viewData = InitInvoiceDetailsViewData(platnosc);
-                return View("Show",viewData); 
-            }
-
+                var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
+                var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+
+                if (!String.IsNullOrEmpty(errorViewData.Error))
+                    return View("Error1", errorViewData);
+
+                return View("Show", InitInvoiceDetailsViewData(platnosc));
+            }
             return RedirectToAction("Merchant", "Merchant", payer);
         }
@@ -98 +95 @@
 
             if (platnosc == null)
-            {
-                var errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0);
-                return View("Error1", errorViewData);
-            }
-            
+                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0)); 
+                       
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
 
-            //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
+            //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc, 
             //jesli tak, to sprawdzamy czy przyszlo potwierdzenie z eCardu.             
-            if (order > 0)
-                if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
-                    invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+            
+            if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
+                invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
                 
-            if (order == 0 || (CheckConfirm(id1, order) == 2) && order > 0 )
+            else if (CheckConfirm(id1, order) == 2) 
                 invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
            
-            return View(invoiceDeatailsViewData);
-        }
-        public ActionResult Fail(string id, string language)
-        {
-            language = _funkcjePlatnosci.SetLanguage(language);
+            return View(invoiceDeatailsViewData);      
+        }
+        public ActionResult Fail(string id, string language) 
+        {
+            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)
-            {
-                var errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0);
-                return View("Error1", errorViewData);
-            } 
-
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
-            return View(invoiceDeatailsViewData);
+                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));    
+          
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc); 
+            return View(invoiceDeatailsViewData); 
         }
         public ActionResult Form()
@@ -136 +127 @@
         }
         public ActionResult Status()
-        {
+        { 
             var potwierdzenie = new PotwierdzeniaEcard();
             var content = new ContentResult();
@@ -197 +188 @@
             var platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
 
-            if (platnosc == null || currentstate != ISPAID) return;
-
-            platnosc.Status = true;
-            platnosc.Status_data = DateTime.Now;
-            _repPayment.SubmitChanges();
+            if (platnosc != null && currentstate == ISPAID)
+            {
+                platnosc.Status = true;
+                platnosc.Status_data = DateTime.Now; 
+                _repPayment.SubmitChanges();
+            }
         }
 

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

@@ -61 +61 @@
             waluta.Currency = GetCurrency(platnosc.waluta_miano);
             if (waluta.Currency == PLN)
-            {
                 waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
-            }
             else
-            {
                 waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
-            }
             
             return waluta;
@@ -112 +108 @@
                                 break;
                         }
-                        // else if (lang == "it") culture = "it-IT";
-                        // else if (lang == "fr") culture = "fr-FR";
 
                         Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);

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

@@ -59 +59 @@
             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"];

trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx

@@ -7 +7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
     
-        <p class="pay_error">
-            
-            <%if (Model.vPlatnosciEcard != null && !String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer)){%>
+        <p class="pay_error">            
+            <%if (!String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer)){%>
                 <asp:Label ID="lab3" runat="server" Text="">
                 <% string txt = HttpContext.GetGlobalResourceObject("tlumaczenia", "blad2").ToString(); %>
                 <%=String.Format(txt, Model.vPlatnosciEcard.Faktura_Numer) %>
                 </asp:Label>
-            <%}%>
-            
-        </p>
-        <%if (Model.vPlatnosciEcard != null && !String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer))
-          {
-            string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia", "KolejnaProba").ToString();%>
-            <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.vPlatnosciEcard.ID_faktury }, null)%></p>
-        <%}
-          else
-          {
-            
-            string link1 = HttpContext.GetGlobalResourceObject("tlumaczenia", "Powrot").ToString(); %>
-            <p id="P1"><%=Html.ActionLink(link1, "LogOn", "Account")%></p>
-            
-        <%} %>
+                
+                <%string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia", "KolejnaProba").ToString();%>
+                <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.vPlatnosciEcard.ID_faktury }, null)%></p>
+            <%}%>              
+        </p>        
 </asp:Content>

trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx

@@ -12 +12 @@
         <p class="pay_error">
             <%=Model.info%>
-        </p>    
+        </p> 
     <%
     }
@@ -22 +22 @@
             <%=podziekowaniaTxt%>
         </p> 
-        <p class="LogOfflink">
+        <p class="LogOfflink">  
             <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Powrot").ToString()%>
             <%string tutaj = HttpContext.GetGlobalResourceObject("tlumaczenia", "Powrot2").ToString(); %>