Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 866)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 868)
@@ -54,8 +54,7 @@
                 return View("Error1", errorViewData);
             }
-            //gdy platnosc za fakture zostala uregulowana ->nie przekierowujemy do systemu eCard,
-            //tylko wyswietlamy stosowny komunikat
+            
             var tablica_potwierdzenia = _context.FindItemsByIdFaktury(id1);
-            if (tablica_potwierdzenia.Count > 0)
+            if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
             {
                 string data_zaplaty = String.Format("{0:dd-MM-yyyy}",tablica_potwierdzenia[0].AUTHTIME);
@@ -65,17 +64,9 @@
             
             string kwota = "";
-            kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);                                    
-            
-            Payer payer = new Payer();
-            payer.FirstName = "";
-            payer.LastName = "";
-            payer.Id_faktury = platnosc.ID_faktury;
-                              
-            var invoiceDeatailsViewData = new InvoiceDetailsViewData();
-            invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
-            invoiceDeatailsViewData.Payer = payer;
-            invoiceDeatailsViewData.brutto = kwota;
+            kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
+            var payer = InitPayer("", "", platnosc.ID_faktury);
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);           
             return View(invoiceDeatailsViewData);
-        }
+        }        
         [Authorize]
         [AcceptVerbs(HttpVerbs.Post)]
@@ -117,10 +108,7 @@
             if (ModelState.IsValid == false)
             {
-                var viewData = new InvoiceDetailsViewData();
                 string kwota = "";
                 kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
-                viewData.brutto = kwota;
-                viewData.Payer = payer;
-                viewData.vPlatnosciEcard = platnosc;
+                var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota );
                 return View("Show",viewData);
             } 
@@ -154,8 +142,5 @@
                 return View("Error1", errorViewData);
             }
-            var invoiceDeatailsViewData = new InvoiceDetailsViewData();
-            invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
-            invoiceDeatailsViewData.Payer = null;
-            invoiceDeatailsViewData.Status = status;
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, status, "" );
             return View(invoiceDeatailsViewData);
         }
@@ -203,4 +188,21 @@
             return View();
         }
+        private Payer InitPayer(string FirstName, string LastName, int Id_faktury)
+        {
+            Payer payer = new Payer();
+            payer.FirstName = "";
+            payer.LastName = "";
+            payer.Id_faktury = Id_faktury;
+            return payer;
+        }
+        private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
+        {
+            var invoiceDeatailsViewData = new InvoiceDetailsViewData();
+            invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
+            invoiceDeatailsViewData.Payer = payer;
+            invoiceDeatailsViewData.Status = status;
+            invoiceDeatailsViewData.brutto = brutto;
+            return invoiceDeatailsViewData;
+        }
                
     }