Index: trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 942)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 948)
@@ -37,4 +37,7 @@
         public ActionResult LogOn(string language)
         {
+            if (language != "pl" && language != "en" && language != "de")
+                return RedirectToAction("LogOn", "Account", new { language = "pl" });
+
             _funkcjePlatnosci.setLanguage(language);
             return View();
Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 935)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 948)
@@ -52,4 +52,6 @@
 
             var systemKs = platnosc.SystemKsiegowyId.ToString();
+            if (ConfigurationManager.AppSettings["wersja"] == "TEST")
+                systemKs = "2";
 
             var createPayment = AddNewPayment(newPayment);
@@ -170,5 +172,5 @@
         {
             var merchant = new Merchant();
-            if (systemKs == "1")
+            if (systemKs == "2")
             {
                 merchant.merchntId = "171485000";
Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 937)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 948)
@@ -37,5 +37,5 @@
         public ActionResult Show(string id, string language)
         {
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             var id1 = ConvertId(id);
 
@@ -63,5 +63,5 @@
         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,5 +91,5 @@
             var order = ConvertId(o);
             
-            _funkcjePlatnosci.setLanguage(language);
+            language = _funkcjePlatnosci.setLanguage(language);
             
             var id1 = ConvertId(id);
@@ -114,5 +114,5 @@
         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();