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

Data:

2009-11-17 14:33:03 (16 years ago)

Autor:

alina

Opis:

re #215 modyfikacja akcji Potwierdzenie(do wyswietlenia statusu), dodanie funkcji InitErrorViewData?, zapisywanie plikow z bledami w katalogu Log...

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Controllers

Pliki:

• AccountController.cs (zmodyfikowane) (2 diffs)
• MerchantController.cs (zmodyfikowane) (1 diff)
• PlatnoscController.cs (zmodyfikowane) (11 diffs)

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

@@ -57 +57 @@
         public ActionResult LogOn(string nip, string numer_faktury, string returnUrl, string language)
         {
+
             language = _func.setLanguage(language);
             vPlatnosciEcard platnosc = new vPlatnosciEcard();    
@@ -69 +70 @@
                 if (platnosc == null) return View();
             }
+            _func.SetUserLogger(nip, numer_faktury);
 
             FormsAuth.SignIn(nip, false);
+
             if (!String.IsNullOrEmpty(returnUrl))
             {
                 return Redirect(returnUrl);
             }
-            else
-            {
-               _func.SetUserLogger(nip, numer_faktury);
-               return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury});
-            }
+            else return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });         
         }
         public ActionResult LogOff()
         {
-
             FormsAuth.SignOut();
             return RedirectToAction("LogOn", "Account");

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

@@ -49 +49 @@
             int id1 = Convert.ToInt32(payer.Id_faktury);
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            
-            if (!_func.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name))
+                 
+            if (platnosc == null)
             {
-                ErrorViewData errorViewData = new ErrorViewData();
-                errorViewData.error = HttpContext.GetGlobalResourceObject("tlumaczenia", "weryfikacja").ToString();
+                ErrorViewData errorViewData = _func.InitErrorViewData(HttpContext.GetGlobalResourceObject("tlumaczenia", "brakdanych").ToString());
+                return View("Error1", errorViewData);
+            }
+            else if (!_func.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name))
+            {
+                ErrorViewData errorViewData = _func.InitErrorViewData(HttpContext.GetGlobalResourceObject("tlumaczenia", "weryfikacja").ToString());
                 return View("Error1", errorViewData);
             }

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

@@ -18 +18 @@
 namespace Platnosci.Controllers
 {
+    
     [Authorize]
     public class PlatnoscController : Controller
@@ -31 +32 @@
         private string err_imie = "";
         private string err_nazwisko = "";
-
+        
         protected override void Initialize(RequestContext requestContext)
         {            
@@ -59 +60 @@
         public ActionResult Show(string id, string language)
         {
-          
             language = _func.setLanguage(language);
             int id1 = ConvertId(id); 
 
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            ErrorViewData errorViewData = new ErrorViewData();
-            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
+            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
             
             var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1);
@@ -71 +70 @@
             {
                 string data_zaplaty = String.Format("{0:dd-MM-yyyy}",tablica_potwierdzenia[0].AUTHTIME);
-                errorViewData.error = String.Format(zaplacono, platnosc.Faktura_Numer, data_zaplaty);
+                ErrorViewData errorViewData = _func.InitErrorViewData(String.Format(zaplacono, platnosc.Faktura_Numer, data_zaplaty));
                 return View("Error1", errorViewData);
             }            
@@ -87 +86 @@
 
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(payer.Id_faktury).SingleOrDefault();
-            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
+            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
             
             if (String.IsNullOrEmpty(payer.FirstName))
@@ -116 +115 @@
             int id1 = ConvertId(id);
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));            
+            string s = "";
+            
+            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));            
             
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
@@ -126 +127 @@
             int id1 = ConvertId(id);
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
+            if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); 
             
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
@@ -133 +134 @@
         public ActionResult Potwierdzenie(string status, string id)
         {
-            if (status == "ok") return RedirectToAction("Ok", "Platnosc", new {id});
-            return RedirectToAction("Fail", "Platnosc", new {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()
@@ -195 +204 @@
         {
             this.weryfikacja = value;
-
         }
         public void setBrakDanych(string value)
         {
             this.brakdanych = value;
-
         }
         public void setZaplacono(string value)
         {
             this.zaplacono = value;
-
         }
         public int ConvertId(string id)
@@ -221 +227 @@
         public ErrorViewData Iserror(vPlatnosciEcard platnosc)
         {
-            ErrorViewData errorViewData = new ErrorViewData();
-            if (platnosc == null)
-            {
-                errorViewData.error = brakdanych;
-            }
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
-            {
-                errorViewData.error = weryfikacja;
-            }
+            string errortxt = "";
+            if (platnosc == null) errortxt = brakdanych;
+            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name)) errortxt = weryfikacja;
+            ErrorViewData errorViewData = _func.InitErrorViewData(errortxt);
             return errorViewData;
         }
@@ -235 +236 @@
         {
             var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault();
-            //Pl.FindOne(i => i.ORDERNUMBER == ordernumber);
             if (platnosc != null && platnosc.Status == true && validationcode == "000")
             {