Index: /trunk/eCard.MVC.sln
===================================================================
--- /trunk/eCard.MVC.sln (revision 970)
+++ /trunk/eCard.MVC.sln (revision 971)
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platnosci.Web", "eCard\eCardMVC\Platnosci\Platnosci.Web.csproj", "{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "adMoto.Payments.Web", "eCard\eCardMVC\Platnosci\adMoto.Payments.Web.csproj", "{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platnosci.Tests", "eCard\eCardMVC\Platnosci.Tests\Platnosci.Tests.csproj", "{1FD307C6-4D2F-4013-BD60-DD36FFE08CD4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "adMoto.Payments.Test", "eCard\eCardMVC\Platnosci.Tests\adMoto.Payments.Test.csproj", "{1FD307C6-4D2F-4013-BD60-DD36FFE08CD4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "adMoto.Payments.Core", "eCard\eCardMVC\adMoto.Payments.Core\adMoto.Payments.Core.csproj", "{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}"
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj (revision 970)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj (revision 971)
@@ -55,7 +55,4 @@
   <ItemGroup>
     <Compile Include="Data\DataContext.cs" />
-    <Compile Include="Data\Platnosci.cs">
-      <DependentUpon>Platnosci.dbml</DependentUpon>
-    </Compile>
     <Compile Include="Data\Platnosci.designer.cs">
       <DependentUpon>Platnosci.dbml</DependentUpon>
Index: /unk/eCard/eCardMVC/adMoto.Payments.Core/Data/Platnosci.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/Platnosci.cs (revision 970)
+++  (revision )
@@ -1,6 +1,0 @@
-namespace Platnosci.Core    
-{
-    partial class PlatnosciDataContext 
-    {
-    }
-}
Index: /trunk/eCard/eCardMVC/Platnosci/Web.config
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Web.config (revision 967)
+++ /trunk/eCard/eCardMVC/Platnosci/Web.config (revision 971)
@@ -131,4 +131,10 @@
 				<add namespace="System.Linq"/>
 				<add namespace="System.Collections.Generic"/>
+        <add namespace="adMoto.Payments.Core"/>
+        <add namespace="adMoto.Payments.Core.Data"/>
+        <add namespace="adMoto.Payments.Core.Interfaces"/>
+        <add namespace="adMoto.Payments.Web"/>
+        <add namespace="adMoto.Payments.Web.Helpers"/>
+        <add namespace="adMoto.Payments.Web.Models"/>
       </namespaces>
 		</pages>
Index: /trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 933)
+++ /trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 971)
@@ -1,8 +1,8 @@
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
     public class ErrorViewData
     {
-       public string Error { get; set; }
-       public int InvoiceId { get; set; } 
+        public string Error { get; set; }
+        public int InvoiceId { get; set; } 
     }
 }
Index: /trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs (revision 971)
@@ -0,0 +1,127 @@
+using System;
+using System.Net;
+using System.IO;
+using System.Linq;
+using System.Configuration;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
+
+namespace adMoto.Payments.Web.Models
+{
+    public class MerchantHelper
+    {
+        public const string HASH_ERROR_INFO = "payment not exist";
+        private readonly PaymentsUtils _paymentsUtils;
+        private IRepository<PlatnosciEcard> _repPayment;
+
+        public MerchantHelper(IRepository<PlatnosciEcard> repPayment)
+        {
+            _repPayment = repPayment;
+            _paymentsUtils = new PaymentsUtils(_repPayment);
+        }
+
+        public String GetUrl(Merchant merchant)
+        {
+            if (merchant == null)
+                throw new ArgumentNullException("merchant");
+
+            var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION;
+            dane += "&AMOUNT=" + merchant.Payment.AMOUNT + "&CURRENCY=" + merchant.Payment.CURRENCY;
+            dane += "&ORDERNUMBER=" + merchant.Payment.ORDERNUMBER;
+            dane += "&NAME=" + merchant.Payment.NAME + "&SURNAME=" + merchant.Payment.SURNAME;
+            dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2";
+            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash;
+            dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + merchant.Payment.AUTODEPOSIT;
+            dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk;
+            dane += "&SESSIONID=" + merchant.Payment.SESSIONID;
+           
+            return dane;
+        }
+        public Merchant CreateMerchantData(Invoice invoice, Payer payer, string lang, string sessionId)
+        {
+            var merchant = new Merchant();
+
+            var waluta = _paymentsUtils.SetAmount(invoice);
+            var newPayment = _paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
+
+            merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
+
+#if DEBUG
+            //TODO: find better method to set SystemKsiegowy when testing or developing
+            merchant.SystemKsiegowy = "2";
+#endif
+
+            merchant.Payment = newPayment;
+            GetMerchantInfo(merchant);
+            merchant.Hash = SetHash(merchant);
+
+            //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
+            var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data);
+
+            var linkFail = ConfigurationManager.AppSettings["Strona"];
+            linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"];
+            linkFail += "/" + newPayment.IDFaktury + "/?";
+
+            var linkOk = ConfigurationManager.AppSettings["Strona"];
+            linkOk += "/" + lang + ConfigurationManager.AppSettings["LinkOk"];
+            linkOk += "/" + newPayment.IDFaktury + "/" + orderek + "/?";
+
+            merchant.LinkOk = linkOk;
+            merchant.LinkFail = linkFail;
+
+            merchant.IsValid();
+
+            return merchant;
+        }
+
+        public void GetMerchantInfo(Merchant merchant)
+        {
+            if (merchant.SystemKsiegowy == "2")
+            {
+                merchant.Id = "171485000";
+                merchant.Password = "ashSeth2";
+            }
+            else
+            {
+                merchant.Id = "170906000";
+                merchant.Password = "JaYpqfs0";
+            }
+        }
+        public string SetHash(Merchant merchant)
+        {
+            if (merchant == null)
+                throw new ArgumentNullException("merchant");
+
+            var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
+
+            if (platnosc == null)
+                merchant.Hash = HASH_ERROR_INFO;
+            else
+            {
+                var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER;
+                var req = (HttpWebRequest)WebRequest.Create(adres);
+                var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
+                dane += "&currency=" + platnosc.CURRENCY;
+                dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
+
+                var bdata = System.Text.Encoding.ASCII.GetBytes(dane);
+                req.Method = "POST";
+                req.ContentType = "application/x-www-form-urlencoded";
+                req.ContentLength = dane.Length;
+
+                var reqStream = req.GetRequestStream();
+                reqStream.Write(bdata, 0, bdata.Length);
+                reqStream.Close();
+
+                var streamResponse = new StreamReader(req.GetResponse().GetResponseStream());
+                string strResponse = streamResponse.ReadToEnd();
+                streamResponse.Close();
+                strResponse = strResponse.Replace("\n", "");
+
+                merchant.Hash = strResponse;
+            }
+            return merchant.Hash;
+        }
+    }
+}
Index: /trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs (revision 971)
@@ -0,0 +1,194 @@
+using System;
+using System.Web;
+using System.Threading;
+using System.Globalization;
+using System.Configuration;
+using System.Security.Principal;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
+
+
+namespace adMoto.Payments.Web.Models
+{
+    public class PaymentsUtils
+    {
+        public const string EUR = "978";
+        public const string GBP = "826";
+        public const string USD = "789";
+        public const string PLN = "985";
+        public const string CARDS = "CARDS";            //obsługa tylko kart płatniczych
+        public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
+        public const string KODOWANIE = "ISO-8859-2";
+        private readonly IRepository<PlatnosciEcard> _repPayment;
+        private readonly ITranslateManager _translateManager;
+
+        public PaymentsUtils()
+        {
+            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
+            _translateManager = new Translation();     
+        }
+
+        public PaymentsUtils(IRepository<PlatnosciEcard> repPayment)
+        {
+            _repPayment = repPayment;
+            _translateManager = new Translation();    
+        }
+        public PaymentsUtils(IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
+        {
+            _repPayment = repPayment;
+            _translateManager = translate;
+        }
+        public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
+        {
+            var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
+
+            if (!String.IsNullOrEmpty(miano))
+                if (waluta > 0 && miano.ToUpper() != "PLN")
+                    brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
+            
+            return brutto;
+        }
+
+        public bool UserIdentity(Invoice platnosc, string userName)
+        {
+            return platnosc != null && platnosc.nip == userName;
+        }
+
+        public Waluta SetAmount(Invoice platnosc)
+        {
+            var waluta = new Waluta {Currency = GetCurrency(platnosc.waluta_miano)};
+
+            waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100);
+            
+            return waluta;
+        }
+
+        public string GetCurrency(string currency)
+        {
+            if (string.IsNullOrEmpty(currency)) 
+                return PLN; 
+
+            switch (currency.ToUpper())
+            {
+                case "EUR":
+                    return EUR;
+                case "GBP":
+                    return GBP;
+                case "USD":
+                    return USD;
+                default:
+                    return PLN;
+            }
+        }
+
+        public string SetLanguage(string lang)
+        {
+            switch (lang)
+            {
+                case "de":
+                case "en":
+                case "pl":
+                    if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower())
+                    {
+                        var culture = "pl-PL";
+                        switch (lang)
+                        {
+                            case "pl":
+                                culture = "pl-PL";
+                                break;
+                            case "en":
+                                culture = "en-US";
+                                break;
+                            case "de":
+                                culture = "de-DE";
+                                break;
+                        }
+
+                        Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);
+                        Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
+                    }
+                    break;
+            }
+            return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
+        }
+
+        public string SetTitle()
+        {
+            var str = "";
+            var css = ConfigurationManager.AppSettings["Css"];
+
+            switch (css)
+            {
+                case "truck":
+                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - ";
+                    break;
+                case "admoto":
+                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - ";
+                    break;
+            }
+
+            return str;
+        }
+
+        public void SetUserLogger(string nip, string faktura)
+        {
+
+            var user = nip + "-" + faktura;
+            Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null);
+        }
+
+        public ErrorViewData InitErrorViewData(string errortxt, int idFaktury)
+        {
+            var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury };
+            return er;
+        }
+        public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId)
+        {
+            var newPayment = new PlatnosciEcard();
+            newPayment.IDFaktury = platnosc.ID_faktury;
+            newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
+            newPayment.nip = platnosc.nip;
+            newPayment.nrZlecenia = "";
+            newPayment.AMOUNT = waluta.Amount;
+            newPayment.CURRENCY = waluta.Currency;
+            newPayment.SESSIONID = sessionId;
+            newPayment.NAME = payer.FirstName;
+            newPayment.SURNAME = payer.LastName;
+            newPayment.AUTODEPOSIT = true;
+            newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard
+            newPayment.CHARSET = KODOWANIE;
+            newPayment.COUNTRY = KOD_POLSKA;
+            newPayment.JS = true;
+            newPayment.PAYMENTTYPE = CARDS;
+            newPayment.Data = DateTime.Now;
+            newPayment.Status = null;
+            newPayment.Status_data = null;
+
+            _repPayment.Insert(newPayment);
+            return newPayment;
+        }
+
+        public ErrorViewData IsError(Invoice platnosc, String userName)
+        {
+            var errortxt = "";
+
+            if (platnosc == null)
+                errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
+            else if (!UserIdentity(platnosc, userName))
+                errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");
+
+            return InitErrorViewData(errortxt, 0);
+        }
+
+        public string GetLanguage()
+        {
+            var language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper();
+            
+            if (language != "PL" && language != "EN" && language != "DE")
+                return "PL";  //domyślny jezyk, w ktorym ma byc wyświetlony formularz na stronie eCard
+            
+            return language;
+        }
+    }
+}
Index: /trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 971)
@@ -2,13 +2,13 @@
 using adMoto.Payments.Core.Data;
 
-namespace Platnosci.Models
+namespace adMoto.Payments.Web.Models
 {
     public class InvoiceDetailsViewData
     {
-        public Invoice vPlatnosciEcard { get; set; }
+        public Invoice Invoice { get; set; }
         public Payer Payer {get; set;}
-        public string brutto { get; set; }
-        public string termin { get; set; }
-        public string info { get; set; }
+        public string Brutto { get; set; }
+        public string Termin { get; set; }
+        public string Info { get; set; }
     }
 }
Index: /unk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 970)
+++  (revision )
@@ -1,198 +1,0 @@
-using System;
-using System.Web;
-using System.Threading;
-using System.Globalization;
-using System.Configuration;
-using System.Security.Principal;
-using adMoto.Payments.Core;
-using adMoto.Payments.Core.Data;
-using adMoto.Payments.Core.Interfaces;
-
-
-namespace Platnosci.Models
-{
-    public class FunkcjePlatnosci
-    {
-        public const string EUR = "978";
-        public const string GBP = "826";
-        public const string USD = "789";
-        public const string PLN = "985";
-        public const string CARDS = "CARDS";            //obsługa tylko kart płatniczych
-        public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
-        public const string KODOWANIE = "ISO-8859-2";
-        private IRepository<PlatnosciEcard> _repPayment;
-        private readonly ITranslateManager _translateManager;
-
-        public FunkcjePlatnosci()
-        {
-            _repPayment = new Repository<PlatnosciEcard>(new DataContext());
-            _translateManager = new Translation();     
-        }
-
-        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment)
-        {
-            _repPayment = repPayment;
-            _translateManager = new Translation();    
-        }
-        public FunkcjePlatnosci(IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
-        {
-            _repPayment = repPayment;
-            _translateManager = translate;
-        }
-        public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
-        {
-            var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
-
-            if (!String.IsNullOrEmpty(miano))
-                if (waluta > 0 && miano.ToUpper() != "PLN")
-                    brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
-            
-            return brutto;
-        }
-
-        public bool UserIdentity(Invoice platnosc, string userName)
-        {
-            return platnosc != null && platnosc.nip == userName;
-        }
-
-        public Waluta SetAmount(Invoice platnosc)
-        {
-            var waluta = new Waluta();
-            waluta.Currency = GetCurrency(platnosc.waluta_miano);
-
-            if (waluta.Currency == PLN)
-                waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
-            else
-                waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
-            
-            return waluta;
-        }
-
-        public string GetCurrency(string currency)
-        {
-            if (string.IsNullOrEmpty(currency)) 
-                return PLN; 
-
-            switch (currency.ToUpper())
-            {
-                case "EUR":
-                    return EUR;
-                case "GBP":
-                    return GBP;
-                case "USD":
-                    return USD;
-                default:
-                    return PLN;
-            }
-        }
-
-        public string SetLanguage(string lang)
-        {
-            switch (lang)
-            {
-                case "de":
-                case "en":
-                case "pl":
-                    if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower())
-                    {
-                        var culture = "pl-PL";
-                        switch (lang)
-                        {
-                            case "pl":
-                                culture = "pl-PL";
-                                break;
-                            case "en":
-                                culture = "en-US";
-                                break;
-                            case "de":
-                                culture = "de-DE";
-                                break;
-                        }
-
-                        Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);
-                        Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
-                    }
-                    break;
-            }
-            return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
-        }
-
-        public string SetTitle()
-        {
-            var str = "";
-            var css = ConfigurationManager.AppSettings["Css"];
-
-            switch (css)
-            {
-                case "truck":
-                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - ";
-                    break;
-                case "admoto":
-                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - ";
-                    break;
-            }
-
-            return str;
-        }
-
-        public void SetUserLogger(string nip, string faktura)
-        {
-
-            var user = nip + "-" + faktura;
-            Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null);
-        }
-
-        public ErrorViewData InitErrorViewData(string errortxt, int idFaktury)
-        {
-            var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury };
-            return er;
-        }
-        public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId)
-        {
-            var newPayment = new PlatnosciEcard();
-            newPayment.IDFaktury = platnosc.ID_faktury;
-            newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
-            newPayment.nip = platnosc.nip;
-            newPayment.nrZlecenia = "";
-            newPayment.AMOUNT = waluta.Amount;
-            newPayment.CURRENCY = waluta.Currency;
-            newPayment.SESSIONID = sessionId;
-            newPayment.NAME = payer.FirstName;
-            newPayment.SURNAME = payer.LastName;
-            newPayment.AUTODEPOSIT = true;
-            newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard
-            newPayment.CHARSET = KODOWANIE;
-            newPayment.COUNTRY = KOD_POLSKA;
-            newPayment.JS = true;
-            newPayment.PAYMENTTYPE = CARDS;
-            newPayment.Data = DateTime.Now;
-            newPayment.Status = null;
-            newPayment.Status_data = null;
-
-            _repPayment.Insert(newPayment);
-            return newPayment;
-        }
-
-        public ErrorViewData IsError(Invoice platnosc, String UserName)
-        {
-            var errortxt = "";
-
-            if (platnosc == null)
-                errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
-            else if (!UserIdentity(platnosc, UserName))
-                errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");
-
-            return InitErrorViewData(errortxt, 0);
-        }
-
-        public string GetLanguage()
-        {
-            var language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper();
-            
-            if (language != "PL" && language != "EN" && language != "DE")
-                return "PL";  //domyślny jezyk, w ktorym ma byc wyświetlony formularz na stronie eCard
-            
-            return language;
-        }
-    }
-}
Index: /unk/eCard/eCardMVC/Platnosci/Models/eCardData.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs (revision 970)
+++  (revision )
@@ -1,127 +1,0 @@
-using System;
-using System.Net;
-using System.IO;
-using System.Linq;
-using System.Configuration;
-using adMoto.Payments.Core;
-using adMoto.Payments.Core.Data;
-using adMoto.Payments.Core.Interfaces;
-
-namespace Platnosci.Models
-{
-    public class eCardData
-    {
-        public const string HASH_ERROR_INFO = "payment not exist";
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
-        private IRepository<PlatnosciEcard> _repPayment;
-
-        public eCardData(IRepository<PlatnosciEcard> repPayment)
-        {
-            _repPayment = repPayment;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
-        }
-
-        public String GetUrl(Merchant merchant)
-        {
-            if (merchant == null)
-                throw new ArgumentNullException("merchant");
-
-            var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION;
-            dane += "&AMOUNT=" + merchant.Payment.AMOUNT + "&CURRENCY=" + merchant.Payment.CURRENCY;
-            dane += "&ORDERNUMBER=" + merchant.Payment.ORDERNUMBER;
-            dane += "&NAME=" + merchant.Payment.NAME + "&SURNAME=" + merchant.Payment.SURNAME;
-            dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2";
-            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash;
-            dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + merchant.Payment.AUTODEPOSIT;
-            dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk;
-            dane += "&SESSIONID=" + merchant.Payment.SESSIONID;
-           
-            return dane;
-        }
-        public Merchant CreateMerchantData(Invoice invoice, Payer payer, string lang, string sessionId)
-        {
-            var merchant = new Merchant();
-
-            var waluta = _funkcjePlatnosci.SetAmount(invoice);
-            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
-
-            merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
-
-#if DEBUG
-    //TODO: find better method to set SystemKsiegowy when testing or developing
-            merchant.SystemKsiegowy = "2";
-#endif
-
-            merchant.Payment = newPayment;
-            GetMerchantInfo(merchant);
-            merchant.Hash = SetHash(merchant);
-
-            //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
-            var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data);
-
-            var linkFail = ConfigurationManager.AppSettings["Strona"];
-            linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"];
-            linkFail += "/" + newPayment.IDFaktury + "/?";
-
-            var linkOk = ConfigurationManager.AppSettings["Strona"];
-            linkOk += "/" + lang + ConfigurationManager.AppSettings["LinkOk"];
-            linkOk += "/" + newPayment.IDFaktury + "/" + orderek + "/?";
-
-            merchant.LinkOk = linkOk;
-            merchant.LinkFail = linkFail;
-
-            merchant.IsValid();
-
-            return merchant;
-        }
-
-        public void GetMerchantInfo(Merchant merchant)
-        {
-            if (merchant.SystemKsiegowy == "2")
-            {
-                merchant.Id = "171485000";
-                merchant.Password = "ashSeth2";
-            }
-            else
-            {
-                merchant.Id = "170906000";
-                merchant.Password = "JaYpqfs0";
-            }
-        }
-        public string SetHash(Merchant merchant)
-        {
-            if (merchant == null)
-                throw new ArgumentNullException("merchant");
-
-            var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
-
-            if (platnosc == null)
-                merchant.Hash = HASH_ERROR_INFO;
-            else
-            {
-                var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER;
-                var req = (HttpWebRequest)WebRequest.Create(adres);
-                var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
-                dane += "&currency=" + platnosc.CURRENCY;
-                dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
-
-                var bdata = System.Text.Encoding.ASCII.GetBytes(dane);
-                req.Method = "POST";
-                req.ContentType = "application/x-www-form-urlencoded";
-                req.ContentLength = dane.Length;
-
-                var reqStream = req.GetRequestStream();
-                reqStream.Write(bdata, 0, bdata.Length);
-                reqStream.Close();
-
-                var streamResponse = new StreamReader(req.GetResponse().GetResponseStream());
-                string strResponse = streamResponse.ReadToEnd();
-                streamResponse.Close();
-                strResponse = strResponse.Replace("\n", "");
-
-                merchant.Hash = strResponse;
-            }
-            return merchant.Hash;
-        }
-    }
-}
Index: /trunk/eCard/eCardMVC/Platnosci/Global.asax
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Global.asax (revision 866)
+++ /trunk/eCard/eCardMVC/Platnosci/Global.asax (revision 971)
@@ -1,1 +1,1 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="Platnosci.MvcApplication" Language="C#" %>
+<%@ Application Codebehind="Global.asax.cs" Inherits="adMoto.Payments.Web.MvcApplication" Language="C#" %>
Index: /trunk/eCard/eCardMVC/Platnosci/adMoto.Payments.Web.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/adMoto.Payments.Web.csproj (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci/adMoto.Payments.Web.csproj (revision 971)
@@ -0,0 +1,222 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}</ProjectGuid>
+    <ProjectTypeGuids>{603c0e0b-db56-11dc-be95-000d561079b0};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>adMoto.Payments.Web</RootNamespace>
+    <AssemblyName>adMoto.Payments.Web</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Elmah, Version=1.1.11517.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Elmah.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Mobile" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App_GlobalResources\tlumaczenia.de.designer.cs">
+      <DependentUpon>tlumaczenia.de.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Include="App_GlobalResources\tlumaczenia.fr.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>tlumaczenia.fr.resx</DependentUpon>
+    </Compile>
+    <Compile Include="App_GlobalResources\tlumaczenia.it.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>tlumaczenia.it.resx</DependentUpon>
+    </Compile>
+    <Compile Include="App_GlobalResources\tlumaczenia.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>tlumaczenia.resx</DependentUpon>
+    </Compile>
+    <Compile Include="App_GlobalResources\tlumaczenia.pl.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>tlumaczenia.pl.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Controllers\AccountController.cs" />
+    <Compile Include="Controllers\HomeController.cs" />
+    <Compile Include="Controllers\MerchantController.cs" />
+    <Compile Include="Controllers\PlatnoscController.cs" />
+    <Compile Include="Default.aspx.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Global.asax.cs">
+      <DependentUpon>Global.asax</DependentUpon>
+    </Compile>
+    <Compile Include="Helpers\WebHelper.cs" />
+    <Compile Include="Models\PaymentsUtils.cs" />
+    <Compile Include="Models\ErrorViewData.cs" />
+    <Compile Include="Models\InvoiceDetailsViewData.cs" />
+    <Compile Include="Models\MerchantHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Default.aspx" />
+    <Content Include="Global.asax" />
+    <Content Include="Views\Platnosc\Show.aspx" />
+    <Content Include="Web.config" />
+    <Content Include="Content\Site.css" />
+    <Content Include="Scripts\jquery-1.3.2.js" />
+    <Content Include="Scripts\jquery-1.3.2.min.js" />
+    <Content Include="Scripts\jquery-1.3.2-vsdoc.js" />
+    <Content Include="Scripts\jquery-1.3.2.min-vsdoc.js" />
+    <Content Include="Scripts\MicrosoftAjax.js" />
+    <Content Include="Scripts\MicrosoftAjax.debug.js" />
+    <Content Include="Scripts\MicrosoftMvcAjax.js" />
+    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
+    <Content Include="Views\Account\LogOn.aspx" />
+    <Content Include="Views\Home\About.aspx" />
+    <Content Include="Views\Home\Index.aspx" />
+    <Content Include="Views\Shared\Error.aspx" />
+    <Content Include="Views\Shared\LogOnUserControl.ascx" />
+    <Content Include="Views\Shared\Site.Master" />
+    <Content Include="Views\Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\admoto.css" />
+    <Content Include="Content\truck.css" />
+    <Content Include="Images\de.gif" />
+    <Content Include="Images\fr.gif" />
+    <Content Include="Images\gb.gif" />
+    <Content Include="Images\it.gif" />
+    <Content Include="Images\pl.gif" />
+    <Content Include="Images\truck\logo.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\admoto\tlo1.gif" />
+    <Content Include="Images\admoto\tlo2.gif" />
+    <Content Include="Images\admoto\tlo_top_.gif" />
+    <Content Include="Views\Shared\Error1.aspx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_GlobalResources\tlumaczenia.pl.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.pl.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_GlobalResources\tlumaczenia.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_GlobalResources\tlumaczenia.fr.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.fr.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_GlobalResources\tlumaczenia.de.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.de.designer.cs</LastGenOutput>
+    </Content>
+    <Content Include="App_GlobalResources\tlumaczenia.it.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.it.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Images\admoto\logo.png" />
+    <Content Include="Views\Platnosc\Fail.aspx" />
+    <Content Include="Views\Platnosc\Form.aspx" />
+    <Content Include="Views\Platnosc\Ok.aspx" />
+    <Content Include="Views\Platnosc\Paid.aspx" />
+    <Content Include="Views\Platnosc\Status.aspx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\adMoto.Payments.Core\adMoto.Payments.Core.csproj">
+      <Project>{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}</Project>
+      <Name>adMoto.Payments.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+    <Folder Include="Log\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target> -->
+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>False</AutoAssignPort>
+          <DevelopmentServerPort>3646</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 956)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 971)
@@ -1,3 +1,3 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>"%>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>"%>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
@@ -7,9 +7,9 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
     <%
-    if (!String.IsNullOrEmpty(Model.info))
+    if (!String.IsNullOrEmpty(Model.Info))
     {
     %>
         <p class="pay_error">
-            <%=Model.info%>
+            <%=Model.Info%>
         </p> 
     <%
@@ -19,5 +19,5 @@
     %>
         <p class="Info">
-            <%string podziekowaniaTxt = String.Format(HttpContext.GetGlobalResourceObject("tlumaczenia","podziekowania").ToString(),Model.vPlatnosciEcard.Faktura_Numer); %>
+            <%string podziekowaniaTxt = String.Format(HttpContext.GetGlobalResourceObject("tlumaczenia","podziekowania").ToString(),Model.Invoice.Faktura_Numer); %>
             <%=podziekowaniaTxt%>
         </p> 
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 956)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 971)
@@ -1,3 +1,3 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>"%>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>"%>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
@@ -8,12 +8,12 @@
     
         <p class="pay_error">            
-            <%if (!String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer)){%>
+            <%if (!String.IsNullOrEmpty(Model.Invoice.Faktura_Numer)){%>
                 <asp:Label ID="lab3" runat="server" Text="">
                 <% string txt = HttpContext.GetGlobalResourceObject("tlumaczenia", "blad2").ToString(); %>
-                <%=String.Format(txt, Model.vPlatnosciEcard.Faktura_Numer) %>
+                <%=String.Format(txt, Model.Invoice.Faktura_Numer) %>
                 </asp:Label>
                 
                 <%string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia", "KolejnaProba").ToString();%>
-                <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.vPlatnosciEcard.ID_faktury }, null)%></p>
+                <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.Invoice.ID_faktury }, null)%></p>
             <%}%>              
         </p>        
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 950)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 971)
@@ -1,11 +1,10 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>" %>
-<%@ Import Namespace="System" %>
-<%@ Import Namespace="Platnosci.Models" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
      <%
-         FunkcjePlatnosci func = new FunkcjePlatnosci();
-         string str = func.SetTitle(); 
+         var func = new PaymentsUtils();
+         var str = func.SetTitle(); 
      %>
-	 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%>
+	 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly")%>
 </asp:Content>
 
@@ -15,5 +14,5 @@
         <asp:Label ID="Szczegó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>
     </div>
-    <p class="InfoPaid"><%=Model.info%></p>   
+    <p class="InfoPaid"><%=Model.Info%></p>   
     <table cellpadding="0" cellspacing="0" border="0">
                      
@@ -34,5 +33,5 @@
                 <asp:Label ID="Label2" runat ="server" Text="<%$Resources:tlumaczenia,termin_wplaty%>"></asp:Label>
             </td>
-            <td class="textbox"><%=Model.termin%></td>            
+            <td class="textbox"><%=Model.Termin%></td>            
         </tr>                  
         <tr>            
@@ -40,29 +39,29 @@
                 <asp:Label ID="nazwafirmy" runat ="server" Text="<%$Resources:tlumaczenia,Nazwa%>"></asp:Label>
             </td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.FullName%></td>
+            <td class="textbox"><%=Model.Invoice.FullName%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="adres" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Address + " " + Model.vPlatnosciEcard.PostalCode + ", " + Model.vPlatnosciEcard.City%></td>
+            <td class="textbox"><%=Model.Invoice.Address + " " + Model.Invoice.PostalCode + ", " + Model.Invoice.City%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="nip" runat ="server" Text="<%$Resources:tlumaczenia,Nip%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Nabywca_nip%></td>
+            <td class="textbox"><%=Model.Invoice.Nabywca_nip%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="NrFaktury" runat ="server" Text="<%$Resources:tlumaczenia,NumerFaktury%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Faktura_Numer%></td>
+            <td class="textbox"><%=Model.Invoice.Faktura_Numer%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="DataWystawienia" runat ="server" Text="<%$Resources:tlumaczenia,DataWystawienia%>"></asp:Label></td>
-            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Data_Wystawienia)%></td>
+            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Data_Wystawienia)%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="termin" runat ="server" Text="<%$Resources:tlumaczenia,TerminPlatnosci%>"></asp:Label></td>
-            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Termin_zaplaty)%></td>
+            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Termin_zaplaty)%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="brutto" runat ="server"  Text="<%$Resources:tlumaczenia,Brutto%>"></asp:Label></td>
-            <td class="textbox"><%=Model.brutto%></td>
+            <td class="textbox"><%=Model.Brutto%></td>
         </tr>
         <tr>
@@ -80,18 +79,18 @@
             </td>    
             <td class="textbox">
-                <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>
+                <%=Model.Invoice.Imie + " " + Model.Invoice.Nazwisko%>
             </td>
         </tr>
          <tr>
             <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,ulica%>"></asp:Label></td>        
-            <td class="textbox"><%=Model.vPlatnosciEcard.ulica%></td>
+            <td class="textbox"><%=Model.Invoice.ulica%></td>
         </tr>
          <tr>
             <td class="col1"><asp:Label ID="Label3" runat="server" Text="<%$Resources:tlumaczenia,Miasto%>"></asp:Label></td>        
-            <td class="textbox"><%=Model.vPlatnosciEcard.kod + " " + Model.vPlatnosciEcard.miasto%></td>
+            <td class="textbox"><%=Model.Invoice.kod + " " + Model.Invoice.miasto%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label><br /><br /></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.telefon%><br /><br /></td>            
+            <td class="textbox"><%=Model.Invoice.telefon%><br /><br /></td>            
         </tr>            
     </table>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 950)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 971)
@@ -1,11 +1,10 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>" %>
-<%@ Import Namespace="System" %>
-<%@ Import Namespace="Platnosci.Models" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
      <%
-         FunkcjePlatnosci func = new FunkcjePlatnosci();
-         string str = func.SetTitle(); 
+         var func = new PaymentsUtils();
+         var str = func.SetTitle(); 
      %>
-	 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%>
+	 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly")%>
 </asp:Content>
 
@@ -21,5 +20,5 @@
     
     <table cellpadding="0" cellspacing="0" border="0">
-        <tr><td><%=Html.Hidden("Payer.Id_faktury", Model.vPlatnosciEcard.ID_faktury) %></td></tr>
+        <tr><td><%=Html.Hidden("Payer.Id_faktury", Model.Invoice.ID_faktury) %></td></tr>
               
         <%-- sekcja: szczegó³y faktury --%> 
@@ -39,29 +38,29 @@
                 <asp:Label ID="nazwafirmy" runat ="server" Text="<%$Resources:tlumaczenia,Nazwa%>"></asp:Label>
             </td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.FullName%></td>
+            <td class="textbox"><%=Model.Invoice.FullName%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="adres" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Address + " " + Model.vPlatnosciEcard.PostalCode + ", " + Model.vPlatnosciEcard.City%></td>
+            <td class="textbox"><%=Model.Invoice.Address + " " + Model.Invoice.PostalCode + ", " + Model.Invoice.City%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="nip" runat ="server" Text="<%$Resources:tlumaczenia,Nip%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Nabywca_nip%></td>
+            <td class="textbox"><%=Model.Invoice.Nabywca_nip%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="NrFaktury" runat ="server" Text="<%$Resources:tlumaczenia,NumerFaktury%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.Faktura_Numer%></td>
+            <td class="textbox"><%=Model.Invoice.Faktura_Numer%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="DataWystawienia" runat ="server" Text="<%$Resources:tlumaczenia,DataWystawienia%>"></asp:Label></td>
-            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Data_Wystawienia)%></td>
+            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Data_Wystawienia)%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="termin" runat ="server" Text="<%$Resources:tlumaczenia,TerminPlatnosci%>"></asp:Label></td>
-            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Termin_zaplaty)%></td>
+            <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Termin_zaplaty)%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="brutto" runat ="server"  Text="<%$Resources:tlumaczenia,Brutto%>"></asp:Label></td>
-            <td class="textbox"><%=Model.brutto%></td>
+            <td class="textbox"><%=Model.Brutto%></td>
         </tr>
         <tr>
@@ -79,18 +78,18 @@
             </td>    
             <td class="textbox">
-                <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>
+                <%=Model.Invoice.Imie + " " + Model.Invoice.Nazwisko%>
             </td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,ulica%>"></asp:Label></td>        
-            <td class="textbox"><%=Model.vPlatnosciEcard.ulica%></td>
+            <td class="textbox"><%=Model.Invoice.ulica%></td>
         </tr>
          <tr>
             <td class="col1"><asp:Label ID="Label2" runat="server" Text="<%$Resources:tlumaczenia,Miasto%>"></asp:Label></td>        
-            <td class="textbox"><%=Model.vPlatnosciEcard.kod + " " + Model.vPlatnosciEcard.miasto%></td>
+            <td class="textbox"><%=Model.Invoice.kod + " " + Model.Invoice.miasto%></td>
         </tr>
         <tr>
             <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.telefon%></td>            
+            <td class="textbox"><%=Model.Invoice.telefon%></td>            
         </tr> 
         <tr>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 950)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 971)
@@ -1,8 +1,8 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.ErrorViewData>" %>
-<%@ Import Namespace ="Platnosci.Models" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<ErrorViewData>" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
      <%
-         FunkcjePlatnosci func = new FunkcjePlatnosci();
-         string str = func.SetTitle(); 
+         var func = new PaymentsUtils();
+         var str = func.SetTitle(); 
      %>
 </asp:Content>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 971)
@@ -1,4 +1,4 @@
 <%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage"%>
-<%@ Import Namespace="Platnosci.Helpers" %> 
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -7,5 +7,4 @@
         <%=Html.MainCss("Site.css")%>
         <%=Html.AddCssToPortal()%>
-        <%=Html.Favicon()%>          
     </head> 
     <body>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 950)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 971)
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage"%>
-<%@ Import Namespace="Platnosci.Models" %> 
 
 <asp:Content ID="loginTitle" ContentPlaceHolderID="TitleContent" runat="server" >
      <%
-         FunkcjePlatnosci func = new FunkcjePlatnosci();
-         string str = func.SetTitle(); 
+         var func = new PaymentsUtils();
+         var str = func.SetTitle(); 
      %>
 	 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "PageLogin").ToString()%>
Index: /trunk/eCard/eCardMVC/Platnosci/Default.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Default.aspx (revision 866)
+++ /trunk/eCard/eCardMVC/Platnosci/Default.aspx (revision 971)
@@ -1,3 +1,3 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Platnosci._Default" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="adMoto.Payments.Web._Default" %>
 
 <%-- Please do not delete this file. It is used to ensure that ASP.NET MVC is activated by IIS when a user makes a "/" request to the server. --%>
Index: /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 967)
+++ /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 971)
@@ -1,17 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 using System.Threading;
-using System.Globalization;
-using System.Configuration;
 
-namespace Platnosci
+namespace adMoto.Payments.Web
 {
-    // Note: For instructions on enabling IIS6 or IIS7 classic mode, 
-    // visit http://go.microsoft.com/?LinkId=9394801
-
     public class MvcApplication : System.Web.HttpApplication
     {
@@ -20,17 +11,17 @@
             routes.IgnoreRoute("elmah.axd");
             routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
-            string lang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower();            
+            var lang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower();
 
             routes.MapRoute(
-                "eCard",                                            
-                "eCard/Status.aspx",                                
-                new { controller = "Platnosc", action = "Status" }  
-            );
+                "eCard",
+                "eCard/Status.aspx",
+                new { controller = "Platnosc", action = "Status" }
+                );
 
             routes.MapRoute(
                 "ConfirmationOk",
                 "{language}/Platnosc/Ok/{id}/{order}/",
-                new { controller = "Platnosc", action = "Ok", id="", order="", language="" }
-            );
+                new { controller = "Platnosc", action = "Ok", id = "", order = "", language = "" }
+                );
 
             routes.MapRoute(
@@ -38,11 +29,11 @@
                 "{language}/Platnosc/Fail/{id}/",
                 new { controller = "Platnosc", action = "Ok", id = "", order = "", language = "" }
-            );
+                );
 
             routes.MapRoute(
-                "Default",                                                               
-                "{language}/{controller}/{action}/{id}",                                 
-                new { language = lang, controller = "Home", action = "Index", id = "" }  
-            );            
+                "Default",
+                "{language}/{controller}/{action}/{id}",
+                new { language = lang, controller = "Home", action = "Index", id = "" }
+                );
         }
         protected void Application_Start()
@@ -50,5 +41,5 @@
             RegisterRoutes(RouteTable.Routes);
         }
-     
+
     }
 }
Index: /trunk/eCard/eCardMVC/Platnosci/Default.aspx.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Default.aspx.cs (revision 866)
+++ /trunk/eCard/eCardMVC/Platnosci/Default.aspx.cs (revision 971)
@@ -2,8 +2,6 @@
 using System.Web.Mvc;
 using System.Web.UI;
-using System.Globalization;
-using System.Threading;
 
-namespace Platnosci
+namespace adMoto.Payments.Web
 {
     public partial class _Default : Page
@@ -15,5 +13,5 @@
             // can correctly process the response (if caching is enabled).
 
-            string originalPath = Request.Path;
+            var originalPath = Request.Path;
             HttpContext.Current.RewritePath(Request.ApplicationPath, false);
             IHttpHandler httpHandler = new MvcHttpHandler();
Index: /trunk/eCard/eCardMVC/Platnosci/Helpers/WebHelper.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Helpers/WebHelper.cs (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci/Helpers/WebHelper.cs (revision 971)
@@ -0,0 +1,133 @@
+using System;
+using System.Web.Mvc;
+using System.Web.Routing;
+using System.Configuration;
+
+namespace adMoto.Payments.Web.Helpers
+{
+    public static class WebHelper
+    {
+        public static string ImageTag(this HtmlHelper helper, string src, string alt)
+        {
+            var tb = new TagBuilder("img");
+            tb.Attributes.Add("src", helper.Encode(src));
+            tb.Attributes.Add("alt", helper.Encode(alt));
+            return tb.ToString(TagRenderMode.SelfClosing);
+        }
+        public static string ImageLink(this HtmlHelper htmlHelper, string filename, string alt, string querystring)
+        {
+            
+            var action = htmlHelper.CurrentAction();
+            var controller = htmlHelper.CurrentController();
+                                    
+            var urlHelper = ((Controller)htmlHelper.ViewContext.Controller).Url;
+            var src = urlHelper.UrlImage(filename);
+            var imgtag = htmlHelper.ImageTag(src, alt);
+            
+            var tab = new RouteValueDictionary();
+
+            var id = "";
+            if (htmlHelper.ViewContext.RouteData.Values["id"] != null) id = htmlHelper.ViewContext.RouteData.Values["id"].ToString();
+            tab.Add("language", alt);
+            if (id != null) tab.Add("id", id);
+
+            var url = urlHelper.Action(action, controller, tab);
+
+            var param = querystring.Split(("&").ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+            for (var i = 0; i < param.Length; i++ )
+            {
+                if (i == 0 ) url += "?" + param[i];
+                else url += "&" + param[i];
+            }
+
+            var link = new TagBuilder("a");
+            link.Attributes.Add("href", url);
+            link.InnerHtml = imgtag;
+            return link.ToString();
+        }
+        public static string CurrentController(this HtmlHelper htmlHelper)
+        {
+            return htmlHelper.ViewContext.RouteData.Values["controller"].ToString();
+        }
+        public static string CurrentAction(this HtmlHelper htmlHelper)
+        {
+            return htmlHelper.ViewContext.RouteData.Values["action"].ToString();
+        }  
+        public static string Home(this UrlHelper urlHelper)
+        {
+            return urlHelper.Content("~/");
+        }
+        public static string Css(this UrlHelper urlHelper, string fileName)
+        {
+            var url = urlHelper.Home() + "Content/" + fileName;
+            return urlHelper.Content(url);
+        }
+        public static string UrlImage(this UrlHelper urlHelper, string fileName)
+        {
+            var url = urlHelper.Home() + "Images/" + fileName;            
+            return urlHelper.Content(url);
+        }
+        public static string FileUrl(this UrlHelper urlHelper, string fileName)
+        {
+            var url = urlHelper.Home() + "Images/";
+            switch (ConfigurationManager.AppSettings["Css"])
+            {
+                case "truck":
+                    url += "truck/";
+                    break;
+                case "admoto":
+                    url += "admoto/";
+                    break;
+            }
+            url += fileName;
+            return urlHelper.Content(url);
+        }
+        public static string MainCss(this HtmlHelper htmlHelper, string filename)
+        {
+            var urlHelper = new UrlHelper(htmlHelper.ViewContext.RequestContext);
+            var url = urlHelper.Css(filename);
+            var strCss = htmlHelper.LinkTag(url, "stylesheet", "text/css");
+            return strCss;
+        }
+        public static string LinkTag(this HtmlHelper htmlHelper, string url, string rel, string type)
+        {
+            var linkcss = new TagBuilder("link");
+            linkcss.Attributes.Add("href", url);
+            linkcss.Attributes.Add("rel", rel);
+            if (type != "" ) linkcss.Attributes.Add("type", type);
+            return linkcss.ToString(TagRenderMode.SelfClosing);
+        }
+        public static string AddCssToPortal(this HtmlHelper htmlHelper)
+        {
+            var filename = "";
+            switch (ConfigurationManager.AppSettings["Css"])
+            {
+                case "truck":
+                    filename = "truck.css" ;
+                    break;
+                case "admoto":
+                    filename = "admoto.css";
+                    break;
+            }
+            
+            var css = htmlHelper.MainCss(filename);
+            return css;
+        }
+        
+        public static string Logo(this HtmlHelper helper)
+        {
+            var urlHelper = new UrlHelper(helper.ViewContext.RequestContext);
+            
+            var logo = ConfigurationManager.AppSettings["Css"] == "admoto" ? "logo.png" : "logo.gif";
+
+            var url = urlHelper.FileUrl(logo);
+            var logotag = helper.ImageTag(url, "logo");
+           
+            var tb = new TagBuilder("td");
+            tb.Attributes.Add("class", "logo");
+
+            tb.InnerHtml = logotag; 
+            return tb.ToString();
+        }
+    }
+}
Index: /unk/eCard/eCardMVC/Platnosci/Helpers/helper.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Helpers/helper.cs (revision 952)
+++  (revision )
@@ -1,133 +1,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Configuration;
-
-namespace Platnosci.Helpers
-{
-    public static class helper
-    {
-        public static string ImageTag(this HtmlHelper helper, string src, string alt)
-        {
-            TagBuilder tb = new TagBuilder("img");
-            tb.Attributes.Add("src", helper.Encode(src));
-            tb.Attributes.Add("alt", helper.Encode(alt));
-            return tb.ToString(TagRenderMode.SelfClosing);
-        }
-        public static string ImageLink(this HtmlHelper htmlHelper, string filename, string alt, string querystring)
-        {
-            
-            var action = htmlHelper.CurrentAction();
-            var controller = htmlHelper.CurrentController();
-                                    
-            UrlHelper urlHelper = ((Controller)htmlHelper.ViewContext.Controller).Url;
-            string src = urlHelper.UrlImage(filename);
-            string imgtag = htmlHelper.ImageTag(src, alt);
-            
-            RouteValueDictionary tab = new RouteValueDictionary();
-
-            string id = "";
-            if (htmlHelper.ViewContext.RouteData.Values["id"] != null) id = htmlHelper.ViewContext.RouteData.Values["id"].ToString();
-            tab.Add("language", alt);
-            if (id != null) tab.Add("id", id);
-
-            string url = urlHelper.Action(action, controller, tab);
-
-            string[] param = querystring.ToString().Split(("&").ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-            for (int i = 0; i < param.Length; i++ )
-            {
-                if (i == 0 ) url += "?" + param[i];
-                else url += "&" + param[i];
-            }
-
-            TagBuilder link = new TagBuilder("a");
-            link.Attributes.Add("href", url);
-            link.InnerHtml = imgtag;
-            return link.ToString();
-        }
-        public static string CurrentController(this HtmlHelper htmlHelper)
-        {
-            return htmlHelper.ViewContext.RouteData.Values["controller"].ToString();
-        }
-        public static string CurrentAction(this HtmlHelper htmlHelper)
-        {
-            return htmlHelper.ViewContext.RouteData.Values["action"].ToString();
-        }  
-        public static string Home(this UrlHelper urlHelper)
-        {
-            return urlHelper.Content("~/");
-        }
-        public static string Css(this UrlHelper urlHelper, string fileName)
-        {
-            string url = urlHelper.Home() + "Content/" + fileName;
-            return urlHelper.Content(url);
-        }
-        public static string UrlImage(this UrlHelper urlHelper, string fileName)
-        {
-            string url = urlHelper.Home() + "Images/" + fileName;            
-            return urlHelper.Content(url);
-        }
-        public static string FileUrl(this UrlHelper urlHelper, string fileName)
-        {
-            string url = urlHelper.Home() + "Images/";
-            if (ConfigurationManager.AppSettings["Css"] == "truck") url += "truck/";
-                else if(ConfigurationManager.AppSettings["Css"] == "admoto") url += "admoto/";
-            url += fileName;
-            return urlHelper.Content(url);
-        }
-        public static string MainCss(this HtmlHelper htmlHelper, string filename)
-        {
-            UrlHelper urlHelper = new UrlHelper(htmlHelper.ViewContext.RequestContext);
-            string url = urlHelper.Css(filename);
-            string strCss = htmlHelper.LinkTag(url, "stylesheet", "text/css");
-            return strCss;
-        }
-        public static string LinkTag(this HtmlHelper htmlHelper, string url, string rel, string type)
-        {
-            TagBuilder linkcss = new TagBuilder("link");
-            linkcss.Attributes.Add("href", url);
-            linkcss.Attributes.Add("rel", rel);
-            if (type != "" ) linkcss.Attributes.Add("type", type);
-            return linkcss.ToString(TagRenderMode.SelfClosing);
-        }
-        public static string AddCssToPortal(this HtmlHelper htmlHelper)
-        {
-            string filename = "";
-            if (ConfigurationManager.AppSettings["Css"] == "truck") filename = "truck.css" ;   
-                else if(ConfigurationManager.AppSettings["Css"] == "admoto") filename = "admoto.css";
-            
-            string css = htmlHelper.MainCss(filename);
-            return css;
-        }
-        public static string Favicon(this HtmlHelper htmlHelper){
-            string url = "";
-            string str = "";
-            if (ConfigurationManager.AppSettings["Css"] == "admoto"){
-                /*UrlHelper urlHelper = new UrlHelper(htmlHelper.ViewContext.RequestContext);
-                url = urlHelper.FileUrl("favicon.ico");
-                str = htmlHelper.LinkTag(url,"shortcut icon","");*/
-            }
-            return str;
-        }
-        public static string Logo(this HtmlHelper helper)
-        {
-            UrlHelper urlHelper = new UrlHelper(helper.ViewContext.RequestContext);
-            
-            var logo = "";
-            if (ConfigurationManager.AppSettings["Css"] == "admoto") logo = "logo.png";
-            else logo = "logo.gif";
-
-            string url = urlHelper.FileUrl(logo);
-            string logotag = helper.ImageTag(url, "logo");
-           
-            TagBuilder tb = new TagBuilder("td");
-            tb.Attributes.Add("class", "logo");
-
-            tb.InnerHtml = logotag; 
-            return tb.ToString();
-        }
-    }    
-}
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs (revision 964)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs (revision 971)
@@ -1,6 +1,5 @@
-using System;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
-namespace Platnosci.Controllers
+namespace adMoto.Payments.Web.Controllers
 {
     [HandleError]
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 971)
@@ -6,7 +6,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
 {
     [HandleError]
@@ -14,5 +14,5 @@
     {
         private readonly IRepository<Invoice> _repository;
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly PaymentsUtils _paymentsUtils;
 
         public IFormsAuthentication FormsAuth
@@ -26,12 +26,12 @@
             _repository = new Repository<Invoice>(new DataContext());
             FormsAuth = new FormsAuthenticationService();
-            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _paymentsUtils = new PaymentsUtils();
         }
 
-        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, FunkcjePlatnosci func)
+        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils func)
         {
             _repository = repository;
             FormsAuth = formsAuth ?? new FormsAuthenticationService();
-            _funkcjePlatnosci = func;
+            _paymentsUtils = func;
         }
 
@@ -41,5 +41,5 @@
                 return RedirectToAction("LogOn", "Account", new { language = "pl" });
 
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             return View();
         }
@@ -50,5 +50,5 @@
         public ActionResult LogOn(string nip, string numerFaktury, string returnUrl, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var platnosc = new Invoice();
             if (!ValidateLogOn(nip, numerFaktury))
@@ -60,5 +60,5 @@
             platnosc = login;
             if (platnosc == null) return View();
-            _funkcjePlatnosci.SetUserLogger(nip, numerFaktury);
+            _paymentsUtils.SetUserLogger(nip, numerFaktury);
 
             FormsAuth.SignIn(nip, false);
@@ -98,4 +98,5 @@
         }
     }
+
     public interface IFormsAuthentication
     {
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();          
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 971)
@@ -5,8 +5,8 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Models;
 using Elmah;
-using Platnosci.Models;
-
-namespace Platnosci.Controllers
+
+namespace adMoto.Payments.Web.Controllers
 {
     public class PlatnoscController : Controller
@@ -17,5 +17,5 @@
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
         private readonly ITranslateManager _translateManager;
-        private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly PaymentsUtils _paymentsUtils;
 
         public PlatnoscController()
@@ -24,5 +24,5 @@
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext());
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
+            _paymentsUtils = new PaymentsUtils(_repPayment);
             _translateManager = new Translation();
         }
@@ -33,5 +33,5 @@
             _repConfirm = repConfirm;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
+            _paymentsUtils = new PaymentsUtils(_repPayment, _translateManager);
 
         }
@@ -40,10 +40,10 @@
         public ActionResult Show(string id, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
 
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
-            var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+            var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
             if (!String.IsNullOrEmpty(errorViewData.Error))
                 return View("Error1", errorViewData);
@@ -55,6 +55,6 @@
             {
                 var dataZaplaty = String.Format("{0:dd-MM-yyyy}", tablicaPotwierdzenia[0].AUTHTIME);
-                invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);
-                invoiceDeatailsViewData.termin = dataZaplaty;
+                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);
+                invoiceDeatailsViewData.Termin = dataZaplaty;
                 return View("Paid", invoiceDeatailsViewData);
             }
@@ -66,5 +66,5 @@
         public ActionResult Show(Payer payer, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
 
             if (String.IsNullOrEmpty(payer.FirstName))
@@ -81,5 +81,5 @@
             {
                 var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-                var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+                var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
 
                 if (!String.IsNullOrEmpty(errorViewData.Error))
@@ -94,10 +94,10 @@
         {
             var orderId = ConvertId(order);
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
 
             if (platnosc == null)
-                return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
+                return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
@@ -107,8 +107,8 @@
 
             if (CheckConfirm(id1, orderId) == 0)   //nie ma potwierdzenia z eCardu
-                invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+                invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.Invoice.Faktura_Numer);
 
             else if (CheckConfirm(id1, orderId) == 2)
-                invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
+                invoiceDeatailsViewData.Info = _translateManager.Translate("tlumaczenia", "weryfikacja");
 
             return View(invoiceDeatailsViewData);
@@ -117,5 +117,5 @@
         public ActionResult Fail(string id, string language)
         {
-            _funkcjePlatnosci.SetLanguage(language);
+            _paymentsUtils.SetLanguage(language);
             var id1 = ConvertId(id);
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
@@ -123,5 +123,5 @@
             if (platnosc == null)
                 return View("Error1",
-                            _funkcjePlatnosci.InitErrorViewData(
+                            _paymentsUtils.InitErrorViewData(
                                 _translateManager.Translate("tlumaczenia", "brakdanych"), 0));
 
@@ -203,7 +203,7 @@
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
-            invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
+            invoiceDeatailsViewData.Invoice = platnosc;
             invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
-            invoiceDeatailsViewData.brutto = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
+            invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
             return invoiceDeatailsViewData;
         }
Index: /unk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 970)
+++  (revision )
@@ -1,222 +1,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}</ProjectGuid>
-    <ProjectTypeGuids>{603c0e0b-db56-11dc-be95-000d561079b0};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Platnosci</RootNamespace>
-    <AssemblyName>Platnosci</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Elmah, Version=1.1.11517.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Elmah.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App_GlobalResources\tlumaczenia.de.designer.cs">
-      <DependentUpon>tlumaczenia.de.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="App_GlobalResources\tlumaczenia.fr.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>tlumaczenia.fr.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\tlumaczenia.it.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>tlumaczenia.it.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\tlumaczenia.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>tlumaczenia.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\tlumaczenia.pl.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>tlumaczenia.pl.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\MerchantController.cs" />
-    <Compile Include="Controllers\PlatnoscController.cs" />
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Helpers\helper.cs" />
-    <Compile Include="Models\FunkcjePlatnosci.cs" />
-    <Compile Include="Models\ErrorViewData.cs" />
-    <Compile Include="Models\InvoiceDetailsViewData.cs" />
-    <Compile Include="Models\eCardData.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="Global.asax" />
-    <Content Include="Views\Platnosc\Show.aspx" />
-    <Content Include="Web.config" />
-    <Content Include="Content\Site.css" />
-    <Content Include="Scripts\jquery-1.3.2.js" />
-    <Content Include="Scripts\jquery-1.3.2.min.js" />
-    <Content Include="Scripts\jquery-1.3.2-vsdoc.js" />
-    <Content Include="Scripts\jquery-1.3.2.min-vsdoc.js" />
-    <Content Include="Scripts\MicrosoftAjax.js" />
-    <Content Include="Scripts\MicrosoftAjax.debug.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
-    <Content Include="Views\Account\LogOn.aspx" />
-    <Content Include="Views\Home\About.aspx" />
-    <Content Include="Views\Home\Index.aspx" />
-    <Content Include="Views\Shared\Error.aspx" />
-    <Content Include="Views\Shared\LogOnUserControl.ascx" />
-    <Content Include="Views\Shared\Site.Master" />
-    <Content Include="Views\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\admoto.css" />
-    <Content Include="Content\truck.css" />
-    <Content Include="Images\de.gif" />
-    <Content Include="Images\fr.gif" />
-    <Content Include="Images\gb.gif" />
-    <Content Include="Images\it.gif" />
-    <Content Include="Images\pl.gif" />
-    <Content Include="Images\truck\logo.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Images\admoto\tlo1.gif" />
-    <Content Include="Images\admoto\tlo2.gif" />
-    <Content Include="Images\admoto\tlo_top_.gif" />
-    <Content Include="Views\Shared\Error1.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_GlobalResources\tlumaczenia.pl.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.pl.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_GlobalResources\tlumaczenia.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_GlobalResources\tlumaczenia.fr.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.fr.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_GlobalResources\tlumaczenia.de.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.de.designer.cs</LastGenOutput>
-    </Content>
-    <Content Include="App_GlobalResources\tlumaczenia.it.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.it.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Images\admoto\logo.png" />
-    <Content Include="Views\Platnosc\Fail.aspx" />
-    <Content Include="Views\Platnosc\Form.aspx" />
-    <Content Include="Views\Platnosc\Ok.aspx" />
-    <Content Include="Views\Platnosc\Paid.aspx" />
-    <Content Include="Views\Platnosc\Status.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\adMoto.Payments.Core\adMoto.Payments.Core.csproj">
-      <Project>{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}</Project>
-      <Name>adMoto.Payments.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Log\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>3646</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/adMoto.Payments.Test.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/adMoto.Payments.Test.csproj (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/adMoto.Payments.Test.csproj (revision 971)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1FD307C6-4D2F-4013-BD60-DD36FFE08CD4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>adMoto.Payments.Test</RootNamespace>
+    <AssemblyName>adMoto.Payments.Test</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Interop.SHDocVw, Version=1.1.0.0, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Interop.SHDocVw.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="MvcContrib, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\MvcContrib.dll</HintPath>
+    </Reference>
+    <Reference Include="MvcContrib.FluentHtml, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\MvcContrib.FluentHtml.dll</HintPath>
+    </Reference>
+    <Reference Include="MvcContrib.TestHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\MvcContrib.TestHelper.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Abstractions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WatiN.Core, Version=2.0.10.928, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\WatiN.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestRunner.cs" />
+    <Compile Include="Web\eCardDataTests.cs" />
+    <Compile Include="Web\PaymentUtilsTests.cs" />
+    <Compile Include="Web\MerchantControllerTests.cs" />
+    <Compile Include="Web\FakeDataContext.cs" />
+    <Compile Include="Web\FakeTranslation.cs" />
+    <Compile Include="Web\Function.cs" />
+    <Compile Include="Web\PlatnosciControllerTests.cs" />
+    <Compile Include="Web\StatusTest.cs" />
+    <Compile Include="Web\TestMethods.cs" />
+    <Compile Include="Web\UI\AuthenticationTests.cs" />
+    <Compile Include="Web\UI\ValidationTests.cs" />
+    <Compile Include="Web\UI\MerchantTests.cs" />
+    <Compile Include="Web\ValidationMerchantClassTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\adMoto.Payments.Core\adMoto.Payments.Core.csproj">
+      <Project>{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}</Project>
+      <Name>adMoto.Payments.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Platnosci\adMoto.Payments.Web.csproj">
+      <Project>{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}</Project>
+      <Name>adMoto.Payments.Web</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 949)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 971)
@@ -1,3 +1,3 @@
-namespace Platnosci.Tests
+namespace adMoto.Payments.Test
 {
     public class TestRunner
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
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs (revision 971)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs (revision 971)
@@ -0,0 +1,72 @@
+using System.Linq;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Models;
+using NUnit.Framework;
+
+namespace adMoto.Payments.Test.Web
+{
+    [TestFixture]
+    public class PaymentUtilsTests
+    {
+        private readonly Function _function = new Function();
+        private readonly ITranslateManager _translateManager = new FakeTranslation();
+
+        [Test, Sequential]
+        [Category("Unit")]
+        public void GetCurrency_Returns_Correct_Currency(
+            [Values(null, "", "eur", "usd", "gbp", "GBP")] string input,
+            [Values(PaymentsUtils.PLN, PaymentsUtils.PLN, PaymentsUtils.EUR, PaymentsUtils.USD, PaymentsUtils.GBP, PaymentsUtils.GBP)] string output
+            )
+        {
+            //Arrange
+            var funkcjePlantosi = new PaymentsUtils();
+
+            //Act
+            var result = funkcjePlantosi.GetCurrency(input);
+
+            //Assert
+            Assert.That(result, Is.EqualTo(output));
+        }
+
+        [Test]
+        [Category("Unit")]
+        public void CreateAndAddNewPayment_Creates_PlatnosciEcard()
+        {
+            //Arrange
+            var idFaktury = 123;
+            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
+            var paymentsUtils = new PaymentsUtils(repPayment, _translateManager);
+            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
+            var payer = _function.CreatePayer(idFaktury, "test", "test");
+            var waluta = new Waluta { Amount = 200, Currency = PaymentsUtils.PLN };
+
+            //Act
+            paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
+            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
+
+            //Act
+            Assert.That(payment.AMOUNT, Is.EqualTo(200));
+        }
+
+        [Test, Sequential]
+        [Category("Unit")]
+        public void BruttoToString_Returns_Correct_Amount(
+            [Values(null, "", "pln", "PLN", "GBP", "gbp", "xx")] string input,
+            [Values("100 PLN ", "100 PLN ", "100 PLN ", "100 PLN ", "100 PLN (1 GBP)", "100 PLN (1 GBP)", "100 PLN (1 XX)")] string output
+            )
+        {
+            //Arrange
+            var funkcjePlantosi = new PaymentsUtils();
+
+            //Act
+            var result = funkcjePlantosi.BruttoToString(100, 1, input);
+
+            //Act
+            System.Diagnostics.Debug.WriteLine(result);
+            Assert.That(result, Is.EqualTo(output));
+        }
+        
+    }
+}
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 971)
@@ -4,9 +4,9 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Controllers;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Controllers;
-using Platnosci.Models;
-
-namespace Platnosci.Tests.Web
+
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
@@ -201,5 +201,5 @@
             //Assert
             Assert.That(result.ViewName, Is.EqualTo("Paid"));
-            Assert.That(view.info, Is.EqualTo("zaplacono"));
+            Assert.That(view.Info, Is.EqualTo("zaplacono"));
         }
 
@@ -224,10 +224,10 @@
             var result = controller.Show("123", "pl") as ViewResult;                      
             var view = (InvoiceDetailsViewData)result.ViewData.Model;
-            System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.vPlatnosciEcard.Brutto);
-            System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.vPlatnosciEcard.Faktura_Numer);
+            System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.Invoice.Brutto);
+            System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.Invoice.Faktura_Numer);
             
             //Assert
-            Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200));
-            Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("numer"));            
+            Assert.That(view.Invoice.Brutto, Is.EqualTo(200));
+            Assert.That(view.Invoice.Faktura_Numer, Is.EqualTo("numer"));            
         }
 
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 971)
@@ -4,8 +4,7 @@
 using NUnit.Framework;
 using MvcContrib.TestHelper;
-using Platnosci.Controllers;
 using System.Web.Mvc;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 971)
@@ -3,5 +3,5 @@
 using NUnit.Framework;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 971)
@@ -5,5 +5,5 @@
 using adMoto.Payments.Core.Interfaces;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class FakeDataContext : IDataContext
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 971)
@@ -1,5 +1,5 @@
 using adMoto.Payments.Core.Interfaces;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class FakeTranslation : ITranslateManager
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 971)
@@ -5,5 +5,5 @@
 using Moq;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class Function
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs (revision 971)
@@ -4,5 +4,5 @@
 using NUnit.Framework;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class ValidationMerchantClassTests
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 970)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 971)
@@ -2,10 +2,10 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Controllers;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Controllers;
-using Platnosci.Models;
 using System.Web.Mvc;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs (revision 960)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs (revision 971)
@@ -2,5 +2,5 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs (revision 960)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs (revision 971)
@@ -2,5 +2,5 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs (revision 960)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs (revision 971)
@@ -2,5 +2,5 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]
Index: /unk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 970)
+++  (revision )
@@ -1,72 +1,0 @@
-using System.Linq;
-using adMoto.Payments.Core;
-using adMoto.Payments.Core.Data;
-using adMoto.Payments.Core.Interfaces;
-using NUnit.Framework;
-using Platnosci.Models;
-
-namespace Platnosci.Tests.Web
-{
-    [TestFixture]
-    public class FunkcjePlatnosciTests
-    {
-        private readonly Function _function = new Function();
-        private readonly ITranslateManager _translateManager = new FakeTranslation();
-
-        [Test, Sequential]
-        [Category("Unit")]
-        public void GetCurrency_Returns_Correct_Currency(
-            [Values(null, "", "eur", "usd", "gbp", "GBP")] string input,
-            [Values(FunkcjePlatnosci.PLN, FunkcjePlatnosci.PLN, FunkcjePlatnosci.EUR, FunkcjePlatnosci.USD, FunkcjePlatnosci.GBP, FunkcjePlatnosci.GBP)] string output
-            )
-        {
-            //Arrange
-            var funkcjePlantosi = new FunkcjePlatnosci();
-
-            //Act
-            var result = funkcjePlantosi.GetCurrency(input);
-
-            //Assert
-            Assert.That(result, Is.EqualTo(output));
-        }
-
-        [Test]
-        [Category("Unit")]
-        public void CreateAndAddNewPayment_Creates_PlatnosciEcard()
-        {
-            //Arrange
-            var idFaktury = 123;
-            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
-            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
-            var payer = _function.CreatePayer(idFaktury, "test", "test");
-            var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN };
-
-            //Act
-            funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
-            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
-
-            //Act
-            Assert.That(payment.AMOUNT, Is.EqualTo(200));
-        }
-
-        [Test, Sequential]
-        [Category("Unit")]
-        public void BruttoToString_Returns_Correct_Amount(
-            [Values(null, "", "pln", "PLN", "GBP", "gbp", "xx")] string input,
-            [Values("100 PLN ", "100 PLN ", "100 PLN ", "100 PLN ", "100 PLN (1 GBP)", "100 PLN (1 GBP)", "100 PLN (1 XX)")] string output
-            )
-        {
-            //Arrange
-            var funkcjePlantosi = new FunkcjePlatnosci();
-
-            //Act
-            var result = funkcjePlantosi.BruttoToString(100, 1, input);
-
-            //Act
-            System.Diagnostics.Debug.WriteLine(result);
-            Assert.That(result, Is.EqualTo(output));
-        }
-        
-    }
-}
Index: /unk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 970)
+++  (revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1FD307C6-4D2F-4013-BD60-DD36FFE08CD4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Platnosci.Tests</RootNamespace>
-    <AssemblyName>Platnosci.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Interop.SHDocVw, Version=1.1.0.0, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Interop.SHDocVw.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="MvcContrib, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\MvcContrib.dll</HintPath>
-    </Reference>
-    <Reference Include="MvcContrib.FluentHtml, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\MvcContrib.FluentHtml.dll</HintPath>
-    </Reference>
-    <Reference Include="MvcContrib.TestHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\MvcContrib.TestHelper.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Abstractions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WatiN.Core, Version=2.0.10.928, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\WatiN.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestRunner.cs" />
-    <Compile Include="Web\eCardDataTests.cs" />
-    <Compile Include="Web\FunkcjePlatnosciTests.cs" />
-    <Compile Include="Web\MerchantControllerTests.cs" />
-    <Compile Include="Web\FakeDataContext.cs" />
-    <Compile Include="Web\FakeTranslation.cs" />
-    <Compile Include="Web\Function.cs" />
-    <Compile Include="Web\PlatnosciControllerTests.cs" />
-    <Compile Include="Web\StatusTest.cs" />
-    <Compile Include="Web\TestMethods.cs" />
-    <Compile Include="Web\UI\AuthenticationTests.cs" />
-    <Compile Include="Web\UI\ValidationTests.cs" />
-    <Compile Include="Web\UI\MerchantTests.cs" />
-    <Compile Include="Web\ValidationMerchantClassTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\adMoto.Payments.Core\adMoto.Payments.Core.csproj">
-      <Project>{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}</Project>
-      <Name>adMoto.Payments.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Platnosci\Platnosci.Web.csproj">
-      <Project>{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}</Project>
-      <Name>Platnosci.Web</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>