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

Data:

2009-12-11 12:07:56 (16 years ago)

Autor:

alina

Opis:

re #215 poprawki w tłumaczeniach

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Controllers

Pliki:

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

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

@@ -37 +37 @@
         public ActionResult LogOn(string language)
         {
+            if (language != "pl" && language != "en" && language != "de")
+                return RedirectToAction("LogOn", "Account", new { language = "pl" });
+
             _funkcjePlatnosci.setLanguage(language);
             return View();

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

@@ -52 +52 @@
 
             var systemKs = platnosc.SystemKsiegowyId.ToString();
+            if (ConfigurationManager.AppSettings["wersja"] == "TEST")
+                systemKs = "2";
 
             var createPayment = AddNewPayment(newPayment);
@@ -170 +172 @@
         {
             var merchant = new Merchant();
-            if (systemKs == "1")
+            if (systemKs == "2")
             {
                 merchant.merchntId = "171485000";

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

@@ -37 +37 @@
         public ActionResult Show(string id, string language)
         {
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             var id1 = ConvertId(id);
 
@@ -63 +63 @@
         public ActionResult Show(Payer payer, string language)
         {
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             
             var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
@@ -91 +91 @@
             var order = ConvertId(o);
             
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             
             var id1 = ConvertId(id);
@@ -114 +114 @@
         public ActionResult Fail(string id, string language)
         {
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             var id1 = ConvertId(id);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();