Index: trunk/eCard/eCardMVC/Platnosci/Web.config =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Web.config (revision 933) +++ trunk/eCard/eCardMVC/Platnosci/Web.config (revision 948) @@ -35,13 +35,11 @@ + - + - + - - - Index: trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 934) +++ trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 948) @@ -65,5 +65,5 @@ public string setLanguage(string lang){ - if (lang == "pl" || lang == "en" || lang == "de" || lang == "it" || lang == "fr") + if (lang == "pl" || lang == "en" || lang == "de" )//|| lang == "it" || lang == "fr") { if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) @@ -73,6 +73,6 @@ 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"; + // else if (lang == "it") culture = "it-IT"; + // else if (lang == "fr") culture = "fr-FR"; Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 942) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 948) @@ -89,5 +89,5 @@ /// - /// Looks up a localized string similar to Your payment for invoice number {0} is being processed.. + /// Looks up a localized string similar to Your payment for invoice number {0} is in progress.. /// internal static string blad1 { @@ -98,5 +98,5 @@ /// - /// Looks up a localized string similar to Payment for the invoice numbar {0} failed!. + /// Looks up a localized string similar to Payment for the invoice number {0} has been rejected!. /// internal static string blad2 { @@ -107,5 +107,5 @@ /// - /// Looks up a localized string similar to Nie moÅŒna wyświetlić danych.. + /// Looks up a localized string similar to The application can't display needed information.. /// internal static string brakdanych { @@ -116,5 +116,5 @@ /// - /// Looks up a localized string similar to Total charges: . + /// Looks up a localized string similar to Total amount:. /// internal static string Brutto { @@ -125,5 +125,5 @@ /// - /// Looks up a localized string similar to INVOICE DETAILS. + /// Looks up a localized string similar to Invoice details. /// internal static string DaneFaktury { @@ -134,5 +134,5 @@ /// - /// Looks up a localized string similar to CREDIT CARD DETAILS. + /// Looks up a localized string similar to Credit card details. /// internal static string DaneWlasciciela { @@ -143,5 +143,5 @@ /// - /// Looks up a localized string similar to Date of issue: . + /// Looks up a localized string similar to Invoice issue date:. /// internal static string DataWystawienia { @@ -179,5 +179,5 @@ /// - /// Looks up a localized string similar to Incorrect VAT number or invoice number.. + /// Looks up a localized string similar to Incorrect tax number or invoice number.. /// internal static string err_logowanie { @@ -197,5 +197,5 @@ /// - /// Looks up a localized string similar to 'VAT number' is required.. + /// Looks up a localized string similar to Tax number is required.. /// internal static string err_nip { @@ -206,6 +206,5 @@ /// - /// Looks up a localized string similar to BÅ‚Ä -d danych.. + /// Looks up a localized string similar to Data error.. /// internal static string Faktura_error { @@ -216,5 +215,5 @@ /// - /// Looks up a localized string similar to Name: . + /// Looks up a localized string similar to Firstname: . /// internal static string Imie { @@ -225,5 +224,5 @@ /// - /// Looks up a localized string similar to Name: . + /// Looks up a localized string similar to Firstname and surname:. /// internal static string ImieNazwisko { @@ -234,18 +233,9 @@ /// - /// Looks up a localized string similar to Please enter the VAT number of your company and the invoice number to log in:. + /// Looks up a localized string similar to Please enter your tax number and the invoice number to log in:. /// internal static string info { get { return ResourceManager.GetString("info", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Error information. - /// - internal static string InfoError { - get { - return ResourceManager.GetString("InfoError", resourceCulture); } } @@ -271,5 +261,5 @@ /// - /// Looks up a localized string similar to Log in to pay by credit card.. + /// Looks up a localized string similar to Please log in to pay by credit card.. /// internal static string LoginInfo { @@ -307,5 +297,5 @@ /// - /// Looks up a localized string similar to unpaid. + /// Looks up a localized string similar to outstanding. /// internal static string niezaplacona { @@ -316,5 +306,5 @@ /// - /// Looks up a localized string similar to VAT number:. + /// Looks up a localized string similar to Tax number:. /// internal static string Nip { @@ -352,5 +342,5 @@ /// - /// Looks up a localized string similar to Thank you for settling payment for invoice number {0}.. + /// Looks up a localized string similar to Thank you for your payment for invoice number {0}.. /// internal static string podziekowania { @@ -370,5 +360,5 @@ /// - /// Looks up a localized string similar to If you wish to log out, please click. + /// Looks up a localized string similar to Please click to log out. /// internal static string Powrot { @@ -388,5 +378,5 @@ /// - /// Looks up a localized string similar to Verify all details. If all details are correct click the Pay button. You will be move on the eCard web site to finish transaction.. + /// Looks up a localized string similar to Please verify all details. If everything is correct please click the Pay button. You will be redirected to the eCard web site to complete the transaction.. /// internal static string SprawdzDane { @@ -406,5 +396,5 @@ /// - /// Looks up a localized string similar to Order details. + /// Looks up a localized string similar to Invoice details. /// internal static string Szczegoly { @@ -442,5 +432,5 @@ /// - /// Looks up a localized string similar to Payment by credit card for advert.. + /// Looks up a localized string similar to Payment by credit card for advert. /// internal static string tytul { @@ -460,5 +450,5 @@ /// - /// Looks up a localized string similar to Login failed! There are problems with required fields. Please enter correct details and try again. . + /// Looks up a localized string similar to Login failed. Please enter correct details and try again.. /// internal static string validateInfo { @@ -469,5 +459,5 @@ /// - /// Looks up a localized string similar to Sorry, an error has occured during verification.. + /// Looks up a localized string similar to Sorry, an error has occured during your data verification.. /// internal static string weryfikacja { @@ -514,5 +504,5 @@ /// - /// Looks up a localized string similar to Płatność za fakturę o numerze {0} została uregulowana dnia {1}.. + /// Looks up a localized string similar to The the invoice number {0} has been paid on {1}.. /// internal static string zaplacono { Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 946) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 948) @@ -123,11 +123,11 @@ - Logon, zum durch Kreditkarte zu zahlen. + Bitte melden Sie sich ein, um mit der Kreditkarte zu bezahlen. - Setzen Sie die VAT-Zahl Ihrer Firma und Auftragsnummer: + Bitte geben Sie die korrekte Steuernummer und die Rechnungsnummer ein: - Vat-Zahl: + Steuernummer: @@ -135,5 +135,5 @@ - Logon + Anmelden @@ -141,8 +141,8 @@ - Zahlung durch Kreditkarte fÃŒr Anzeige. + Die Zahlung mit der Kreditkarte fÃŒr die Werbung - GesamtgebÃŒhren: + Gesamt: @@ -150,38 +150,35 @@ - Name: + Vorname: - Name: + Vor- und Nachname: - Firma: + Firmenname: - Familienname: + Name: - Bezahle + Bezahlen - ÜberprÃŒfen Sie alle Details. Wenn alle Details korrektes Klicken der Knopf Lohn sind. Sie sind verschieben auf der eCard Web site, Verhandlung zu beenden. + Bitte ÃŒberprÃŒfen Sie alle Angaben. Wenn alles korrekt ist klicken Sie bitte den Bezahlen-Button. Sie werden zu der eCard Web site weitergeleitet, wo Sie den Bezahlungsvorgang beenden können. - Details der Bestellung + Die Details der Rechnung - Abgabefrist: - - - VollstÀndiger Name des Kreditkartehalters: + Zahlungstermin: - Zahlung fÃŒr die Rechnung number {0} ausfallen! + Die Zahlung fÃŒr die Rechnungnummer {0} wurde abgelehnt. - Versuchen noch einmal
 + Bitte versuchen Sie noch einmal.. - Danke fÃŒr vereinbarende Zahlung fÃŒr Rechnungszahl {0}. + Vielen Dank fÃŒr die Bezahlung der Rechnung mir der Nummer {0}. @@ -195,11 +192,11 @@ - Zahlung fÃŒr die Rechnung number {0} ist in Realisation. + Die Zahlung fÃŒr die Rechnungnummer {0} ist in Bearbeitung. - Das Feld Rechnungsnummer ist notwendig. + Das Feld Rechnungsnummer ist ein Mussfeld. - Das Feld Vat-Zahl ist notwendig. + Das Feld Steuernummer ist ein Mussfeld. @@ -212,3 +209,63 @@ Strasse: + + Die Applikation kann leider nicht die nötigen Daten finden. + + + Die Daten der Rechnung + + + Die Daten der Kreditkarte + + + Ein unerwarteter Fehler. + + + Vorname des Kreditkarteinhabers: + + + Nachname des Kreditkarteinhabers: + + + Ein Datenfehler. + + + VerkÀufersdetails + + + unbezahlt + + + BezahlbestÀtigung + + + Um sich Abmelden, bitte klicken Sie + + + hier. + + + Rechnungsstatus: + + + Bezahlt am: + + + Einloggen nicht erfolgreich. Bitte korrigieren Sie die Fehler und versuchen Sie noch ein mal. + + + Es ist ein Fehler wÀhrend der Authorisierung aufgetreten. + + + Vor- und Nachname des Kreditkarteinhabers: + + + Abmelden + + + bezahlt + + + Die Rechnung mit der Nummer {0} wurde am {1} bezahlt. + Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx (revision 942) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx (revision 948) @@ -137,5 +137,5 @@ - Płatności kartą kredytową za reklamę. + Płatności kartą kredytową za reklamę @@ -236,7 +236,4 @@ Pole NIP jest wymagane. - - Informacje - Logowanie nie powiodło się! Popraw błędy i spróbuj zalogować się ponownie. @@ -249,8 +246,8 @@ - DANE FAKTURY + Dane faktury - DANE KARTY KREDYTOWEJ + Dane karty kredytowej Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 942) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 948) @@ -119,11 +119,11 @@ - Log in to pay by credit card. + Please log in to pay by credit card. - Please enter the VAT number of your company and the invoice number to log in: + Please enter your tax number and the invoice number to log in: - VAT number: + Tax number: @@ -137,5 +137,5 @@ - Payment by credit card for advert. + Payment by credit card for advert @@ -146,14 +146,14 @@ - Total charges: + Total amount: - Date of issue: + Invoice issue date: - Name: + Firstname: - Name: + Firstname and surname: @@ -171,8 +171,8 @@ - Verify all details. If all details are correct click the Pay button. You will be move on the eCard web site to finish transaction. + Please verify all details. If everything is correct please click the Pay button. You will be redirected to the eCard web site to complete the transaction. - Order details + Invoice details @@ -183,8 +183,8 @@ - Your payment for invoice number {0} is being processed. + Your payment for invoice number {0} is in progress. - Payment for the invoice numbar {0} failed! + Payment for the invoice number {0} has been rejected! @@ -192,8 +192,8 @@ - Thank you for settling payment for invoice number {0}. + Thank you for your payment for invoice number {0}. - If you wish to log out, please click + Please click to log out @@ -204,15 +204,14 @@ - Nie moÅŒna wyświetlić danych. + The application can't display needed information. - Sorry, an error has occured during verification. + Sorry, an error has occured during your data verification. - BÅ‚Ä -d danych. + Data error. - Płatność za fakturę o numerze {0} została uregulowana dnia {1}. + The the invoice number {0} has been paid on {1}. @@ -220,8 +219,8 @@ - Incorrect VAT number or invoice number. + Incorrect tax number or invoice number. - Login failed! There are problems with required fields. Please enter correct details and try again. + Login failed. Please enter correct details and try again. @@ -237,15 +236,12 @@ pay.truck-expo.com - - Error information - - INVOICE DETAILS + Invoice details - CREDIT CARD DETAILS + Credit card details - unpaid + outstanding @@ -271,5 +267,5 @@ - 'VAT number' is required. + Tax number is required. Index: trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 940) +++ trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 948) @@ -1,6 +1,11 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="System" %> +<%@ Import Namespace="Platnosci.Models" %> - <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> + <% + FunkcjePlatnosci func = new FunkcjePlatnosci(); + string str = func.setTitle(); + %> + <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> @@ -67,5 +72,5 @@ - <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%> + <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString()%> Index: trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 940) +++ trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 948) @@ -1,6 +1,11 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="System" %> +<%@ Import Namespace="Platnosci.Models" %> - <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> + <% + FunkcjePlatnosci func = new FunkcjePlatnosci(); + string str = func.setTitle(); + %> + <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%> @@ -66,5 +71,5 @@ - <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%> + <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString()%> Index: trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 933) +++ trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 948) @@ -6,5 +6,4 @@ string str = func.setTitle(); %> - <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "InfoError").ToString()%> Index: trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 908) +++ trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 948) @@ -21,6 +21,6 @@ <%=Html.ImageLink("gb.gif","en",querystring)%> <%=Html.ImageLink("de.gif","de",querystring)%> - <%=Html.ImageLink("it.gif","it",querystring)%> - <%=Html.ImageLink("fr.gif","fr",querystring)%> + Index: trunk/eCard/eCardMVC/Platnosci/Global.asax.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 881) +++ trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 948) @@ -20,6 +20,6 @@ routes.IgnoreRoute("elmah.axd"); routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - string lang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower(); - + string lang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower(); + routes.MapRoute( "eCard", 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(); Index: trunk/eCard/eCardMVC/Platnosci/Content/Site.css =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 940) +++ trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 948) @@ -180,5 +180,5 @@ { font-weight: bold; - width: 150px; + width: 170px; padding-top: 5px; }