Index: /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 911)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 932)
@@ -44,6 +44,6 @@
             <tr> 
                 <td>
-                    <%= Html.TextBox("numer_faktury")%>
-                    <%= Html.ValidationMessage("numer_faktury","*")%>
+                    <%= Html.TextBox("numerFaktury")%>
+                    <%= Html.ValidationMessage("numerFaktury", "*")%>
                 </td>
             </tr>
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 930)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 932)
@@ -8,14 +8,11 @@
 
 namespace Platnosci.Controllers
-{  
-
+{
     [HandleError]
     public class AccountController : Controller
     {
+        private readonly IRepository<vPlatnosciEcard> _repository;
+        private readonly FunkcjePlatnosci _funkcjePlatnosci;
 
-        private readonly IRepository<vPlatnosciEcard> _repository;
-        private readonly PlatnosciDataContext _context;
-        private FunkcjePlatnosci _func;
-                
         public IFormsAuthentication FormsAuth
         {
@@ -28,19 +25,17 @@
             _repository = new Repository<vPlatnosciEcard>(new DataContext1());
             FormsAuth = new FormsAuthenticationService();
-            _context = new PlatnosciDataContext();
-            _func = new FunkcjePlatnosci();
+            _funkcjePlatnosci = new FunkcjePlatnosci();
         }
 
-        public AccountController(IFormsAuthentication formsAuth, IRepository<vPlatnosciEcard> repository, PlatnosciDataContext context, FunkcjePlatnosci func)
+        public AccountController(IFormsAuthentication formsAuth, IRepository<vPlatnosciEcard> repository, FunkcjePlatnosci func)
         {
             _repository = repository;
             FormsAuth = formsAuth ?? new FormsAuthenticationService();
-            _context = context;
-            _func = func;
+            _funkcjePlatnosci = func;
         }
 
         public ActionResult LogOn(string language)
         {
-            language = _func.setLanguage(language);
+            _funkcjePlatnosci.setLanguage(language);
             return View();
         }
@@ -49,20 +44,17 @@
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",
             Justification = "Needs to take same parameter type as Controller.Redirect()")]
-        public ActionResult LogOn(string nip, string numer_faktury, string returnUrl, string language)
+        public ActionResult LogOn(string nip, string numerFaktury, string returnUrl, string language)
         {
-
-            language = _func.setLanguage(language);
-            vPlatnosciEcard platnosc = new vPlatnosciEcard();    
-            if (!ValidateLogOn(nip, numer_faktury))
+            _funkcjePlatnosci.setLanguage(language);
+            var platnosc = new vPlatnosciEcard();
+            if (!ValidateLogOn(nip, numerFaktury))
             {
                 return View();
             }
-            else
-            {
-                var Login = _repository.FindInvoiceByNipNumber(nip, numer_faktury).SingleOrDefault();
-                platnosc = Login;
-                if (platnosc == null) return View();
-            }
-            _func.SetUserLogger(nip, numer_faktury);
+            
+            var login = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault();
+            platnosc = login;
+            if (platnosc == null) return View();
+            _funkcjePlatnosci.SetUserLogger(nip, numerFaktury);
 
             FormsAuth.SignIn(nip, false);
@@ -72,6 +64,8 @@
                 return Redirect(returnUrl);
             }
-            else return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });         
+            
+            return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });
         }
+
         public ActionResult LogOff()
         {
@@ -80,24 +74,24 @@
         }
 
-        private bool ValidateLogOn(string nip, string numer_faktury)
+        private bool ValidateLogOn(string nip, string numerFaktury)
         {
             if (String.IsNullOrEmpty(nip))
             {
-                string err_nip = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_nip").ToString();
-                ModelState.AddModelError("nip", err_nip);
+                var errNip = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_nip").ToString();
+                ModelState.AddModelError("nip", errNip);
             }
-            if (String.IsNullOrEmpty(numer_faktury))
+            if (String.IsNullOrEmpty(numerFaktury))
             {
-                string err_faktura = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_faktura").ToString();
-                ModelState.AddModelError("numer_faktury", err_faktura);
+                var errFaktura = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_faktura").ToString();
+                ModelState.AddModelError("numerFaktury", errFaktura);
             }
             if (ModelState.IsValid)
             {
-                bool DaneOk = _repository.Exists(u => u.Faktura_Numer == numer_faktury && u.nip == nip);
-                if (DaneOk == false)
+                var daneOk = _repository.Exists(u => u.Faktura_Numer == numerFaktury && u.nip == nip);
+                if (daneOk == false)
                 {
-                    string err_logowanie = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_logowanie").ToString();
-                    ModelState.AddModelError("_FORM", err_logowanie);
-                }               
+                    var errLogowanie = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_logowanie").ToString();
+                    ModelState.AddModelError("_FORM", errLogowanie);
+                }
             }
             return ModelState.IsValid;
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 930)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 932)
@@ -13,5 +13,5 @@
             const string test = "test";
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
-            ie.TextField(Find.ByName("numer_faktury")).TypeText("27/ASZ/2009");
+            ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
             ie.TextField(Find.ByName("nip")).TypeText("854956281");
             ie.Button(Find.ById("loguj")).Click();
@@ -29,5 +29,5 @@
             const string test = "test";
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
-            ie.TextField(Find.ByName("numer_faktury")).TypeText("27/ASZ/2009");
+            ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
             ie.TextField(Find.ByName("nip")).TypeText("854956281");
             ie.Button(Find.ById("loguj")).Click();
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 931)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 932)
@@ -12,5 +12,5 @@
         {
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
-            ie.TextField(Find.ByName("numer_faktury")).TypeText("24/HOL/2009");
+            ie.TextField(Find.ByName("numerFaktury")).TypeText("24/HOL/2009");
             ie.TextField(Find.ByName("nip")).TypeText("501379568");
             ie.Button(Find.ById("loguj")).Click();
@@ -23,5 +23,5 @@
         {
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
-            ie.TextField(Find.ByName("numer_faktury")).TypeText("");
+            ie.TextField(Find.ByName("numerFaktury")).TypeText("");
             ie.TextField(Find.ByName("nip")).TypeText("");
             ie.Button(Find.ById("loguj")).Click();