Index: trunk/eCard/eCardMVC/Platnosci/Web.config =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Web.config (revision 888) +++ trunk/eCard/eCardMVC/Platnosci/Web.config (revision 933) @@ -32,4 +32,9 @@ + + + + + Index: trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 916) +++ trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 933) @@ -1,15 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; - -namespace Platnosci.Models +namespace Platnosci.Models { public class ErrorViewData { - public string error { get; set; } - public OperationType type { get; set; } - public string tytul {get; set;} - public int idfaktury { get; set; } + public string Error { get; set; } + public int InvoiceId { get; set; } } } Index: trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 914) +++ trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 933) @@ -101,5 +101,5 @@ { ErrorViewData er = new ErrorViewData(); - er.error = errortxt; + er.Error = errortxt; return er; } Index: trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 916) +++ trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx (revision 933) @@ -12,9 +12,9 @@

- <%=Model.error%> - <%if (Model.error == HttpContext.GetGlobalResourceObject("tlumaczenia", "error_hash").ToString()) + <%=Model.Error%> + <%if (Model.Error == HttpContext.GetGlobalResourceObject("tlumaczenia", "error_hash").ToString()) { string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia", "KolejnaProba").ToString();%> - <%=Html.ActionLink(link2, "Show", "Platnosc", new { id = Model.idfaktury }, null)%> + <%=Html.ActionLink(link2, "Show", "Platnosc", new { id = Model.InvoiceId }, null)%> <%}%>

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; Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 927) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 933) @@ -1,18 +1,8 @@ using System; using System.Linq; -using System.Text; -using System.Web; using System.Web.Mvc; -using System.Web.Mvc.Ajax; using Platnosci.Models; using Platnosci.Core.Linq; using Platnosci.Core.Interface; -using System.Collections.Generic; -using System.Globalization; -using System.Web.UI; -using System.Threading; -using System.Data.Linq; -using System.Web.Configuration; -using System.Web.Routing; namespace Platnosci.Controllers @@ -24,8 +14,8 @@ public const string ISPAID = "payment_deposited"; //transakcja potwierdzona do rozliczenia private readonly IRepository _repVPayment; - private IRepository _repPayment; + private readonly IRepository _repPayment; private readonly IRepository _repConfirm; - private ITranslateManager translation; - private FunkcjePlatnosci _func; + private readonly ITranslateManager _translateManager; + private readonly FunkcjePlatnosci _funkcjePlatnosci; public PlatnoscController() @@ -34,6 +24,6 @@ _repPayment = new Repository(new DataContext1()); _repConfirm = new Repository(new DataContext1()); - _func = new FunkcjePlatnosci(); - translation = new Translation(); + _funkcjePlatnosci = new FunkcjePlatnosci(); + _translateManager = new Translation(); } public PlatnoscController(IRepository repVPayment, IRepository repPayment, IRepository repConfirm, ITranslateManager translate) @@ -42,26 +32,27 @@ _repPayment = repPayment; _repConfirm = repConfirm; - _func = new FunkcjePlatnosci(); - translation = translate; + _funkcjePlatnosci = new FunkcjePlatnosci(); + _translateManager = translate; } public ActionResult Show(string id, string language) { - language = _func.setLanguage(language); - int id1 = ConvertId(id); - - vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); - if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); - - string kwota = ""; - kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); - var payer = InitPayer("", "", platnosc.ID_faktury); + _funkcjePlatnosci.setLanguage(language); + var id1 = ConvertId(id); + + var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); + if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc)); + + var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); + + var payer = InitPayer(platnosc.ID_faktury); + var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota); - var tablica_potwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); - if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana - { - string data_zaplaty = String.Format("{0:dd-MM-yyyy}", tablica_potwierdzenia[0].AUTHTIME); - invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia","zaplacono"), platnosc.Faktura_Numer, data_zaplaty); - invoiceDeatailsViewData.termin = data_zaplaty; + var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); + if (tablicaPotwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana + { + var dataZaplaty = String.Format("{0:dd-MM-yyyy}", tablicaPotwierdzenia[0].AUTHTIME); + invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia","zaplacono"), platnosc.Faktura_Numer, dataZaplaty); + invoiceDeatailsViewData.termin = dataZaplaty; return View("Paid", invoiceDeatailsViewData); } @@ -72,37 +63,39 @@ public ActionResult Show(Payer payer, string language) { - language = _func.setLanguage(language); - vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault(); - if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); + _funkcjePlatnosci.setLanguage(language); + + var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault(); + + if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc)); if (String.IsNullOrEmpty(payer.FirstName)) { - ModelState.AddModelError("Payer.FirstName", translation.Translate("tlumaczenia", "err_imieWK")); + ModelState.AddModelError("Payer.FirstName", _translateManager.Translate("tlumaczenia", "err_imieWK")); } if (String.IsNullOrEmpty(payer.LastName)) { - ModelState.AddModelError("Payer.LastName", translation.Translate("tlumaczenia", "err_nazwiskoWK")); + ModelState.AddModelError("Payer.LastName", _translateManager.Translate("tlumaczenia", "err_nazwiskoWK")); } if (ModelState.IsValid == false) { - string kwota = ""; - kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); + var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota ); return View("Show",viewData); - } - if (payer != null) - { - System.Diagnostics.Debug.WriteLine("PlatnosciController:Show"); - return RedirectToAction("Merchant", "Merchant", payer); - } - else return View("Error"); - } + } + + return RedirectToAction("Merchant", "Merchant", payer); + } + public ActionResult Ok(string id, string language, string o) { - int order = ConvertId(o); - language = _func.setLanguage(language); - int id1 = ConvertId(id); - vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); - if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); + var order = ConvertId(o); + + _funkcjePlatnosci.setLanguage(language); + + var id1 = ConvertId(id); + + var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); + + if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc)); var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , ""); @@ -114,9 +107,9 @@ if (CheckConfirm(id1, order) == 0) //nie ma potwierdzenia z eCardu { - invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer); + invoiceDeatailsViewData.info = String.Format(_translateManager.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer); } else { - if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = translation.Translate("tlumaczenia", "weryfikacja"); + if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja"); } } @@ -126,8 +119,8 @@ public ActionResult Fail(string id, string language) { - language = _func.setLanguage(language); - int id1 = ConvertId(id); - vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); - if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); + _funkcjePlatnosci.setLanguage(language); + var id1 = ConvertId(id); + var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); + if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc)); var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", ""); @@ -140,8 +133,5 @@ public ActionResult Status() { - string CURRENTSTATE = ""; - int ORDERNUMBER = 0; - - PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard(); + var potwierdzenie = new PotwierdzeniaEcard(); var content = new ContentResult(); try @@ -151,17 +141,9 @@ if (!String.IsNullOrEmpty(Request.Form["BIN"])) potwierdzenie.BIN = Request.Form["BIN"]; if (!String.IsNullOrEmpty(Request.Form["COMMTYPE"])) potwierdzenie.COMMTYPE = Request.Form["COMMTYPE"]; - if (!String.IsNullOrEmpty(Request.Form["CURRENTSTATE"])) - { - CURRENTSTATE = Request.Form["CURRENTSTATE"]; - potwierdzenie.CURRENTSTATE = CURRENTSTATE; - } + if (!String.IsNullOrEmpty(Request.Form["CURRENTSTATE"])) potwierdzenie.CURRENTSTATE = Request.Form["CURRENTSTATE"]; if (!String.IsNullOrEmpty(Request.Form["DATATRANSMISJI"])) potwierdzenie.DATATRANSMISJI = Convert.ToDateTime(Request.Form["DATATRANSMISJI"]); if (!String.IsNullOrEmpty(Request.Form["EVENTTYPE"])) potwierdzenie.EVENTTYPE = Convert.ToBoolean(Request.Form["EVENTTYPE"]); if (!String.IsNullOrEmpty(Request.Form["MERCHANTNUMBER"])) potwierdzenie.MERCHANTNUMBER = Request.Form["MERCHANTNUMBER"]; - if (!String.IsNullOrEmpty(Request.Form["ORDERNUMBER"])) - { - ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]); - potwierdzenie.ORDERNUMBER = ORDERNUMBER; - } + if (!String.IsNullOrEmpty(Request.Form["ORDERNUMBER"])) potwierdzenie.ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]); if (!String.IsNullOrEmpty(Request.Form["PAYMENTNUMBER"])) potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Request.Form["PAYMENTNUMBER"]); if (!String.IsNullOrEmpty(Request.Form["PAYMENTTYPE"])) potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Request.Form["PAYMENTTYPE"]); @@ -172,5 +154,8 @@ _repConfirm.Insert(potwierdzenie); - UpdateStatus(ORDERNUMBER, CURRENTSTATE); + + if (potwierdzenie.ORDERNUMBER.HasValue) + UpdateStatus(potwierdzenie.ORDERNUMBER.Value, potwierdzenie.CURRENTSTATE); + content.Content = "OK"; } @@ -182,13 +167,12 @@ return content; } - private Payer InitPayer(string FirstName, string LastName, int Id_faktury) - { - Payer payer = new Payer(); - payer.FirstName = ""; - payer.LastName = ""; - payer.Id_faktury = Id_faktury; + + private static Payer InitPayer(int idFaktury) + { + var payer = new Payer {Id_faktury = idFaktury}; return payer; } - private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto ) + + private static InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto ) { var invoiceDeatailsViewData = new InvoiceDetailsViewData(); @@ -199,42 +183,41 @@ return invoiceDeatailsViewData; } + public int ConvertId(string id) { - int id1 = 0; - try - { - id1 = (id != null) ? Convert.ToInt32(id) : 0; - } - catch - { - } - return id1; - } - public ErrorViewData Iserror(vPlatnosciEcard platnosc) - { - string errortxt = ""; - if (platnosc == null) errortxt = translation.Translate("tlumaczenia", "brakdanych"); - else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name)) errortxt = translation.Translate("tlumaczenia","weryfikacja"); - ErrorViewData errorViewData = _func.InitErrorViewData(errortxt); - return errorViewData; - } + int id1; + return Int32.TryParse(id, out id1) ? id1 : 0; + } + + public ErrorViewData IsError(vPlatnosciEcard platnosc) + { + var errortxt = ""; + + if (platnosc == null) + errortxt = _translateManager.Translate("tlumaczenia", "brakdanych"); + else if (!_funkcjePlatnosci.UserIdentity(platnosc, HttpContext.User.Identity.Name)) + errortxt = _translateManager.Translate("tlumaczenia","weryfikacja"); + + return _funkcjePlatnosci.InitErrorViewData(errortxt); + } + public void UpdateStatus(int ordernumber, string currentstate) { - PlatnosciEcard platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault(); - if (platnosc != null && currentstate == ISPAID) - { - platnosc.Status = true; - platnosc.Status_data = DateTime.Now; - _repPayment.SubmitChanges(); - - System.Diagnostics.Debug.WriteLine("IsUpdate"); - } - } + var platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault(); + + if (platnosc == null || currentstate != ISPAID) return; + + platnosc.Status = true; + platnosc.Status_data = DateTime.Now; + _repPayment.SubmitChanges(); + } + public int CheckConfirm(int idfaktury, int order) { - PlatnosciEcard pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault(); + var pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault(); + if (pl != null) { - PotwierdzeniaEcard confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault(); + var confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault(); if (confirm == null) return 0; //potwierdzenie nie przyszlo z eCardu } @@ -243,18 +226,7 @@ return 2; //nie ma platnosci o takim idfaktury i ordernumber } + return 1; //potwierdzenie przyszlo z eCardu - } - public IRepository getRepVPayment() - { - return this._repVPayment; - } - public IRepository getRepPayment() - { - return this._repPayment; - } - public IRepository getRepConfirm() - { - return this._repConfirm; - } + } } } Index: trunk/eCard/eCardMVC/Platnosci.Tests/app.config =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/app.config (revision 887) +++ trunk/eCard/eCardMVC/Platnosci.Tests/app.config (revision 933) @@ -6,4 +6,8 @@ + + + + Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 931) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 933) @@ -17,5 +17,5 @@ { private readonly ITranslateManager _translateManager = new FakeTranslation(); - private readonly string _merchantNumber = "123"; + private const string MERCHANT_NUMBER = "123"; private readonly int _orderNumber = 9999; private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia @@ -38,5 +38,5 @@ var controller = new PlatnoscController(null, repository, rep, _translateManager); builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", _merchantNumber); + builder.Form.Add("MERCHANTNUMBER", MERCHANT_NUMBER); builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); @@ -49,5 +49,5 @@ var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER)); var paymentAfterUpdate = repository.FindOne(_orderNumber); System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); @@ -67,5 +67,5 @@ var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager); builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", _merchantNumber); + builder.Form.Add("MERCHANTNUMBER", MERCHANT_NUMBER); builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); @@ -76,5 +76,5 @@ var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER)); var paymentAfterUpdate = repPayment.FindOne(_orderNumber); @@ -128,5 +128,5 @@ var error = (ErrorViewData)result.ViewData.Model; - Assert.That(error.error, Is.EqualTo("weryfikacja")); + Assert.That(error.Error, Is.EqualTo("weryfikacja")); Assert.That(result.ViewName, Is.EqualTo("Error1")); } @@ -145,5 +145,5 @@ var error = (ErrorViewData)result.ViewData.Model; - Assert.That(error.error, Is.EqualTo("brakdanych")); + Assert.That(error.Error, Is.EqualTo("brakdanych")); Assert.That(result.ViewName, Is.EqualTo("Error1")); } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 931) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 933) @@ -30,5 +30,5 @@ var error = (ErrorViewData)result.ViewData.Model; - Assert.That(error.error, Is.EqualTo("weryfikacja")); + Assert.That(error.Error, Is.EqualTo("weryfikacja")); Assert.That(result.ViewName, Is.EqualTo("Error1")); } @@ -49,5 +49,5 @@ var error = (ErrorViewData)result.ViewData.Model; - Assert.That(error.error, Is.EqualTo("brakdanych")); + Assert.That(error.Error, Is.EqualTo("brakdanych")); Assert.That(result.ViewName, Is.EqualTo("Error1")); }