Index: trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs (revision 957)
+++ trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs (revision 959)
@@ -52,5 +52,5 @@
             merchant.Payment = newPayment;
             GetMerchantInfo(merchant);
-            SetHash(merchant);
+            merchant.Hash = SetHash(merchant);
 
             //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
@@ -85,12 +85,13 @@
             }
         }
-        private void SetHash(Merchant merchant)
+        public string SetHash(Merchant merchant)
         {
+            if (merchant == null)
+                throw new ArgumentNullException("parametr merchant is null in SetHash method");
+
             var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
 
-            if (platnosc == null || merchant == null)
-            {
+            if (platnosc == null)            
                 merchant.Hash = HASH_ERROR_INFO;
-            }
             else
             {
@@ -117,4 +118,5 @@
                 merchant.Hash = strResponse;
             }
+            return merchant.Hash;
         }
     }
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 954)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 959)
@@ -161,5 +161,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;Invoice number&apos; is required..
+        ///   Looks up a localized string similar to Invoice number is required..
         /// </summary>
         internal static string err_faktura {
Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 954)
+++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 959)
@@ -216,5 +216,5 @@
   </data>
   <data name="err_faktura" xml:space="preserve">
-    <value>'Invoice number' is required.</value>
+    <value>Invoice number is required.</value>
   </data>
   <data name="err_logowanie" xml:space="preserve">
Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 957)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 959)
@@ -53,5 +53,5 @@
                 return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
             
-            var adres = _eCardData.GetUrl(merchant);
+            var adres = _eCardData.GetUrl(merchant); 
             Response.Redirect(adres);           
             return new EmptyResult();