Index: /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs (revision 949)
+++ /trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs (revision 954)
@@ -1,4 +1,5 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using Platnosci.Core.Interface;
@@ -13,5 +14,8 @@
         public DataContext()
         {
-            _dataContext = new PlatnosciDataContext();
+            var connectionString = ConfigurationManager.ConnectionStrings["BazaReklamConnectionString"];
+            if (connectionString == null)
+                throw new ArgumentNullException("BazaReklamConnectionString");
+            _dataContext = new PlatnosciDataContext(connectionString.ConnectionString);
         }
 
Index: /trunk/eCard/eCardMVC/Platnosci/Web.config
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Web.config (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci/Web.config (revision 954)
@@ -61,6 +61,5 @@
   -->
   <connectionStrings>
-		<add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
-    <add name="Platnosci.Core.Properties.Settings.BAZA_REKLAM_TESTConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
+    <add name="BazaReklamConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
   </connectionStrings>
 	<system.web>
Index: /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 954)
@@ -13,8 +13,8 @@
     public class FunkcjePlatnosci
     {
-        private const string EUR = "978";
-        private const string GBP = "826";
-        private const string USD = "789";
-        private const string PLN = "985";
+        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
@@ -58,27 +58,34 @@
         {
             var waluta = new Waluta();
-            
-            if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN")
+
+            waluta.Currency = GetCurrency(platnosc.waluta_miano);
+            if (waluta.Currency == PLN)
             {
-                waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
-                switch (platnosc.waluta_miano)
-                {
-                    case "EUR":
-                        waluta.Currency = EUR;
-                        break;
-                    case "GBP":
-                        waluta.Currency = GBP;
-                        break;
-                    case "USD":
-                        waluta.Currency = USD;
-                        break;
-                }
+                waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
             }
             else
             {
-                waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
-                waluta.Currency = PLN;
+                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;
+            }
         }
 
Index: /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 953)
+++ /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 954)
@@ -432,5 +432,5 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Too many characters. The maximum number of characters allowed in a field is {0}..
+        ///   Looks up a localized string similar to Too many characters. Maximum number of characters is {0}..
         /// </summary>
         internal static string ToLongValue {
Index: /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 948)
+++ /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.de.resx (revision 954)
@@ -269,3 +269,6 @@
     <value>Die Rechnung mit der Nummer {0} wurde am {1} bezahlt.</value>
   </data>
+  <data name="ToLongValue" xml:space="preserve">
+    <value>Erlaubte Anzahl der Zeichen ist {0}.</value>
+  </data>
 </root>
Index: /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 953)
+++ /trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 954)
@@ -270,5 +270,5 @@
   </data>
   <data name="ToLongValue" xml:space="preserve">
-    <value>Too many characters. The maximum number of characters allowed in a field is {0}.</value>
+    <value>Too many characters. Maximum number of characters is {0}.</value>
   </data>
 </root>
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 954)
@@ -65,6 +65,6 @@
             
             var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
-            
-            if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
+            var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
+            if (!String.IsNullOrEmpty(errorViewData.Error)) return View("Error1", errorViewData);
             
             if (String.IsNullOrEmpty(payer.FirstName))
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/app.config
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/app.config (revision 933)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/app.config (revision 954)
@@ -9,4 +9,7 @@
     <add key="eCard.Url" value="https://pay.ecard.pl/servlet/PSTEST"/>
   </appSettings>
+  <connectionStrings>
+    <add name="BazaReklamConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
+  </connectionStrings>
  
   <NUnit>
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 954)
@@ -84,4 +84,5 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestRunner.cs" />
+    <Compile Include="Web\FunkcjePlatnosciTests.cs" />
     <Compile Include="Web\MerchantControllerTests.cs" />
     <Compile Include="Web\FakeDataContext.cs" />
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 952)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 954)
@@ -37,5 +37,5 @@
             var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
             var payer = _function.CreatePayer(idFaktury, "test", "test");
-            var waluta = new Waluta {Amount = 200,Currency = "PLN"};
+            var waluta = new Waluta {Amount = 200, Currency = "PLN"};
             var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta ,payer, "sessionId");
 
Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 954)
+++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 954)
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using NUnit.Framework;
+
+using Platnosci.Models;
+
+namespace Platnosci.Tests.Web
+{
+    [TestFixture]
+    class FunkcjePlatnosciTests
+    {
+        [Test, Sequential]
+        public void GetCurrency_Returns_PLN_When_Passing_Null(
+            [Values(null, "eur", "usd", "gbp", "GBP")] string input,
+            [Values(FunkcjePlatnosci.PLN, FunkcjePlatnosci.EUR, FunkcjePlatnosci.USD, FunkcjePlatnosci.GBP, FunkcjePlatnosci.GBP)] string output
+            )
+        {
+            var funkcjePlantosi = new FunkcjePlatnosci();
+            var result = funkcjePlantosi.GetCurrency(input);
+            Assert.That(result, Is.EqualTo(output));
+        }
+    }
+}