Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 873)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx (revision 873)
@@ -0,0 +1,13 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="Platnosci.Views.PlatnosciViews<Platnosci.Models.InvoiceDetailsViewData>"%>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+	 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "PotwierdzenieTitle").ToString()%>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+
+    <asp:Label ID="lab1" runat="server" Text="<%$Resources:tlumaczenia,podziekowania%>"></asp:Label>
+    <%=Model.vPlatnosciEcard.Faktura_Numer%>
+    <%string link1 = HttpContext.GetGlobalResourceObject("tlumaczenia","Powrot").ToString(); %>
+    <p id="link1"><%=Html.ActionLink(link1, "LogOn", "Account")%></p>
+</asp:Content>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 873)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 873)
@@ -0,0 +1,17 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="Platnosci.Views.PlatnosciViews<Platnosci.Models.InvoiceDetailsViewData>"%>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+	 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "PotwierdzenieTitle").ToString()%>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+
+    <p class="pay_error">
+        <asp:Label ID="lab2" runat="server" Text="<%$Resources:tlumaczenia,blad1%>"></asp:Label>
+        <%=Model.vPlatnosciEcard.Faktura_Numer%>
+        <asp:Label ID="lab3" runat="server" Text="<%$Resources:tlumaczenia,blad2%>"></asp:Label>
+    </p>
+    <%string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia","KolejnaProba").ToString();%>
+    <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.vPlatnosciEcard.ID_faktury}, null)%></p>
+
+</asp:Content>
Index: /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 871)
+++ /trunk/eCard/eCardMVC/Platnosci/Global.asax.cs (revision 873)
@@ -7,4 +7,5 @@
 using System.Threading;
 using System.Globalization;
+using System.Configuration;
 
 namespace Platnosci
@@ -17,7 +18,13 @@
         public static void RegisterRoutes(RouteCollection routes)
         {
+
             routes.IgnoreRoute("elmah.axd");
             routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
 
+            routes.MapRoute(
+               "potwierdzenie",                                            
+               "id={id}" + "&status={status}", 
+               new { controller = "Platnosc", action = "Potwierdzenie"}               
+            );
             routes.MapRoute(
                 "eCard",                                            // Route name
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 872)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 873)
@@ -14,4 +14,5 @@
 using System.Data.Linq;
 using System.Web.Configuration;
+using System.Web.Routing;
 
 namespace Platnosci.Controllers
@@ -31,5 +32,5 @@
         private string err_nazwisko = "";
 
-        protected override void Initialize(System.Web.Routing.RequestContext requestContext)
+        protected override void Initialize(RequestContext requestContext)
         {            
             base.Initialize(requestContext);
@@ -60,24 +61,9 @@
           
             language = _func.setLanguage(language);
-            int id1 = 0;
-            try
-            {
-                id1 = (id != null) ? Convert.ToInt32(id) : 0;
-            }
-            catch
-            {
-            }          
+            int id1 = ConvertId(id); 
+
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
             ErrorViewData errorViewData = new ErrorViewData();
-            if (platnosc == null)
-            {
-               errorViewData.error = brakdanych;
-               return View("Error1", errorViewData);                
-            }
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
-            {
-                errorViewData.error = weryfikacja;
-                return View("Error1", errorViewData);
-            }
+            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
             
             var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1);
@@ -99,31 +85,8 @@
         {
             language = _func.setLanguage(language);
-            int id1 = 0;
-            try
-            {
-                id1 = (payer.Id_faktury != null) ? Convert.ToInt32(payer.Id_faktury) : 0;
-            }
-            catch
-            {
-            }
-            vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            ErrorViewData errorViewData = new ErrorViewData();
-
-            if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
-            {
-                errorViewData.error = weryfikacja;
-                return View("Error1", errorViewData);
-            }
-            if (platnosc == null)
-            {
-                errorViewData.error = brakdanych;
-                return View("Error1", errorViewData);
-            }
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
-            {
-                errorViewData.error = weryfikacja;
-                return View("Error1", errorViewData);  
-            }
-
+
+            vPlatnosciEcard platnosc = _rep.FindInvoiceById(payer.Id_faktury).SingleOrDefault();
+            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
+            
             if (String.IsNullOrEmpty(payer.FirstName))
             {
@@ -142,52 +105,38 @@
             } 
             if (payer != null)
+            {                
+                System.Diagnostics.Debug.WriteLine("P;atnosciController:Show");
                 return RedirectToAction("Merchant", "Merchant", payer);
+            }
+                
             else return View("Error");
         }
-        public ActionResult Potwierdzenie(string id, string status, string language)
-        {
-            language = _func.setLanguage(language);
-
-            int id1 = 0;
-            try
-            {
-                id1 = (id != null) ? Convert.ToInt32(id) : 0;
-            }
-            catch
-            {
-                //id1=0 -> error type =  platnoscIsNotExist;
-            }
+        public ActionResult Ok(string id, string language)
+        {
+            language = _func.setLanguage(language);
+            int id1 = ConvertId(id);
             vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
-            ErrorViewData errorViewData = new ErrorViewData();
-            if (platnosc == null)
-            {
-                errorViewData.error = brakdanych;
-                return View("Error1", errorViewData);
-            }
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
-            {
-                errorViewData.error = weryfikacja;
-                return View("Error1", errorViewData);
-            }
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, status, "" );
+            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));            
+            
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
             return View(invoiceDeatailsViewData);
         }
-        public void UpdateStatus(int ordernumber, string validationcode)
-        {
-
-            var platnosc = _repPl.FindOne(i => i.ORDERNUMBER == ordernumber);
-            if (platnosc != null && platnosc.Status == true && validationcode == "000")
-            {
-                platnosc.Status = true;
-                platnosc.Status_data = DateTime.Now;
-                _repPl.Update(platnosc);
-            }
+        public ActionResult Fail(string id, string language)
+        {
+            language = _func.setLanguage(language);
+            int id1 = ConvertId(id);
+            vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
+            if (Iserror(platnosc).error != null) return View("Error1", Iserror(platnosc));
+            
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
+            return View(invoiceDeatailsViewData);
+        }
+        public ActionResult Potwierdzenie(string status, string id)
+        {
+            if (status == "ok") return RedirectToAction("Ok", "Platnosc", new {id});
+            return RedirectToAction("Fail", "Platnosc", new {id}); 
         }
         public ActionResult Status()
         {
-            if (string.IsNullOrEmpty(Request.Form["MERCHANTNUMBER"]))
-                throw new ArgumentException("MERCHANTNUMBER");
-
-            //TODO: validate the Form
             string MERCHANTNUMBER = Request.Form["MERCHANTNUMBER"];
             int ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]);
@@ -224,4 +173,5 @@
 
             _rep.Insert(potwierdzenie);
+            UpdateStatus(ORDERNUMBER, VALIDATIONCODE);
             return View();
         }
@@ -257,6 +207,40 @@
             this.zaplacono = value;
 
-        }        
-               
+        }
+        public int ConvertId(string id)
+        {
+            int id1 = 0;
+            try
+            {
+                id1 = (id != null) ? Convert.ToInt32(id) : 0;
+            }
+            catch
+            {
+            }
+            return id1;
+        }
+        public ErrorViewData Iserror(vPlatnosciEcard platnosc)
+        {
+            ErrorViewData errorViewData = new ErrorViewData();
+            if (platnosc == null)
+            {
+                errorViewData.error = brakdanych;
+            }
+            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name))
+            {
+                errorViewData.error = weryfikacja;
+            }
+            return errorViewData;
+        }
+        public void UpdateStatus(int ordernumber, string validationcode)
+        {
+            var platnosc = _repPl.FindOne(i => i.ORDERNUMBER == ordernumber);
+            if (platnosc != null && platnosc.Status == true && validationcode == "000")
+            {
+                platnosc.Status = true;
+                platnosc.Status_data = DateTime.Now;
+                _repPl.Update(platnosc);
+            }
+        }               
     }
 }
Index: /trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 867)
+++ /trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 873)
@@ -115,5 +115,4 @@
     <Content Include="Global.asax" />
     <Content Include="Views\Merchant\Merchant.aspx" />
-    <Content Include="Views\Platnosc\Potwierdzenie.aspx" />
     <Content Include="Views\Platnosc\Show.aspx" />
     <Content Include="Web.config" />
@@ -197,4 +196,6 @@
       <LastGenOutput>tlumaczenia.it.designer.cs</LastGenOutput>
     </Content>
+    <Content Include="Views\Platnosc\Fail.aspx" />
+    <Content Include="Views\Platnosc\Ok.aspx" />
     <Content Include="Views\Platnosc\Status.aspx" />
   </ItemGroup>