Index: trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs (revision 971)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs (revision 984)
@@ -29,9 +29,9 @@
         }
 
-        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils func)
+        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils paymentsUtils)
         {
             _repository = repository;
             FormsAuth = formsAuth ?? new FormsAuthenticationService();
-            _paymentsUtils = func;
+            _paymentsUtils = paymentsUtils;
         }
 
@@ -51,13 +51,14 @@
         {
             _paymentsUtils.SetLanguage(language);
-            var platnosc = new Invoice();
+            var invoice = new Invoice();
+            
             if (!ValidateLogOn(nip, numerFaktury))
-            {
+                return View();            
+            
+            invoice = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault();
+            
+            if (invoice == null) 
                 return View();
-            }
-            
-            var login = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault();
-            platnosc = login;
-            if (platnosc == null) return View();
+
             _paymentsUtils.SetUserLogger(nip, numerFaktury);
 
@@ -65,9 +66,7 @@
 
             if (!String.IsNullOrEmpty(returnUrl))
-            {
                 return Redirect(returnUrl);
-            }
             
-            return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });
+            return RedirectToAction("Show", "Platnosc", new { id = invoice.ID_faktury });
         }
 
@@ -86,4 +85,5 @@
             if (String.IsNullOrEmpty(nip))
                 ModelState.AddModelError("nip", errNip);
+            
             if (String.IsNullOrEmpty(numerFaktury))
                 ModelState.AddModelError("numerFaktury", errFaktura);
Index: trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 971)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 984)
@@ -39,11 +39,11 @@
 
             var id1 = Convert.ToInt32(payer.Id_faktury);
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _paymentsUtils.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(invoice, ControllerContext.HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error)) 
                 return View("Error1", errorViewData);
 
-            var merchant = _merchantHelper.CreateMerchantData(platnosc, payer, language, Session.SessionID);
+            var merchant = _merchantHelper.CreateMerchantData(invoice, payer, language, Session.SessionID);
             
             if (merchant == null || !String.IsNullOrEmpty(merchant.Error)) 
Index: trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 978)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 984)
@@ -43,17 +43,17 @@
             var id1 = ConvertId(id);
 
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error))
                 return View("Error1", errorViewData);
 
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
 
-            var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
+            var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); //szukamy uregulowanej faktury
             if (tablicaPotwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
             {
                 var dataZaplaty = String.Format("{0:dd-MM-yyyy}", tablicaPotwierdzenia[0].AUTHTIME);
-                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);
+                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), invoice.Faktura_Numer, dataZaplaty);
                 invoiceDeatailsViewData.Termin = dataZaplaty;
                 return View("Paid", invoiceDeatailsViewData);
@@ -80,11 +80,11 @@
             if (ModelState.IsValid == false)
             {
-                var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-                var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
+                var invoice = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
+                var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name);
 
                 if (!String.IsNullOrEmpty(errorViewData.Error))
                     return View("Error1", errorViewData);
 
-                return View("Show", InitInvoiceDetailsViewData(platnosc));
+                return View("Show", InitInvoiceDetailsViewData(invoice));
             }
             return RedirectToAction("Merchant", "Merchant", payer);
@@ -96,10 +96,10 @@
             _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            if (platnosc == null)
+            if (invoice == null)
                 return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
 
             //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc, 
@@ -119,12 +119,12 @@
             _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
-            var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+            var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            if (platnosc == null)
+            if (invoice == null)
                 return View("Error1",
                             _paymentsUtils.InitErrorViewData(
                                 _translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
             return View(invoiceDeatailsViewData);
         }
@@ -141,10 +141,10 @@
         }
 
-        private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice platnosc)
+        private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice invoice)
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
-            invoiceDeatailsViewData.Invoice = platnosc;
-            invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
-            invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
+            invoiceDeatailsViewData.Invoice = invoice;
+            invoiceDeatailsViewData.Payer = InitPayer(invoice.ID_faktury);
+            invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(invoice.Brutto, invoice.waluta_brutto, invoice.waluta_miano);
             return invoiceDeatailsViewData;
         }
@@ -158,10 +158,10 @@
         public void UpdateStatus(int ordernumber, string currentstate)
         {
-            var platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
+            var payment = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
 
-            if (platnosc != null && currentstate == ISPAID)
+            if (payment != null && currentstate == ISPAID)
             {
-                platnosc.Status = true;
-                platnosc.Status_data = DateTime.Now;
+                payment.Status = true;
+                payment.Status_data = DateTime.Now;
                 _repPayment.SubmitChanges();
             }
@@ -170,7 +170,7 @@
         public int CheckConfirm(int idfaktury, int order)
         {
-            var pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
+            var payment = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
 
-            if (pl != null)
+            if (payment != null)
             {
                 var confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();