Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantHelperTests.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantHelperTests.cs (revision 985) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantHelperTests.cs (revision 990) @@ -1,3 +1,4 @@ using System; +using System.Linq; using adMoto.Payments.Core; using adMoto.Payments.Core.Data; @@ -201,5 +202,5 @@ //Act eCardData.CreateMerchantData(invoice, payer, "pl", "ahaah"); - var payment = repPayment.FindOne(i => i.IDFaktury == idFaktury); + var payment = repPayment.Find(i => i.IDFaktury == idFaktury).FirstOrDefault(); //Assert Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 988) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 990) @@ -45,7 +45,7 @@ {"CURRENTSTATE", "4"}, {"PREVIOUSSTATE", "5"}, - {"PAYMENTTYPE", "True"}, - {"EVENTTYPE", "False"}, - {"PAYMENTNUMBER", "True"}, + {"PAYMENTTYPE", "1"}, + {"EVENTTYPE", "0"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "7"}, @@ -87,7 +87,7 @@ {"CURRENTSTATE", "4"}, {"PREVIOUSSTATE", "5"}, - {"PAYMENTTYPE", "True"}, - {"EVENTTYPE", "False"}, - {"PAYMENTNUMBER", "True"}, + {"PAYMENTTYPE", "1"}, + {"EVENTTYPE", "0"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "7"}, @@ -117,6 +117,6 @@ {"PREVIOUSSTATE", "5"}, {"PAYMENTTYPE", "32hvhsvhv"}, - {"EVENTTYPE", "False"}, - {"PAYMENTNUMBER", "True"}, + {"EVENTTYPE", "0"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "7"}, @@ -144,7 +144,7 @@ {"CURRENTSTATE", "4"}, {"PREVIOUSSTATE", "5"}, - {"PAYMENTTYPE", "True"}, + {"PAYMENTTYPE", "1"}, {"EVENTTYPE", "32hvhsvhv"}, - {"PAYMENTNUMBER", "True"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "7"}, @@ -173,7 +173,7 @@ {"CURRENTSTATE", "4"}, {"PREVIOUSSTATE", "5"}, - {"PAYMENTTYPE", "32hvhsvhv"}, - {"EVENTTYPE", "False"}, - {"PAYMENTNUMBER", "True"}, + {"PAYMENTTYPE", "1"}, + {"EVENTTYPE", "0"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "7"}, @@ -202,7 +202,7 @@ {"CURRENTSTATE", "4"}, {"PREVIOUSSTATE", "5"}, - {"PAYMENTTYPE", "True"}, - {"EVENTTYPE", "False"}, - {"PAYMENTNUMBER", "True"}, + {"PAYMENTTYPE", "1"}, + {"EVENTTYPE", "0"}, + {"PAYMENTNUMBER", "1"}, {"APPROVALCODE", "6"}, {"VALIDATIONCODE", "76666"}, @@ -218,5 +218,5 @@ Assert.That(_repConfirm.Count(), Is.EqualTo(0), "Should not have any items"); Assert.That(result.Content.Contains("FALSE"), "Response should contain FALSE"); - Assert.That(result.Content.Contains("ArgumentException"), "Response should contain SqlException"); + Assert.That(result.Content.Contains("ArgumentException"), "Response should contain ArgumentException"); } Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/eCardValidationTests.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/eCardValidationTests.cs (revision 988) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/eCardValidationTests.cs (revision 990) @@ -89,5 +89,5 @@ { var ie = new IE(adres); - ie.TextField(Find.ByName("EVENTTYPE")).TypeText("212"); + ie.TextField(Find.ByName("EVENTTYPE")).TypeText("212dsf"); ie.Button(Find.ById("dalej")).Click(); Assert.IsTrue(ie.ContainsText("FALSE")); Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs (revision 985) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs (revision 990) @@ -39,5 +39,5 @@ }; _repInvoices.Insert(invoices); - var invoice = _repInvoices.FindOne(p => p.NUMER == 1 && p.NUMER_ROK == 1 && p.NUMER_ROZ == "SLJ" && p.ID_NABYWCY == 76131); + var invoice = _repInvoices.Find(p => p.NUMER == 1 && p.NUMER_ROK == 1 && p.NUMER_ROZ == "SLJ" && p.ID_NABYWCY == 76131).FirstOrDefault(); if (invoice != null) @@ -51,5 +51,5 @@ _repInvoiceDetails.Insert(invoiceDetails); - var invoiceDetails2 = _repInvoiceDetails.FindOne(p => p.ID_FAKTURY == invoiceDetails.ID_FAKTURY && p.SYMBOL_SWW == "TEST"); + var invoiceDetails2 = _repInvoiceDetails.Find(p => p.ID_FAKTURY == invoiceDetails.ID_FAKTURY && p.SYMBOL_SWW == "TEST").FirstOrDefault(); if (invoiceDetails2 != null) @@ -69,9 +69,9 @@ public void DeleteTestRecordsFromRepository(UIData uiData) { - var invoice = _repInvoices.FindOne(p => p.ID_FAKTURY == uiData.FAKTURA_ID); + var invoice = _repInvoices.Find(p => p.ID_FAKTURY == uiData.FAKTURA_ID).FirstOrDefault(); if (invoice != null) _repInvoices.Delete(invoice); - var invoiceDetails = _repInvoiceDetails.FindOne(p => p.ID_FAKTURA_DETAILS == uiData.FAKTURA_DETAIL_ID); + var invoiceDetails = _repInvoiceDetails.Find(p => p.ID_FAKTURA_DETAILS == uiData.FAKTURA_DETAIL_ID).FirstOrDefault(); if (invoiceDetails != null) _repInvoiceDetails.Delete(invoiceDetails); @@ -81,9 +81,9 @@ { _repPayment = new Repository(new DataContext()); - var payment = _repPayment.FindOne(p => p.IDFaktury == uiData.FAKTURA_ID && + var payment = _repPayment.Find(p => p.IDFaktury == uiData.FAKTURA_ID && p.NAME == uiData.Test_firstname && p.SURNAME == uiData.Test_surname && p.ORDERDESCRIPTION == uiData.Test_numer_faktury && - p.nip == uiData.Test_nip); + p.nip == uiData.Test_nip).FirstOrDefault(); if (payment != null) Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs (revision 984) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs (revision 990) @@ -33,5 +33,5 @@ dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2"; dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash; - dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + merchant.Payment.AUTODEPOSIT; + dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=1"; dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk; dane += "&SESSIONID=" + merchant.Payment.SESSIONID; Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs (revision 984) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs (revision 990) @@ -83,33 +83,24 @@ } - public string SetLanguage(string lang) + public void SetLanguage(string lang) { + if (lang == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) return; + + string culture; switch (lang) { + case "en": + culture = "en-GB"; + break; case "de": - case "en": - case "pl": - if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) - { - var culture = "pl-PL"; - switch (lang) - { - case "pl": - culture = "pl-PL"; - break; - case "en": - culture = "en-US"; - break; - case "de": - culture = "de-DE"; - break; - } - - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); - Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); - } + culture = "de-DE"; + break; + default: + culture = "pl-PL"; break; } - return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); + + Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture); + Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture); } Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx (revision 985) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx (revision 990) @@ -14,5 +14,5 @@ 2. ORDERNUMBER: - <%=Html.TextBox("ORDERNUMBER", Convert.ToInt32(1234))%> + <%=Html.TextBox("ORDERNUMBER", 1234)%> @@ -42,5 +42,5 @@ 9. PAYMENTTYPE: - <%=Html.TextBox("PAYMENTTYPE", Convert.ToBoolean(1))%> + <%=Html.TextBox("PAYMENTTYPE", 1)%> @@ -50,9 +50,9 @@ 11. EVENTTYPE: - <%=Html.TextBox("EVENTTYPE", Convert.ToBoolean(1))%> + <%=Html.TextBox("EVENTTYPE", 1)%> 12. PAYMENTNUMBER: - <%=Html.TextBox("PAYMENTNUMBER", Convert.ToBoolean(1))%> + <%=Html.TextBox("PAYMENTNUMBER", 1)%> Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs =================================================================== --- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 984) +++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 990) @@ -36,5 +36,5 @@ public ActionResult Merchant(Payer payer, string language) { - language = _paymentsUtils.SetLanguage(language); + _paymentsUtils.SetLanguage(language); var id1 = Convert.ToInt32(payer.Id_faktury);