Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 917)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 919)
@@ -33,5 +33,5 @@
 
         private readonly IRepository<vPlatnosciEcard> _repVPayment;
-        private readonly IRepository<PlatnosciEcard> _repPayment;        
+        private readonly IRepository<PlatnosciEcard> _repPayment; 
         private FunkcjePlatnosci _func;
         private ITranslate _t;
@@ -88,12 +88,18 @@
                 else merchantId = "171485000";
 
+            //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
+            int orderek = 0;
+            orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data);
+
             string LinkFail = ConfigurationManager.AppSettings["Strona"];
             LinkFail += "/" + language + ConfigurationManager.AppSettings["LinkFail"];
-            LinkFail += "/" + newPayment.IDFaktury;
+            LinkFail += "/" + newPayment.IDFaktury + "?o=" + orderek;
 
             string LinkOk = ConfigurationManager.AppSettings["Strona"];
             LinkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"];
-            LinkOk += "/" + newPayment.IDFaktury;
+            LinkOk += "/" + newPayment.IDFaktury + "?o=" + orderek; ;
 
+            //merchantid dla srodowiska testowego
+            merchantId = "171485000";
             wyslij(newPayment, hash, merchantId, LinkFail, LinkOk);
             return new EmptyResult();          
@@ -162,11 +168,13 @@
             return strResponse;
         }
-        private void wyslij(PlatnosciEcard m, string hash, string id, string linkok, string linkfail)
+        private void wyslij(PlatnosciEcard m, string hash, string merchantid, string linkok, string linkfail)
         {
+            //string adres = "https://pay.ecard.pl/payment/PS?ORDERDESCRIPTION=" + m.ORDERDESCRIPTION;
+            
             string adres = "https://pay.ecard.pl/servlet/PSTEST?ORDERDESCRIPTION=" + m.ORDERDESCRIPTION;
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres);
             string dane = "&AMOUNT=" + m.AMOUNT + "&CURRENCY=" + m.CURRENCY + "&ORDERNUMBER=" + m.ORDERNUMBER;
             dane += "&NAME=" + m.NAME + "&SURNAME=" + m.SURNAME + "&LANGUAGE=" + m.LANGUAGE + "&CHARSET=ISO-8859-2";
-            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=171485000&AUTODEPOSIT=" + m.AUTODEPOSIT;
+            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchantid + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
             dane += "&LINKFAIL=" + linkfail + "&LINKOK=" + linkok + "&SESSIONID=" + m.SESSIONID;
             Response.Redirect(adres + dane);