Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 927) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 933) @@ -1,15 +1,5 @@ using System; -using System.Text; using System.Linq; -using System.Web; -using System.Web.UI; - -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; -using System.Web.Configuration; using System.Web.Mvc; -using System.Web.Mvc.Ajax; -using System.Collections.Generic; using Platnosci.Models; using Platnosci.Core.Linq; @@ -30,10 +20,11 @@ public const string KODOWANIE = "ISO-8859-2"; public const string HASH_ERROR_INFO = "payment not exist"; - private string merchantId; + private string _merchantId; + private string _merchantPassword; private readonly IRepository _repVPayment; private readonly IRepository _repPayment; - private FunkcjePlatnosci _func; - private ITranslateManager _t; + private readonly FunkcjePlatnosci _funkcjePlatnosci; + private readonly ITranslateManager _translateManager; public MerchantController() @@ -41,71 +32,72 @@ _repVPayment = new Repository(new DataContext1()); _repPayment = new Repository(new DataContext1()); - _func = new FunkcjePlatnosci(); - _t = new Translation(); + _funkcjePlatnosci = new FunkcjePlatnosci(); + _translateManager = new Translation(); } + public ActionResult Merchant(Payer payer, string language) { System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language); - language = _func.setLanguage(language); + language = _funkcjePlatnosci.setLanguage(language); - int id1 = Convert.ToInt32(payer.Id_faktury); - vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); + var id1 = Convert.ToInt32(payer.Id_faktury); + var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); if (platnosc == null) { - ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "brakdanych")); - return View("Error1", errorViewData); - } - else if (!_func.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name)) - { - ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "weryfikacja")); + ErrorViewData errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych")); return View("Error1", errorViewData); } - Waluta waluta = _func.setAmount(platnosc); - var newPayment = InitNewPayment(id1, platnosc, waluta, payer ); - - string systemKs = platnosc.SystemKsiegowyId.ToString(); - - bool createPayment = AddNewPayment(newPayment); - if (createPayment == false) + if (!_funkcjePlatnosci.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name)) { - ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "error_hash")); - errorViewData.idfaktury = payer.Id_faktury; + ErrorViewData errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "weryfikacja")); return View("Error1", errorViewData); } - string hash = GetHash(newPayment, systemKs); - hash = hash.Replace("\n",""); - if (hash == BAD_HASH || hash == "" || hash == HASH_ERROR_INFO) + var waluta = _funkcjePlatnosci.setAmount(platnosc); + var newPayment = InitNewPayment(id1, platnosc, waluta, payer ); + + var systemKs = platnosc.SystemKsiegowyId.ToString(); + + var createPayment = AddNewPayment(newPayment); + + if (createPayment == false) { - ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "error_hash")); - errorViewData.idfaktury = payer.Id_faktury; + ErrorViewData errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash")); + errorViewData.InvoiceId = payer.Id_faktury; return View("Error1", errorViewData); } - if (systemKs == "1") merchantId = "170906000"; - else merchantId = "171485000"; + _merchantId = systemKs == "1" ? "171485000" : "170906000"; + _merchantPassword = systemKs == "1" ? "ashSeth2" : "JaYpqfs0"; + + var hash = GetHash(newPayment, _merchantId, _merchantPassword); + hash = hash.Replace("\n",""); + + if (hash == BAD_HASH || hash == "" || hash == HASH_ERROR_INFO) + { + ErrorViewData errorViewData = _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash")); + errorViewData.InvoiceId = payer.Id_faktury; + return View("Error1", errorViewData); + } //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia - int orderek = 0; - orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data); + var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data); - string LinkFail = ConfigurationManager.AppSettings["Strona"]; - LinkFail += "/" + language + ConfigurationManager.AppSettings["LinkFail"]; - LinkFail += "/" + newPayment.IDFaktury + "?o=" + orderek; + var linkFail = ConfigurationManager.AppSettings["Strona"]; + linkFail += "/" + language + ConfigurationManager.AppSettings["LinkFail"]; + linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek; - string LinkOk = ConfigurationManager.AppSettings["Strona"]; - LinkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"]; - LinkOk += "/" + newPayment.IDFaktury + "?o=" + orderek; ; - - //merchantid dla srodowiska testowego - merchantId = "171485000"; - wyslij(newPayment, hash, merchantId, LinkFail, LinkOk); + var linkOk = ConfigurationManager.AppSettings["Strona"]; + linkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"]; + linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek; + + SendRequest(newPayment, hash, _merchantId, linkFail, linkOk); return new EmptyResult(); } private PlatnosciEcard InitNewPayment(int id, vPlatnosciEcard platnosc, Waluta waluta, Payer payer) { - PlatnosciEcard newPayment = new PlatnosciEcard(); + var newPayment = new PlatnosciEcard(); newPayment.IDFaktury = id; newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer; @@ -128,4 +120,5 @@ return newPayment; } + private bool AddNewPayment(PlatnosciEcard platnosc) { @@ -137,42 +130,38 @@ return false; } - private string GetHash(PlatnosciEcard p, string ks) + + private string GetHash(PlatnosciEcard p, string merchantId, string merchantPassword) { - string strResponse; - PlatnosciEcard platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data).First(); + var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data).First(); if (platnosc == null) return HASH_ERROR_INFO; - string adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER; - HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres); - string dane = "&orderDescription=&amount=" + platnosc.AMOUNT; + var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER; + var req = (HttpWebRequest)WebRequest.Create(adres); + var dane = "&orderDescription=&amount=" + platnosc.AMOUNT; dane += "¤cy=" + platnosc.CURRENCY; - dane += "&merchantId=171485000&password=ashSeth2"; + dane += string.Format("&merchantId={0}&password={1}", merchantId, merchantPassword); - // if (ks == "1") dane += "&merchantId=171485000&password=ashSeth2"; - // else dane += "&merchantId=170906000&password=JaYpqfs0"; - - byte[] bdata = System.Text.ASCIIEncoding.ASCII.GetBytes(dane); + var bdata = System.Text.Encoding.ASCII.GetBytes(dane); req.Method = "POST"; req.ContentType = "application/x-www-form-urlencoded"; req.ContentLength = dane.Length; - Stream reqStream = req.GetRequestStream(); + var reqStream = req.GetRequestStream(); reqStream.Write(bdata, 0, bdata.Length); reqStream.Close(); - StreamReader streamResponse = new StreamReader(req.GetResponse().GetResponseStream()); - strResponse = streamResponse.ReadToEnd(); + var streamResponse = new StreamReader(req.GetResponse().GetResponseStream()); + string strResponse = streamResponse.ReadToEnd(); streamResponse.Close(); return strResponse; } - private void wyslij(PlatnosciEcard m, string hash, string merchantid, string linkok, string linkfail) + + private void SendRequest(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; + var adres = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + m.ORDERDESCRIPTION; + + var 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=" + merchantid + "&AUTODEPOSIT=" + m.AUTODEPOSIT;