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;
+            }
         }