Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 970)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 971)
@@ -5,7 +5,7 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
-using Platnosci.Models;
+using adMoto.Payments.Web.Models;
 
-namespace Platnosci.Controllers
+namespace adMoto.Payments.Web.Controllers
 {
     [Authorize]
@@ -14,6 +14,6 @@
         private readonly IRepository<Invoice> _repVPayment;
         private readonly IRepository<PlatnosciEcard> _repPayment; 
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
-        private readonly eCardData _eCardData;
+        private readonly PaymentsUtils _paymentsUtils;
+        private readonly MerchantHelper _merchantHelper;
         private readonly ITranslateManager _translateManager;
 
@@ -22,7 +22,7 @@
             _repVPayment = new Repository<Invoice>(new DataContext());
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment);
             _translateManager = new Translation();
-            _eCardData = new eCardData(_repPayment);
+            _merchantHelper = new MerchantHelper(_repPayment);
         }
         public MerchantController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
@@ -31,24 +31,24 @@
             _repPayment = repPayment;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
-            _eCardData = new eCardData(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment, _translateManager);
+            _merchantHelper = new MerchantHelper(_repPayment);
         }
         public ActionResult Merchant(Payer payer, string language)
         {
-            language = _funkcjePlatnosci.SetLanguage(language);
+            language = _paymentsUtils.SetLanguage(language);
 
             var id1 = Convert.ToInt32(payer.Id_faktury);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _funkcjePlatnosci.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error)) 
                 return View("Error1", errorViewData);
 
-            var merchant = _eCardData.CreateMerchantData(platnosc, payer, language, Session.SessionID);
+            var merchant = _merchantHelper.CreateMerchantData(platnosc, payer, language, Session.SessionID);
             
-            if (merchant == null || (merchant != null && (!String.IsNullOrEmpty(merchant.Error)))) 
-                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
+            if (merchant == null || !String.IsNullOrEmpty(merchant.Error)) 
+                return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
             
-            var adres = _eCardData.GetUrl(merchant); 
+            var adres = _merchantHelper.GetUrl(merchant); 
             Response.Redirect(adres);           
             return new EmptyResult();