Index: /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 948) +++ /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 950) @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Web; using Platnosci.Core.Linq; using System.Threading; using System.Globalization; -using System.Web.Mvc; using System.Configuration; using System.Security.Principal; @@ -22,5 +19,6 @@ public string BruttoToString(decimal? kwota, decimal? waluta, string miano) { - string brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN "; + var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN "; + if (waluta > 0 && (miano != "" || miano != "PLN")) { @@ -29,83 +27,96 @@ return brutto; } + public bool UserIdentity(vPlatnosciEcard platnosc, string userName) { - if (platnosc != null && platnosc.nip == userName) + return platnosc != null && platnosc.nip == userName; + } + + public Waluta SetAmount(vPlatnosciEcard platnosc) + { + var waluta = new Waluta {Amount = Convert.ToInt32(platnosc.Brutto*100)}; + + if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN") { - return true; - } - return false; - } - public Waluta setAmount(vPlatnosciEcard platnosc){ - - Waluta waluta = new Waluta(); - waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100); - - if (String.IsNullOrEmpty(platnosc.waluta_miano) || platnosc.waluta_miano == "PLN") - { - waluta.Currency = PLN; + switch (platnosc.waluta_miano) + { + case "EUR": + waluta.Currency = EUR; + break; + case "GBP": + waluta.Currency = GBP; + break; + case "USD": + waluta.Currency = USD; + break; + } } else { - if (platnosc.waluta_miano == "EUR") - { - waluta.Currency = EUR; - } - else if (platnosc.waluta_miano == "GBP") - { - waluta.Currency = GBP; - } - else if (platnosc.waluta_miano == "USD") - { - waluta.Currency = USD; - } + waluta.Currency = PLN; } return waluta; } - public string setLanguage(string lang){ - if (lang == "pl" || lang == "en" || lang == "de" )//|| lang == "it" || lang == "fr") + public string SetLanguage(string lang) + { + switch (lang) { - if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) - { - string culture = "pl-PL"; - if (lang == "pl") culture = "pl-PL"; - else if (lang == "en") culture = "en-US"; - else if (lang == "de") culture = "de-DE"; - // else if (lang == "it") culture = "it-IT"; - // else if (lang == "fr") culture = "fr-FR"; + 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; + } + // else if (lang == "it") culture = "it-IT"; + // else if (lang == "fr") culture = "fr-FR"; - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); - Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); - } + Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); + Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); + } + break; } - string pom = CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); - return pom; + + return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); } - public string setTitle() + + public string SetTitle() { - string str = ""; - string css = ConfigurationManager.AppSettings["Css"].ToString(); - - if (css == "truck") str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck").ToString() + " - "; - else if (css == "admoto") str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto").ToString() + " - "; - + var str = ""; + var css = ConfigurationManager.AppSettings["Css"]; + + if (css == "truck") + str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - "; + else if (css == "admoto") + str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - "; + return str; } - public void SetUserLogger(string nip, string faktura){ - - string User = nip + "-" + faktura; - Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(User, ""), null); + + public void SetUserLogger(string nip, string faktura) + { + + var user = nip + "-" + faktura; + Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null); } + public ErrorViewData InitErrorViewData(string errortxt, int idFaktury) { - ErrorViewData er = new ErrorViewData(); - er.Error = errortxt; - er.InvoiceId = idFaktury; + var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury }; return er; } - + } } - - Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 948) +++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 950) @@ -5,5 +5,5 @@ <% FunkcjePlatnosci func = new FunkcjePlatnosci(); - string str = func.setTitle(); + string str = func.SetTitle(); %> <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 948) +++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 950) @@ -5,5 +5,5 @@ <% FunkcjePlatnosci func = new FunkcjePlatnosci(); - string str = func.setTitle(); + string str = func.SetTitle(); %> <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> Index: /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 948) +++ /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 950) @@ -4,5 +4,5 @@ <% FunkcjePlatnosci func = new FunkcjePlatnosci(); - string str = func.setTitle(); + string str = func.SetTitle(); %> Index: /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 940) +++ /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 950) @@ -5,5 +5,5 @@ <% FunkcjePlatnosci func = new FunkcjePlatnosci(); - string str = func.setTitle(); + string str = func.SetTitle(); %> <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "PageLogin").ToString()%> Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 949) +++ /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 950) @@ -40,5 +40,5 @@ return RedirectToAction("LogOn", "Account", new { language = "pl" }); - _funkcjePlatnosci.setLanguage(language); + _funkcjePlatnosci.SetLanguage(language); return View(); } @@ -49,5 +49,5 @@ public ActionResult LogOn(string nip, string numerFaktury, string returnUrl, string language) { - _funkcjePlatnosci.setLanguage(language); + _funkcjePlatnosci.SetLanguage(language); var platnosc = new vPlatnosciEcard(); if (!ValidateLogOn(nip, numerFaktury)) Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 949) +++ /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 950) @@ -37,5 +37,5 @@ { System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language); - language = _funkcjePlatnosci.setLanguage(language); + language = _funkcjePlatnosci.SetLanguage(language); var id1 = Convert.ToInt32(payer.Id_faktury); @@ -48,5 +48,5 @@ return View("Error1", IsError("weryfikacja", 0)); - var waluta = _funkcjePlatnosci.setAmount(platnosc); + var waluta = _funkcjePlatnosci.SetAmount(platnosc); var newPayment = InitNewPayment(id1, platnosc, waluta, payer ); Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 949) +++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 950) @@ -37,5 +37,5 @@ public ActionResult Show(string id, string language) { - language = _funkcjePlatnosci.setLanguage(language); + language = _funkcjePlatnosci.SetLanguage(language); var id1 = ConvertId(id); @@ -63,5 +63,5 @@ public ActionResult Show(Payer payer, string language) { - 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); - language = _funkcjePlatnosci.setLanguage(language); + language = _funkcjePlatnosci.SetLanguage(language); var id1 = ConvertId(id); @@ -114,5 +114,5 @@ public ActionResult Fail(string id, string language) { - language = _funkcjePlatnosci.setLanguage(language); + language = _funkcjePlatnosci.SetLanguage(language); var id1 = ConvertId(id); var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 932) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 950) @@ -7,4 +7,23 @@ public class UIPlatnosciTests { + [Test] + [Category("UI")] + public void CheckCorrectPay() + { + const string test = "test"; + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); + ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009"); + ie.TextField(Find.ByName("nip")).TypeText("854956281"); + ie.Button(Find.ById("loguj")).Click(); + + ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test); + ie.TextField(Find.ByName("Payer.LastName")).TypeText(test); + ie.Button(Find.ById("place")).Click(); + Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test)); + ie.ForceClose(); + ie.Close(); + ie.Dispose(); + } + [Test] [Category("UI")] @@ -22,20 +41,6 @@ Assert.IsTrue(ie.ContainsText("Proszę podać")); ie.ForceClose(); - } - [Test] - [Category("UI")] - public void CheckCorrectPay() - { - const string test = "test"; - var ie = new IE("http://localhost:3646/pl/Account/LogOn"); - ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009"); - ie.TextField(Find.ByName("nip")).TypeText("854956281"); - ie.Button(Find.ById("loguj")).Click(); - - ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test); - ie.TextField(Find.ByName("Payer.LastName")).TypeText(test); - ie.Button(Find.ById("place")).Click(); - Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test)); - ie.ForceClose(); + ie.Close(); + ie.Dispose(); } } Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 931) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 950) @@ -16,4 +16,5 @@ platnosc.Brutto = brutto; platnosc.SystemKsiegowyId = systemKsiegowy; + //platnosc.waluta_miano return platnosc; Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 932) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 950) @@ -9,4 +9,18 @@ [Test] [Category("UI")] + public void CheckErrorLogin() + { + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); + ie.TextField(Find.ByName("numerFaktury")).TypeText(""); + ie.TextField(Find.ByName("nip")).TypeText(""); + ie.Button(Find.ById("loguj")).Click(); + Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się")); + ie.ForceClose(); + ie.Close(); + ie.Dispose(); + } + + [Test] + [Category("UI")] public void CheckLoginCorrect() { @@ -17,15 +31,6 @@ Assert.IsTrue(ie.ContainsText("została uregulowana")); ie.ForceClose(); - } - [Test] - [Category("UI")] - public void CheckErrorLogin() - { - var ie = new IE("http://localhost:3646/pl/Account/LogOn"); - ie.TextField(Find.ByName("numerFaktury")).TypeText(""); - ie.TextField(Find.ByName("nip")).TypeText(""); - ie.Button(Find.ById("loguj")).Click(); - Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się")); - ie.ForceClose(); + ie.Close(); + ie.Dispose(); } }