Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 927)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 937)
@@ -152,14 +152,4 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Incorrect VAT number or invoice number
-        ///.
-        /// </summary>
-        internal static string errorMsg {
-            get {
-                return ResourceManager.GetString("errorMsg", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Sorry! An unexpected error has occured..
         /// </summary>
@@ -171,5 +161,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Proszę podać numer faktury..
+        ///   Looks up a localized string similar to Incorrect invoice number..
         /// </summary>
         internal static string err_faktura {
@@ -180,5 +170,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Proszę podać imię właściciela karty kredytowej..
+        ///   Looks up a localized string similar to Please enter the name of credit card holder..
         /// </summary>
         internal static string err_imieWK {
@@ -189,5 +179,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Podano nieprawidłowy NIP lub numer faktury. .
+        ///   Looks up a localized string similar to Incorrect VAT number or invoice number..
         /// </summary>
         internal static string err_logowanie {
@@ -198,5 +188,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Proszę podać nazwisko właściciela karty kredytowej..
+        ///   Looks up a localized string similar to Please enter the surname of credit card holder..
         /// </summary>
         internal static string err_nazwiskoWK {
@@ -207,5 +197,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Proszę podać poprawny NIP. .
+        ///   Looks up a localized string similar to Incorrect VAT number..
         /// </summary>
         internal static string err_nip {
@@ -244,5 +234,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Put the VAT number of your company and invoice number:.
+        ///   Looks up a localized string similar to Please enter the VAT number of your company and the invoice number to log in:.
         /// </summary>
         internal static string info {
@@ -253,27 +243,9 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Informacje.
+        ///   Looks up a localized string similar to Information error.
         /// </summary>
         internal static string InfoError {
             get {
                 return ResourceManager.GetString("InfoError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to eCard website loading....
-        /// </summary>
-        internal static string Informacja {
-            get {
-                return ResourceManager.GetString("Informacja", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Order number is marked in red. .
-        /// </summary>
-        internal static string infoText {
-            get {
-                return ResourceManager.GetString("infoText", resourceCulture);
             }
         }
@@ -380,5 +352,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Thank you for settling payment for invoice number:.
+        ///   Looks up a localized string similar to Thank you for settling payment for invoice number.
         /// </summary>
         internal static string podziekowania {
@@ -398,5 +370,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Back to log in web site... .
+        ///   Looks up a localized string similar to To log out right now, click.
         /// </summary>
         internal static string Powrot {
@@ -407,4 +379,13 @@
         
         /// <summary>
+        ///   Looks up a localized string similar to here..
+        /// </summary>
+        internal static string Powrot2 {
+            get {
+                return ResourceManager.GetString("Powrot2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Order details.
         /// </summary>
@@ -488,5 +469,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Logowanie nie powiodło się. Popraw błędy i spróbuj zalogować sie ponownie..
+        ///   Looks up a localized string similar to Log in failed! There are problems with required fields. Please enter correct details and try again. .
         /// </summary>
         internal static string validateInfo {
@@ -507,13 +488,4 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Welcome.
-        /// </summary>
-        internal static string witaj {
-            get {
-                return ResourceManager.GetString("witaj", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Full name of credit card holder:.
         /// </summary>
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.fr.resx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.fr.resx (revision 926)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.fr.resx (revision 937)
@@ -166,7 +166,4 @@
     <value>Salaire</value>
   </data>
-  <data name="Pomoc" xml:space="preserve">
-    <value>Des problÚmes ?</value>
-  </data>
   <data name="SprawdzDane" xml:space="preserve">
     <value>Vérifiez tous les détails. Si tous les détails sont clic correct le bouton Salaire. Vous serez mouvement sur le site Web d'eCard de finir la transaction.</value>
@@ -191,5 +188,5 @@
   </data>
   <data name="podziekowania" xml:space="preserve">
-    <value>Merci du paiement de arrangement pour le numéro de facture :</value>
+    <value>Merci du paiement de arrangement pour le numéro de facture</value>
   </data>
   <data name="Powrot" xml:space="preserve">
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 926)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 937)
@@ -128,7 +128,4 @@
     <value>Setzen Sie die VAT-Zahl Ihrer Firma und Auftragsnummer:</value>
   </data>
-  <data name="infoText" xml:space="preserve">
-    <value>Auftragsnummer wird im Rot markiert. </value>
-  </data>
   <data name="Nip" xml:space="preserve">
     <value>Vat-Zahl:</value>
@@ -137,7 +134,4 @@
     <value>Rechnungsnummer:</value>
   </data>
-  <data name="NieWieszButton" xml:space="preserve">
-    <value>Sie don' t wissen, was Ihre Auftragsnummer ist?</value>
-  </data>
   <data name="PageLogin" xml:space="preserve">
     <value> Logon</value>
@@ -161,7 +155,4 @@
     <value>Name: </value>
   </data>
-  <data name="Informacja" xml:space="preserve">
-    <value>eCard siteladen
</value>
-  </data>
   <data name="Nazwa" xml:space="preserve">
     <value>Firma: </value>
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx (revision 934)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx (revision 937)
@@ -201,8 +201,8 @@
   </data>
   <data name="podziekowania" xml:space="preserve">
-    <value>Dziękujemy za dokonanie płatności za fakturę numer:</value>
+    <value>Dziękujemy za dokonanie płatności za fakturę numer</value>
   </data>
   <data name="Powrot" xml:space="preserve">
-    <value>Powrót na stronę logowania...</value>
+    <value>Aby się wylogować, kliknij </value>
   </data>
   <data name="PotwierdzenieTitle" xml:space="preserve">
@@ -231,5 +231,5 @@
   </data>
   <data name="err_faktura" xml:space="preserve">
-    <value>Proszę podać numer faktury.</value>
+    <value>Niepoprawny numer faktury.</value>
   </data>
   <data name="err_imieWK" xml:space="preserve">
@@ -243,5 +243,5 @@
   </data>
   <data name="err_nip" xml:space="preserve">
-    <value>Proszę podać poprawny NIP.</value>
+    <value>Niepoprawny NIP.</value>
   </data>
   <data name="InfoError" xml:space="preserve">
@@ -249,5 +249,5 @@
   </data>
   <data name="validateInfo" xml:space="preserve">
-    <value>Logowanie nie powiodło się. Popraw błędy i spróbuj zalogować sie ponownie.</value>
+    <value>Logowanie nie powiodło się! Popraw błędy i spróbuj zalogować sie ponownie.</value>
   </data>
   <data name="Status_faktury" xml:space="preserve">
@@ -278,3 +278,6 @@
     <value>Wystąpił nieoczekiwany błąd.</value>
   </data>
+  <data name="Powrot2" xml:space="preserve">
+    <value>tutaj.</value>
+  </data>
 </root>
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 927)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 937)
@@ -118,16 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="errorMsg" xml:space="preserve">
-    <value>Incorrect VAT number or invoice number
-</value>
-  </data>
   <data name="LoginInfo" xml:space="preserve">
     <value>Log in to pay by credit card.</value>
   </data>
   <data name="info" xml:space="preserve">
-    <value>Put the VAT number of your company and invoice number:</value>
-  </data>
-  <data name="infoText" xml:space="preserve">
-    <value>Order number is marked in red. </value>
+    <value>Please enter the VAT number of your company and the invoice number to log in:</value>
   </data>
   <data name="Nip" xml:space="preserve">
@@ -145,7 +138,4 @@
   <data name="tytul" xml:space="preserve">
     <value>Payment by credit card for advert.</value>
-  </data>
-  <data name="witaj" xml:space="preserve">
-    <value>Welcome</value>
   </data>
   <data name="Wyloguj" xml:space="preserve">
@@ -171,7 +161,4 @@
 </value>
   </data>
-  <data name="Informacja" xml:space="preserve">
-    <value>eCard website loading...</value>
-  </data>
   <data name="Nazwa" xml:space="preserve">
     <value>Company: </value>
@@ -208,8 +195,8 @@
   </data>
   <data name="podziekowania" xml:space="preserve">
-    <value>Thank you for settling payment for invoice number:</value>
+    <value>Thank you for settling payment for invoice number</value>
   </data>
   <data name="Powrot" xml:space="preserve">
-    <value>Back to log in web site... </value>
+    <value>To log out right now, click</value>
   </data>
   <data name="PotwierdzenieTitle" xml:space="preserve">
@@ -237,20 +224,20 @@
   </data>
   <data name="err_faktura" xml:space="preserve">
-    <value>Proszę podać numer faktury.</value>
+    <value>Incorrect invoice number.</value>
   </data>
   <data name="err_logowanie" xml:space="preserve">
-    <value>Podano nieprawidłowy NIP lub numer faktury. </value>
+    <value>Incorrect VAT number or invoice number.</value>
   </data>
   <data name="err_nip" xml:space="preserve">
-    <value>Proszę podać poprawny NIP. </value>
+    <value>Incorrect VAT number.</value>
   </data>
   <data name="validateInfo" xml:space="preserve">
-    <value>Logowanie nie powiodło się. Popraw błędy i spróbuj zalogować sie ponownie.</value>
+    <value>Log in failed! There are problems with required fields. Please enter correct details and try again. </value>
   </data>
   <data name="err_imieWK" xml:space="preserve">
-    <value>Proszę podać imię właściciela karty kredytowej.</value>
+    <value>Please enter the name of credit card holder.</value>
   </data>
   <data name="err_nazwiskoWK" xml:space="preserve">
-    <value>Proszę podać nazwisko właściciela karty kredytowej.</value>
+    <value>Please enter the surname of credit card holder.</value>
   </data>
   <data name="adresAdmoto" xml:space="preserve">
@@ -261,5 +248,5 @@
   </data>
   <data name="InfoError" xml:space="preserve">
-    <value>Informacje</value>
+    <value>Information error</value>
   </data>
   <data name="DaneFaktury" xml:space="preserve">
@@ -290,3 +277,6 @@
     <value>Sorry! An unexpected error has occured.</value>
   </data>
+  <data name="Powrot2" xml:space="preserve">
+    <value>here.</value>
+  </data>
 </root>
Index: trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 926)
+++ trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 937)
@@ -19,9 +19,14 @@
     %>
         <p class="Info">
-            <asp:Label ID="lab1" runat="server" Text="<%$Resources:tlumaczenia,podziekowania%>"></asp:Label>
-            <%=Model.vPlatnosciEcard.Faktura_Numer%>
+            <asp:Label ID="lab1" runat="server" Text="<%$Resources:tlumaczenia,podziekowania%>"> </asp:Label>
+            <%=Model.vPlatnosciEcard.Faktura_Numer%>.
         </p>  
     
-        <p class="LogOfflink">Aby siê wylogowaæ kliknij <%=Html.ActionLink("tutaj","LogOff","Account") %></p> 
+    
+        <p class="LogOfflink">
+            <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Powrot").ToString()%>
+            <%string tutaj = HttpContext.GetGlobalResourceObject("tlumaczenia", "Powrot2").ToString(); %>
+            <%=Html.ActionLink(tutaj,"LogOff","Account") %>
+        </p> 
     <%} %>
 </asp:Content>
Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 934)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 937)
@@ -104,15 +104,10 @@
             //jesli tak, to sprawdzamy czy przyszlo potwierdzenie z eCardu.             
             if (order > 0)
-            {
                 if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
-                {
                     invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
-                }
-                else
-                {
-                    if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
-                }
-            }
-
+                
+            if (order == 0 || (CheckConfirm(id1, order) == 2) && order > 0 )
+                invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
+           
             return View(invoiceDeatailsViewData);
         }