Index: trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 933) +++ trunk/eCard/eCardMVC/Platnosci/Models/ErrorViewData.cs (revision 971) @@ -1,8 +1,8 @@ -namespace Platnosci.Models +namespace adMoto.Payments.Web.Models { public class ErrorViewData { - public string Error { get; set; } - public int InvoiceId { get; set; } + public string Error { get; set; } + public int InvoiceId { get; set; } } } Index: trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs (revision 971) +++ trunk/eCard/eCardMVC/Platnosci/Models/MerchantHelper.cs (revision 971) @@ -0,0 +1,127 @@ +using System; +using System.Net; +using System.IO; +using System.Linq; +using System.Configuration; +using adMoto.Payments.Core; +using adMoto.Payments.Core.Data; +using adMoto.Payments.Core.Interfaces; + +namespace adMoto.Payments.Web.Models +{ + public class MerchantHelper + { + public const string HASH_ERROR_INFO = "payment not exist"; + private readonly PaymentsUtils _paymentsUtils; + private IRepository _repPayment; + + public MerchantHelper(IRepository repPayment) + { + _repPayment = repPayment; + _paymentsUtils = new PaymentsUtils(_repPayment); + } + + public String GetUrl(Merchant merchant) + { + if (merchant == null) + throw new ArgumentNullException("merchant"); + + var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION; + dane += "&AMOUNT=" + merchant.Payment.AMOUNT + "&CURRENCY=" + merchant.Payment.CURRENCY; + dane += "&ORDERNUMBER=" + merchant.Payment.ORDERNUMBER; + dane += "&NAME=" + merchant.Payment.NAME + "&SURNAME=" + merchant.Payment.SURNAME; + dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2"; + dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash; + dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + merchant.Payment.AUTODEPOSIT; + dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk; + dane += "&SESSIONID=" + merchant.Payment.SESSIONID; + + return dane; + } + public Merchant CreateMerchantData(Invoice invoice, Payer payer, string lang, string sessionId) + { + var merchant = new Merchant(); + + var waluta = _paymentsUtils.SetAmount(invoice); + var newPayment = _paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, sessionId); + + merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString(); + +#if DEBUG + //TODO: find better method to set SystemKsiegowy when testing or developing + merchant.SystemKsiegowy = "2"; +#endif + + merchant.Payment = newPayment; + GetMerchantInfo(merchant); + merchant.Hash = SetHash(merchant); + + //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia + var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data); + + var linkFail = ConfigurationManager.AppSettings["Strona"]; + linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"]; + linkFail += "/" + newPayment.IDFaktury + "/?"; + + var linkOk = ConfigurationManager.AppSettings["Strona"]; + linkOk += "/" + lang + ConfigurationManager.AppSettings["LinkOk"]; + linkOk += "/" + newPayment.IDFaktury + "/" + orderek + "/?"; + + merchant.LinkOk = linkOk; + merchant.LinkFail = linkFail; + + merchant.IsValid(); + + return merchant; + } + + public void GetMerchantInfo(Merchant merchant) + { + if (merchant.SystemKsiegowy == "2") + { + merchant.Id = "171485000"; + merchant.Password = "ashSeth2"; + } + else + { + merchant.Id = "170906000"; + merchant.Password = "JaYpqfs0"; + } + } + public string SetHash(Merchant merchant) + { + if (merchant == null) + throw new ArgumentNullException("merchant"); + + var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault(); + + if (platnosc == null) + merchant.Hash = HASH_ERROR_INFO; + else + { + 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 += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password); + + var bdata = System.Text.Encoding.ASCII.GetBytes(dane); + req.Method = "POST"; + req.ContentType = "application/x-www-form-urlencoded"; + req.ContentLength = dane.Length; + + var reqStream = req.GetRequestStream(); + reqStream.Write(bdata, 0, bdata.Length); + reqStream.Close(); + + var streamResponse = new StreamReader(req.GetResponse().GetResponseStream()); + string strResponse = streamResponse.ReadToEnd(); + streamResponse.Close(); + strResponse = strResponse.Replace("\n", ""); + + merchant.Hash = strResponse; + } + return merchant.Hash; + } + } +} Index: trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs (revision 971) +++ trunk/eCard/eCardMVC/Platnosci/Models/PaymentsUtils.cs (revision 971) @@ -0,0 +1,194 @@ +using System; +using System.Web; +using System.Threading; +using System.Globalization; +using System.Configuration; +using System.Security.Principal; +using adMoto.Payments.Core; +using adMoto.Payments.Core.Data; +using adMoto.Payments.Core.Interfaces; + + +namespace adMoto.Payments.Web.Models +{ + public class PaymentsUtils + { + public const string EUR = "978"; + public const string GBP = "826"; + public const string USD = "789"; + public const string PLN = "985"; + public const string CARDS = "CARDS"; //obsługa tylko kart płatniczych + public const string KOD_POLSKA = "616"; //kod kraju Akceptanta - Polska + public const string KODOWANIE = "ISO-8859-2"; + private readonly IRepository _repPayment; + private readonly ITranslateManager _translateManager; + + public PaymentsUtils() + { + _repPayment = new Repository(new DataContext()); + _translateManager = new Translation(); + } + + public PaymentsUtils(IRepository repPayment) + { + _repPayment = repPayment; + _translateManager = new Translation(); + } + public PaymentsUtils(IRepository repPayment, ITranslateManager translate) + { + _repPayment = repPayment; + _translateManager = translate; + } + public string BruttoToString(decimal? kwota, decimal? waluta, string miano) + { + var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN "; + + if (!String.IsNullOrEmpty(miano)) + if (waluta > 0 && miano.ToUpper() != "PLN") + brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")"; + + return brutto; + } + + public bool UserIdentity(Invoice platnosc, string userName) + { + return platnosc != null && platnosc.nip == userName; + } + + public Waluta SetAmount(Invoice platnosc) + { + var waluta = new Waluta {Currency = GetCurrency(platnosc.waluta_miano)}; + + waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100); + + return waluta; + } + + public string GetCurrency(string currency) + { + if (string.IsNullOrEmpty(currency)) + return PLN; + + switch (currency.ToUpper()) + { + case "EUR": + return EUR; + case "GBP": + return GBP; + case "USD": + return USD; + default: + return PLN; + } + } + + public string SetLanguage(string lang) + { + switch (lang) + { + case "de": + case "en": + case "pl": + if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) + { + var culture = "pl-PL"; + switch (lang) + { + case "pl": + culture = "pl-PL"; + break; + case "en": + culture = "en-US"; + break; + case "de": + culture = "de-DE"; + break; + } + + Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); + Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); + } + break; + } + return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); + } + + public string SetTitle() + { + var str = ""; + var css = ConfigurationManager.AppSettings["Css"]; + + switch (css) + { + case "truck": + str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - "; + break; + case "admoto": + str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - "; + break; + } + + return str; + } + + public void SetUserLogger(string nip, string faktura) + { + + var user = nip + "-" + faktura; + Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null); + } + + public ErrorViewData InitErrorViewData(string errortxt, int idFaktury) + { + var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury }; + return er; + } + public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId) + { + var newPayment = new PlatnosciEcard(); + newPayment.IDFaktury = platnosc.ID_faktury; + newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer; + newPayment.nip = platnosc.nip; + newPayment.nrZlecenia = ""; + newPayment.AMOUNT = waluta.Amount; + newPayment.CURRENCY = waluta.Currency; + newPayment.SESSIONID = sessionId; + newPayment.NAME = payer.FirstName; + newPayment.SURNAME = payer.LastName; + newPayment.AUTODEPOSIT = true; + newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard + newPayment.CHARSET = KODOWANIE; + newPayment.COUNTRY = KOD_POLSKA; + newPayment.JS = true; + newPayment.PAYMENTTYPE = CARDS; + newPayment.Data = DateTime.Now; + newPayment.Status = null; + newPayment.Status_data = null; + + _repPayment.Insert(newPayment); + return newPayment; + } + + public ErrorViewData IsError(Invoice platnosc, String userName) + { + var errortxt = ""; + + if (platnosc == null) + errortxt = _translateManager.Translate("tlumaczenia", "brakdanych"); + else if (!UserIdentity(platnosc, userName)) + errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja"); + + return InitErrorViewData(errortxt, 0); + } + + public string GetLanguage() + { + var language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); + + if (language != "PL" && language != "EN" && language != "DE") + return "PL"; //domyślny jezyk, w ktorym ma byc wyświetlony formularz na stronie eCard + + return language; + } + } +} Index: trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 971) @@ -2,13 +2,13 @@ using adMoto.Payments.Core.Data; -namespace Platnosci.Models +namespace adMoto.Payments.Web.Models { public class InvoiceDetailsViewData { - public Invoice vPlatnosciEcard { get; set; } + public Invoice Invoice { get; set; } public Payer Payer {get; set;} - public string brutto { get; set; } - public string termin { get; set; } - public string info { get; set; } + public string Brutto { get; set; } + public string Termin { get; set; } + public string Info { get; set; } } } Index: trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs (revision 970) +++ (revision ) @@ -1,198 +1,0 @@ -using System; -using System.Web; -using System.Threading; -using System.Globalization; -using System.Configuration; -using System.Security.Principal; -using adMoto.Payments.Core; -using adMoto.Payments.Core.Data; -using adMoto.Payments.Core.Interfaces; - - -namespace Platnosci.Models -{ - public class FunkcjePlatnosci - { - public const string EUR = "978"; - public const string GBP = "826"; - public const string USD = "789"; - public const string PLN = "985"; - public const string CARDS = "CARDS"; //obsługa tylko kart płatniczych - public const string KOD_POLSKA = "616"; //kod kraju Akceptanta - Polska - public const string KODOWANIE = "ISO-8859-2"; - private IRepository _repPayment; - private readonly ITranslateManager _translateManager; - - public FunkcjePlatnosci() - { - _repPayment = new Repository(new DataContext()); - _translateManager = new Translation(); - } - - public FunkcjePlatnosci(IRepository repPayment) - { - _repPayment = repPayment; - _translateManager = new Translation(); - } - public FunkcjePlatnosci(IRepository repPayment, ITranslateManager translate) - { - _repPayment = repPayment; - _translateManager = translate; - } - public string BruttoToString(decimal? kwota, decimal? waluta, string miano) - { - var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN "; - - if (!String.IsNullOrEmpty(miano)) - if (waluta > 0 && miano.ToUpper() != "PLN") - brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")"; - - return brutto; - } - - public bool UserIdentity(Invoice platnosc, string userName) - { - return platnosc != null && platnosc.nip == userName; - } - - public Waluta SetAmount(Invoice platnosc) - { - var waluta = new Waluta(); - waluta.Currency = GetCurrency(platnosc.waluta_miano); - - if (waluta.Currency == PLN) - waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100); - else - waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100); - - return waluta; - } - - public string GetCurrency(string currency) - { - if (string.IsNullOrEmpty(currency)) - return PLN; - - switch (currency.ToUpper()) - { - case "EUR": - return EUR; - case "GBP": - return GBP; - case "USD": - return USD; - default: - return PLN; - } - } - - public string SetLanguage(string lang) - { - switch (lang) - { - case "de": - case "en": - case "pl": - if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) - { - var culture = "pl-PL"; - switch (lang) - { - case "pl": - culture = "pl-PL"; - break; - case "en": - culture = "en-US"; - break; - case "de": - culture = "de-DE"; - break; - } - - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); - Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); - } - break; - } - return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); - } - - public string SetTitle() - { - var str = ""; - var css = ConfigurationManager.AppSettings["Css"]; - - switch (css) - { - case "truck": - str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - "; - break; - case "admoto": - str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - "; - break; - } - - return str; - } - - public void SetUserLogger(string nip, string faktura) - { - - var user = nip + "-" + faktura; - Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null); - } - - public ErrorViewData InitErrorViewData(string errortxt, int idFaktury) - { - var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury }; - return er; - } - public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId) - { - var newPayment = new PlatnosciEcard(); - newPayment.IDFaktury = platnosc.ID_faktury; - newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer; - newPayment.nip = platnosc.nip; - newPayment.nrZlecenia = ""; - newPayment.AMOUNT = waluta.Amount; - newPayment.CURRENCY = waluta.Currency; - newPayment.SESSIONID = sessionId; - newPayment.NAME = payer.FirstName; - newPayment.SURNAME = payer.LastName; - newPayment.AUTODEPOSIT = true; - newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard - newPayment.CHARSET = KODOWANIE; - newPayment.COUNTRY = KOD_POLSKA; - newPayment.JS = true; - newPayment.PAYMENTTYPE = CARDS; - newPayment.Data = DateTime.Now; - newPayment.Status = null; - newPayment.Status_data = null; - - _repPayment.Insert(newPayment); - return newPayment; - } - - public ErrorViewData IsError(Invoice platnosc, String UserName) - { - var errortxt = ""; - - if (platnosc == null) - errortxt = _translateManager.Translate("tlumaczenia", "brakdanych"); - else if (!UserIdentity(platnosc, UserName)) - errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja"); - - return InitErrorViewData(errortxt, 0); - } - - public string GetLanguage() - { - var language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); - - if (language != "PL" && language != "EN" && language != "DE") - return "PL"; //domyślny jezyk, w ktorym ma byc wyświetlony formularz na stronie eCard - - return language; - } - } -} Index: trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs (revision 970) +++ (revision ) @@ -1,127 +1,0 @@ -using System; -using System.Net; -using System.IO; -using System.Linq; -using System.Configuration; -using adMoto.Payments.Core; -using adMoto.Payments.Core.Data; -using adMoto.Payments.Core.Interfaces; - -namespace Platnosci.Models -{ - public class eCardData - { - public const string HASH_ERROR_INFO = "payment not exist"; - private readonly FunkcjePlatnosci _funkcjePlatnosci; - private IRepository _repPayment; - - public eCardData(IRepository repPayment) - { - _repPayment = repPayment; - _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment); - } - - public String GetUrl(Merchant merchant) - { - if (merchant == null) - throw new ArgumentNullException("merchant"); - - var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION; - dane += "&AMOUNT=" + merchant.Payment.AMOUNT + "&CURRENCY=" + merchant.Payment.CURRENCY; - dane += "&ORDERNUMBER=" + merchant.Payment.ORDERNUMBER; - dane += "&NAME=" + merchant.Payment.NAME + "&SURNAME=" + merchant.Payment.SURNAME; - dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2"; - dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash; - dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + merchant.Payment.AUTODEPOSIT; - dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk; - dane += "&SESSIONID=" + merchant.Payment.SESSIONID; - - return dane; - } - public Merchant CreateMerchantData(Invoice invoice, Payer payer, string lang, string sessionId) - { - var merchant = new Merchant(); - - var waluta = _funkcjePlatnosci.SetAmount(invoice); - var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId); - - merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString(); - -#if DEBUG - //TODO: find better method to set SystemKsiegowy when testing or developing - merchant.SystemKsiegowy = "2"; -#endif - - merchant.Payment = newPayment; - GetMerchantInfo(merchant); - merchant.Hash = SetHash(merchant); - - //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia - var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data); - - var linkFail = ConfigurationManager.AppSettings["Strona"]; - linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"]; - linkFail += "/" + newPayment.IDFaktury + "/?"; - - var linkOk = ConfigurationManager.AppSettings["Strona"]; - linkOk += "/" + lang + ConfigurationManager.AppSettings["LinkOk"]; - linkOk += "/" + newPayment.IDFaktury + "/" + orderek + "/?"; - - merchant.LinkOk = linkOk; - merchant.LinkFail = linkFail; - - merchant.IsValid(); - - return merchant; - } - - public void GetMerchantInfo(Merchant merchant) - { - if (merchant.SystemKsiegowy == "2") - { - merchant.Id = "171485000"; - merchant.Password = "ashSeth2"; - } - else - { - merchant.Id = "170906000"; - merchant.Password = "JaYpqfs0"; - } - } - public string SetHash(Merchant merchant) - { - if (merchant == null) - throw new ArgumentNullException("merchant"); - - var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault(); - - if (platnosc == null) - merchant.Hash = HASH_ERROR_INFO; - else - { - 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 += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password); - - var bdata = System.Text.Encoding.ASCII.GetBytes(dane); - req.Method = "POST"; - req.ContentType = "application/x-www-form-urlencoded"; - req.ContentLength = dane.Length; - - var reqStream = req.GetRequestStream(); - reqStream.Write(bdata, 0, bdata.Length); - reqStream.Close(); - - var streamResponse = new StreamReader(req.GetResponse().GetResponseStream()); - string strResponse = streamResponse.ReadToEnd(); - streamResponse.Close(); - strResponse = strResponse.Replace("\n", ""); - - merchant.Hash = strResponse; - } - return merchant.Hash; - } - } -}