Index: /trunk/eCard/eCardMVC/Platnosci.Core/Interface/ITranslateManager.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Interface/ITranslateManager.cs (revision 927)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Interface/ITranslateManager.cs (revision 949)
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Platnosci.Core.Interface
+namespace Platnosci.Core.Interface
 {
     public interface ITranslateManager
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs (revision 918)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs (revision 949)
@@ -2,7 +2,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using Platnosci.Core.Linq;
-using System.Text; 
 
 namespace Platnosci.Core.Interface
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs (revision 867)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs (revision 949)
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Interface
+namespace Platnosci.Core.Interface
 {
     public interface IIdentifiable
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs (revision 918)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs (revision 949)
@@ -3,5 +3,4 @@
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Platnosci.Core.Linq;
 
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Platnosci.Core.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Platnosci.Core.csproj (revision 934)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Platnosci.Core.csproj (revision 949)
@@ -71,5 +71,5 @@
     <Compile Include="Interface\IRepository.cs" />
     <Compile Include="Interface\ITranslateManager.cs" />
-    <Compile Include="Linq\DataContext1.cs" />
+    <Compile Include="Linq\DataContext.cs" />
     <Compile Include="Linq\Merchant.cs" />
     <Compile Include="Linq\Payer.cs" />
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Platnosci.designer.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Platnosci.designer.cs (revision 870)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Platnosci.designer.cs (revision 949)
@@ -25,5 +25,5 @@
 	
 	[System.Data.Linq.Mapping.DatabaseAttribute(Name="BAZA_REKLAM_TEST")]
-	public partial class PlatnosciDataContext : DataContext
+	public partial class PlatnosciDataContext : System.Data.Linq.DataContext
 	{
         private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciDataContext.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciDataContext.cs (revision 870)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciDataContext.cs (revision 949)
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Platnosci.Core.Interface;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs (revision 867)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs (revision 949)
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -9,11 +7,7 @@
         public int Id
         {
-            get
-            {
-                return this.ORDERNUMBER;
-            }
+            get { return ORDERNUMBER; }
         }
 
     }
 }
-
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Waluta.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Waluta.cs (revision 866)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Waluta.cs (revision 949)
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Waluta
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs (revision 949)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs (revision 949)
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Platnosci.Core.Interface;
+
+namespace Platnosci.Core.Linq
+{
+    public class DataContext : IDataContext
+    {
+        private readonly PlatnosciDataContext _dataContext;
+        private readonly List<object> _listaPlatnosci = new List<object>();
+
+        public DataContext()
+        {
+            _dataContext = new PlatnosciDataContext();
+        }
+
+        public IQueryable<T> GetTable<T>() where T : class
+        {
+            return _dataContext.GetTable<T>();
+        }
+
+        public void Insert<T>(T item) where T : class
+        {
+            _dataContext.GetTable<T>().InsertOnSubmit(item);
+            _dataContext.SubmitChanges();
+        }
+
+        public void Delete<T>(T item) where T : class
+        {
+            if (item == null) return;
+
+            _dataContext.GetTable<T>().DeleteOnSubmit(item);
+            _dataContext.SubmitChanges();
+        }
+
+        public void SubmitChanges()
+        {
+            _dataContext.SubmitChanges();
+        }
+
+        public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
+        {
+            var query = from i in _dataContext.vPlatnosciEcards
+                        where (i.nip == nip && i.Faktura_Numer == numer)
+                        select i;
+            return query;
+        }
+
+        public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)
+        {
+            var query = from i in _dataContext.vPlatnosciEcards
+                        where i.ID_faktury == id
+                        select i;
+            return query;
+        }
+
+        public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
+        {
+            var query = _dataContext.PlatnosciEcards
+                            .Where(vp => vp.IDFaktury == idFaktury && vp.Status == true)
+                            .OrderByDescending(vp => vp.IDFaktury);
+
+            query.ToList();
+
+            var tablica = new List<PotwierdzeniaEcard>();
+
+            foreach (var pt in query)
+            {
+                var ecard = pt;
+                var query2 = _dataContext.PotwierdzeniaEcards
+                                .Where(ps => ps.ORDERNUMBER == ecard.ORDERNUMBER && ps.CURRENTSTATE == "payment_deposited")
+                                .OrderBy(ps => ps.id);
+
+                for (var i = 0; i < query2.ToList().Count; i++)
+                {
+                    tablica.Add(query2.ToList()[i]);
+                }
+            }
+
+            return tablica;
+        }
+
+        public List<object> Getlista()
+        {
+            return _listaPlatnosci;
+        }
+
+        public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
+        {
+            var query = from l in _dataContext.PlatnosciEcards
+                        where l.ORDERNUMBER == ordernumber
+                        select l;
+
+            return query;
+        }
+
+        public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
+        {
+            var ordernumber = 0;
+
+            var query = from l in _dataContext.PlatnosciEcards
+                        where l.ORDERDESCRIPTION == description && l.IDFaktury == idfaktury && l.Data == data
+                        select l;
+
+            var pl = query.ToList();
+            
+            if (pl.Count > 0 && pl[0].ORDERNUMBER > 0) ordernumber = pl[0].ORDERNUMBER;
+            
+            return ordernumber;
+        }
+    }
+}
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Translation.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Translation.cs (revision 927)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Translation.cs (revision 949)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Web;
 using Platnosci.Core.Interface;
 
@@ -11,9 +8,7 @@
         public string Translate(string className, string keyName)
         {
-            string strName = HttpContext.GetGlobalResourceObject(className, keyName).ToString();
+            var strName = HttpContext.GetGlobalResourceObject(className, keyName).ToString();
             return strName;
         }
-
-        
     }
 }
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 918)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 949)
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Linq;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Platnosci.Core.Interface;
 
@@ -17,17 +15,17 @@
     public class Repository<T> : IRepository<T> where T : class, IIdentifiable
     {
-        protected readonly IDataContext _dataContext;
+        protected readonly IDataContext DataContext;
 
         public Repository(IDataContext dataContext)
         {
-            _dataContext = dataContext;
+            DataContext = dataContext;
         }  
         public int Count()
         {
-            return _dataContext.GetTable<T>().Count();
+            return DataContext.GetTable<T>().Count();
         }
         public int Count(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Count(expression);
+            return DataContext.GetTable<T>().Count(expression);
         }
         public T FindOne(int id)
@@ -37,5 +35,5 @@
         public T FindOne(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression).SingleOrDefault();
+            return DataContext.GetTable<T>().Where(expression).SingleOrDefault();
         }
 
@@ -54,45 +52,45 @@
         public IList<T> FindAll()
         {
-            return _dataContext.GetTable<T>().ToList();
+            return DataContext.GetTable<T>().ToList();
         }
         public IList<T> FindAll(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression).ToList();
+            return DataContext.GetTable<T>().Where(expression).ToList();
         }
         public void Insert(T entity)
 	    {
-	        _dataContext.Insert(entity);            
+	        DataContext.Insert(entity);            
 	    }
         public void Delete(T entity)
         {
-            _dataContext.Delete(entity);
+            DataContext.Delete(entity);
         }
         public void SubmitChanges()
         {
-            _dataContext.SubmitChanges();
+            DataContext.SubmitChanges();
         }
         public IQueryable<T> Find(int id)
         {
-            return _dataContext.GetTable<T>().Where(t => t.Id == id);
+            return DataContext.GetTable<T>().Where(t => t.Id == id);
         }
         public IQueryable<T> Find(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression);        
+            return DataContext.GetTable<T>().Where(expression);        
         }
         public IQueryable<T> Find()
         {
-            return _dataContext.GetTable<T>();
+            return DataContext.GetTable<T>();
         }
         public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
         {
-            return _dataContext.FindInvoiceByNipNumber(nip, numer);
+            return DataContext.FindInvoiceByNipNumber(nip, numer);
         }
         public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
         {
-            return _dataContext.FindItemsByIdFaktury(idFaktury);
+            return DataContext.FindItemsByIdFaktury(idFaktury);
         }
         public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
         {
-            return _dataContext.GetOrdernumber(description, idfaktury, data);
+            return DataContext.GetOrdernumber(description, idfaktury, data);
         }
     }
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Payer.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Payer.cs (revision 915)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Payer.cs (revision 949)
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Payer
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs (revision 934)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs (revision 949)
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Merchant
     {
-        public string merchntId { get; set; }
-        public string merchantPassword { get; set; }
+        public string Id { get; set; }
+        public string Password { get; set; }
     }
 }
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs (revision 867)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs (revision 949)
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -7,18 +5,10 @@
     public partial class vPlatnosciEcard : IIdentifiable
     {
-        public string FullName 
-        { 
-            get 
-            { 
-                return LastName + " " + FirstName; 
-            }
+        public string FullName
+        {
+            get { return LastName + " " + FirstName; }
         }
 
-        public int Id
-        {
-            get { return this.ID_faktury; }
-        }
+        public int Id { get { return ID_faktury; } }
     }
 }
-
-
Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PotwierdzeniaEcard.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PotwierdzeniaEcard.cs (revision 872)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/PotwierdzeniaEcard.cs (revision 949)
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -11,8 +7,5 @@
         public int Id
         {
-            get
-            {
-                return this.id;
-            }
+            get { return id; }
         }
     }
Index: /unk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs (revision 918)
+++  (revision )
@@ -1,102 +1,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Platnosci.Core.Interface;
-using System.Data.Linq;
-
-namespace Platnosci.Core.Linq
-{
-    public class DataContext1 : IDataContext
-	{
-	        private readonly PlatnosciDataContext _dataContext;
-            private List<object> listaPlatnosci = new List<object>();
-            public DataContext1()
-	        {
-	            _dataContext = new PlatnosciDataContext();
-	        }            
-	        public IQueryable<T> GetTable<T>() where T : class
-	        {
-	            return _dataContext.GetTable<T>();
-	        }
-            public void Insert<T>(T item) where T : class
-	        {
-	            _dataContext.GetTable<T>().InsertOnSubmit(item);
-                _dataContext.SubmitChanges();
-	        }
-            public void Delete<T>(T item) where T : class 
-            {
-                if (item != null)
-                {
-                    _dataContext.GetTable<T>().DeleteOnSubmit(item);
-                    _dataContext.SubmitChanges();
-                }
-            }
-            public void SubmitChanges()
-            {
-                _dataContext.SubmitChanges();
-            }
-            public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
-            {
-                var query = from i in _dataContext.vPlatnosciEcards
-                            where (i.nip == nip && i.Faktura_Numer == numer)
-                            select i;
-                return query;
-            }
-            public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)
-            {
-                var query = from i in _dataContext.vPlatnosciEcards
-                            where i.ID_faktury == id
-                            select i;
-                return query;
-            }
-            public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
-            {
-                var query = from vp in _dataContext.PlatnosciEcards
-                            where vp.IDFaktury == idFaktury && vp.Status == true
-                            orderby vp.IDFaktury descending
-                            select vp;
-
-                query.ToList();
-                var tablica = new List<PotwierdzeniaEcard>();
-
-                foreach (var pt in query)
-                {
-                    var query2 = from ps in _dataContext.PotwierdzeniaEcards
-                                 where ps.ORDERNUMBER == pt.ORDERNUMBER && ps.CURRENTSTATE == "payment_deposited"
-                                 orderby ps.id
-                                 select ps;
-
-                    for (var i = 0; i < query2.ToList().Count; i++)
-                    {
-                        tablica.Add(query2.ToList()[i]);
-                    }
-                }
-                return tablica;
-            }
-            public List<object> getlista()
-            {
-                return listaPlatnosci;
-            }
-            public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
-            {
-                var query = from l in _dataContext.PlatnosciEcards
-                            where l.ORDERNUMBER == ordernumber
-                            select l;
-
-                return query;
-            }
-            public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
-            {
-                int ordernumber = 0;
-
-                var query = from l in _dataContext.PlatnosciEcards
-                            where l.ORDERDESCRIPTION == description && l.IDFaktury == idfaktury && l.Data == data
-                            select l;
-                
-                List<PlatnosciEcard> pl = query.ToList();
-                if (pl.Count > 0 && pl[0].ORDERNUMBER > 0) ordernumber = pl[0].ORDERNUMBER;
-                return ordernumber;
-            }
-    }
-}
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Form.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Form.aspx (revision 911)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Form.aspx (revision 949)
@@ -13,5 +13,5 @@
      <br/> 4. ValidationCode: <%=Html.TextBox("VALIDATIONCODE","000")%>      
      <br/> 5. APPROVALCODE: <%=Html.TextBox("APPROVALCODE","123")%>
-     <br/> 6. AUTHTIME: <%=Html.TextBox("AUTHTIME")%>
+     <br/> 6. AUTHTIME: <%=Html.TextBox("AUTHTIME", DateTime.Now)%>
      <br/> 7. BIN: <%=Html.TextBox("BIN","1234")%>
      <br/> 8. COMMTYPE: <%=Html.TextBox("COMMTYPE","anbjbj")%>
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 948)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 949)
@@ -23,5 +23,5 @@
         public AccountController()
         {
-            _repository = new Repository<vPlatnosciEcard>(new DataContext1());
+            _repository = new Repository<vPlatnosciEcard>(new DataContext());
             FormsAuth = new FormsAuthenticationService();
             _funkcjePlatnosci = new FunkcjePlatnosci();
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 948)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 949)
@@ -28,6 +28,6 @@
         public MerchantController()
         {
-            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
-            _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
+            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext());
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _funkcjePlatnosci = new FunkcjePlatnosci();
             _translateManager = new Translation();
@@ -79,5 +79,5 @@
             linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek;
 
-            if (merchant != null && !String.IsNullOrEmpty(merchant.merchntId))
+            if (merchant != null && !String.IsNullOrEmpty(merchant.Id))
                 SendRequest(newPayment, hash, merchant, linkFail, linkOk);
             else 
@@ -130,5 +130,5 @@
             var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
             dane += "&currency=" + platnosc.CURRENCY;
-            dane += string.Format("&merchantId={0}&password={1}", merchant.merchntId, merchant.merchantPassword);
+            dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
 
             var bdata = System.Text.Encoding.ASCII.GetBytes(dane);
@@ -154,5 +154,5 @@
             var dane = "&AMOUNT=" + m.AMOUNT + "&CURRENCY=" + m.CURRENCY + "&ORDERNUMBER=" + m.ORDERNUMBER;
             dane += "&NAME=" + m.NAME + "&SURNAME=" + m.SURNAME + "&LANGUAGE=" + m.LANGUAGE + "&CHARSET=ISO-8859-2";
-            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchant.merchntId + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
+            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
             dane += "&LINKFAIL=" + linkfail + "&LINKOK=" + linkok + "&SESSIONID=" + m.SESSIONID;
             Response.Redirect(adres + dane);
@@ -174,11 +174,11 @@
             if (systemKs == "2")
             {
-                merchant.merchntId = "171485000";
-                merchant.merchantPassword = "ashSeth2";
+                merchant.Id = "171485000";
+                merchant.Password = "ashSeth2";
             }
             else
             {
-                merchant.merchntId = "170906000";
-                merchant.merchantPassword = "JaYpqfs0";
+                merchant.Id = "170906000";
+                merchant.Password = "JaYpqfs0";
             }              
             return merchant;
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 948)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 949)
@@ -21,7 +21,7 @@
         public PlatnoscController()
         {
-            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
-            _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
-            _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext1());
+            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext());
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
+            _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext());
             _funkcjePlatnosci = new FunkcjePlatnosci();
             _translateManager = new Translation();         
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 931)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 949)