Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs (revision 970)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs (revision 971)
@@ -2,8 +2,8 @@
 using adMoto.Payments.Core;
 using adMoto.Payments.Core.Data;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Models;
-
-namespace Platnosci.Tests.Web
+
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
@@ -21,11 +21,11 @@
             repPayment.Insert(platnosc);
            
-            var ecarddata = new eCardData(repPayment);
+            var ecarddata = new MerchantHelper(repPayment);
            
             var merchant = new Merchant(){
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+                                             Payment = platnosc,
+                                             Id = "171485000",
+                                             Password = "ashSeth2",
+                                         };
 
             //Act
@@ -46,16 +46,16 @@
             repPayment.Insert(platnosc);
 
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = new PlatnosciEcard(){
-                    ORDERDESCRIPTION = "dd",
-                    IDFaktury = 21,
-                    Data = DateTime.Now
-                },
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = new PlatnosciEcard(){
+                                                                     ORDERDESCRIPTION = "dd",
+                                                                     IDFaktury = 21,
+                                                                     Data = DateTime.Now
+                                                                 },
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
            
             //Act
@@ -73,16 +73,16 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
 
             //Act
@@ -101,16 +101,16 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 0;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
 
             //Act
@@ -129,16 +129,16 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "TEST",
-                Password = "test",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "TEST",
+                                   Password = "test",
+                               };
 
             //Act
@@ -157,16 +157,16 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 11;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
             
             //Act
@@ -193,5 +193,5 @@
             var payer = _function.CreatePayer(idFaktury, "test", "test");
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var eCardData = new eCardData(repPayment);
+            var eCardData = new MerchantHelper(repPayment);
 
             //Act
@@ -210,5 +210,5 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 0, 2);
 
@@ -228,5 +228,5 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "", 200, 2);
 
@@ -246,5 +246,5 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -264,5 +264,5 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -282,5 +282,5 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -302,5 +302,5 @@
             var pl = new PlatnosciEcard() {ORDERDESCRIPTION = "abc/2009"};
             var m = new Merchant(){Payment = pl, Id = "ABCD" };
-            var eCardData = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var eCardData = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             
             //Act