Nawigacja

← Previous Change
Next Change →

Zbiór zmian 868 dla trunk/eCard/eCardMVC/Platnosci

Data:

2009-11-02 09:05:41 (16 years ago)

Autor:

alina

Opis:

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

: 3 zmodyfikowane

App_GlobalResources/tlumaczenia.pl.resx (zmodyfikowane) (1 diff)
Controllers/MerchantController.cs (zmodyfikowane) (5 diffs)
Controllers/PlatnoscController.cs (zmodyfikowane) (5 diffs)

Legenda:

: Bez zmian
: Dodane
: Usunięte

trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.pl.resx

r866	r868
253	253	</data>
254	254	<data name="err_imieWK" xml:space="preserve">
255		<value>Proszę podać imię właściciela karty kredytowej.en</value>
	255	<value>Proszę podać imię właściciela karty kredytowej.</value>
256	256	</data>
257	257	<data name="err_nazwiskoWK" xml:space="preserve">
258		<value>Proszę podać nazwisko właściciela karty kredytowej.en</value>
	258	<value>Proszę podać nazwisko właściciela karty kredytowej.</value>
259	259	</data>
260	260	<data name="InfoError" xml:space="preserve">

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

r866	r868
28	28	public const string CARDS = "CARDS"; //obs³uga tylko kart p³atniczych
29	29	public const string KOD_POLSKA = "616"; //kod kraju Akceptanta - Polska
30		public const string KODOWANIE = "ISO-8859-2";
	30	public const string KODOWANIE = "ISO-8859-2";
31	31
	32	private string merchantId;
32	33	private readonly PlatnosciDataContext _context;
33	34	private readonly IRepositoryPE _rep;
…	…
44	45	language = _func.setLanguage(language);
45	46
46		~~PlatnosciEcard new_platnosc = new PlatnosciEcard();~~
47
48	47	int id1 = Convert.ToInt32(payer.Id_faktury);
49	48	vPlatnosciEcard platnosc = _context.FindInvoiceById(id1).SingleOrDefault();
…	…
55	54	return View("Error1", errorViewData);
56	55	}
57
58		new_platnosc.IDFaktury = id1;
59		new_platnosc.ORDERDESCRIPTION = platnosc.Faktura_Numer;
60		new_platnosc.nip = platnosc.nip;
61		new_platnosc.nrZlecenia = "";
62
	56
63	57	Waluta waluta = _func.setAmount(platnosc);
64		new_platnosc.AMOUNT = waluta.Amount;
65		new_platnosc.CURRENCY = waluta.Currency;
66
67		new_platnosc.SESSIONID = Session.SessionID;
68		new_platnosc.NAME = payer.FirstName;
69		new_platnosc.SURNAME = payer.LastName;
70		new_platnosc.AUTODEPOSIT = true;
71		new_platnosc.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); //"PL";
72
73		new_platnosc.CHARSET = KODOWANIE;
74		new_platnosc.COUNTRY = KOD_POLSKA;
75		new_platnosc.JS = true;
76		new_platnosc.PAYMENTTYPE = CARDS;
77		new_platnosc.Data = DateTime.Now;
78		new_platnosc.Status = null;
79		new_platnosc.Status_data = null;
	58	var newPayment = InitNewPayment(id1, platnosc, waluta, payer );
80	59
81	60	string systemKs = platnosc.SystemKsiegowyId.ToString();
82	61
83		bool createPayment = ~~CreateNewPayment(new_platnosc~~);
	62	bool createPayment = AddNewPayment(newPayment);
84	63	if (createPayment == false) return View("Error");
85	64
86		string hash = GetHash(new~~_platnosc~~, systemKs);
	65	string hash = GetHash(newPayment, systemKs);
87	66
88	67	hash = hash.Replace("\n","");
…	…
91	70	return View("Error"); //nie mo¿na po³¹czyæ siê z serverem p³atnoci. Proszê spróbowaæ jeszcze raz.
92	71	}
	72	if (platnosc.SystemKsiegowyId == 1)
	73	merchantId = "170906000";
	74	else
	75	merchantId = "171485000";
93	76
94		var merchantViewData = new MerchantViewData();
95		merchantViewData.nowaPlatnosc = new_platnosc;
96		/*if (platnosc.SystemKsiegowyId == 1)
97		merchantViewData.merchantId = "170906000";
98		else
99		merchantViewData.merchantId = "171485000";
	77	string link = ConfigurationManager.AppSettings["StatusLink"];
	78	string LinkFail = link + "?status=fail";
	79	string LinkOk = link + "?status=ok";
100	80
101		merchantViewData.Hash = hash;
102		string link = ConfigurationManager.AppSettings["StatusLink"];
103		merchantViewData.LinkFail = link + "?status=fail";
104		merchantViewData.LinkOk = link + "?status=ok"*/
105
106		//wartosci testowe
107		merchantViewData.nowaPlatnosc.ORDERNUMBER = 4;
108		merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "22";
109		merchantViewData.nowaPlatnosc.AMOUNT = 300;
110		merchantViewData.nowaPlatnosc.CURRENCY = "985";
111		merchantViewData.nowaPlatnosc.SESSIONID = "";
112		merchantViewData.merchantId = "171485000";
113		merchantViewData.Hash = hash;
114		merchantViewData.LinkFail = "";
115		merchantViewData.LinkOk = "";
116
	81	var merchantViewData = InitMerchantViewData(newPayment, hash, merchantId, LinkFail, LinkOk);
117	82	return View(merchantViewData);
118	83	}
119		private bool CreateNewPayment(PlatnosciEcard platnosc)
	84	private PlatnosciEcard InitNewPayment(int id, vPlatnosciEcard platnosc, Waluta waluta, Payer payer)
	85	{
	86	PlatnosciEcard newPayment = new PlatnosciEcard();
	87	newPayment.IDFaktury = id;
	88	newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
	89	newPayment.nip = platnosc.nip;
	90	newPayment.nrZlecenia = "";
	91	newPayment.AMOUNT = waluta.Amount;
	92	newPayment.CURRENCY = waluta.Currency;
	93	newPayment.SESSIONID = Session.SessionID;
	94	newPayment.NAME = payer.FirstName;
	95	newPayment.SURNAME = payer.LastName;
	96	newPayment.AUTODEPOSIT = true;
	97	newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); //"PL";
	98	newPayment.CHARSET = KODOWANIE;
	99	newPayment.COUNTRY = KOD_POLSKA;
	100	newPayment.JS = true;
	101	newPayment.PAYMENTTYPE = CARDS;
	102	newPayment.Data = DateTime.Now;
	103	newPayment.Status = null;
	104	newPayment.Status_data = null;
	105	return newPayment;
	106	}
	107	private bool AddNewPayment(PlatnosciEcard platnosc)
120	108	{
121	109	if (platnosc != null)
…	…
126	114	return false;
127	115	}
	116	private MerchantViewData InitMerchantViewData(PlatnosciEcard newPayment, string hash, string Id, string LinkFail, string LinkOk)
	117	{
	118	MerchantViewData merchantViewData = new MerchantViewData();
	119	merchantViewData.nowaPlatnosc = newPayment;
	120	merchantViewData.Hash = hash;
	121	merchantViewData.merchantId = Id;
	122	merchantViewData.LinkFail = LinkFail;
	123	merchantViewData.LinkOk = LinkOk;
	124
	125	//wartosci testowe
	126	merchantViewData.nowaPlatnosc.ORDERNUMBER = 4;
	127	merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "22";
	128	merchantViewData.nowaPlatnosc.AMOUNT = 300;
	129	merchantViewData.nowaPlatnosc.CURRENCY = "985";
	130	merchantViewData.nowaPlatnosc.SESSIONID = "";
	131	merchantViewData.merchantId = "171485000";
	132	merchantViewData.LinkFail = "";
	133	merchantViewData.LinkOk = "";
	134	return merchantViewData;
	135	}
128	136	private string GetHash(PlatnosciEcard p, string ks)
129	137	{
130		~~//PlatnosciEcard platnosc = _rep.FindOne(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data);~~
131		~~// PlatnosciEcard platnosc = _rep.FindOne(i => i.ORDERNUMBER == 28726);~~
132
133	138	string strResponse;
134		/~~/string adres = "https://pay.ecard.pl/servlet/HS?orderNumber="+p.ORDERNUMBER~~;
135		string adres = "https://pay.ecard.pl/servlet/HS?orderNumber=4";
	139	/*PlatnosciEcard platnosc = _rep.FindOne(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data);
	140	string adres = "https://pay.ecard.pl/servlet/HS?orderNumber="+p.ORDERNUMBER;
136	141	HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres);
137
138		/*
139	142	string dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
140	143	dane += "&currency=" + platnosc.CURRENCY;
141	144	if (ks == "1") dane += "&merchantId=171485000&password=ashSeth2";
142		else dane += "&merchantId=170906000&password="; */
143
	145	else dane += "&merchantId=170906000&password=JaYpqfs0"; */
	146
144	147	//dane testowe
	148	string adres = "https://pay.ecard.pl/servlet/HS?orderNumber=4";
	149	HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres);
145	150	string dane = "&orderDescription=&amount=300&currency=985&merchantId=171485000&password=ashSeth2";
	151
146	152	byte[] bdata = System.Text.ASCIIEncoding.ASCII.GetBytes(dane);
147
148	153	req.Method = "POST";
149	154	req.ContentType = "application/x-www-form-urlencoded";

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

r866	r868
54	54	return View("Error1", errorViewData);
55	55	}
56		//gdy platnosc za fakture zostala uregulowana ->nie przekierowujemy do systemu eCard,
57		//tylko wyswietlamy stosowny komunikat
	56
58	57	var tablica_potwierdzenia = _context.FindItemsByIdFaktury(id1);
59		if (tablica_potwierdzenia.Count > 0)
	58	if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
60	59	{
61	60	string data_zaplaty = String.Format("{0:dd-MM-yyyy}",tablica_potwierdzenia[0].AUTHTIME);
…	…
65	64
66	65	string kwota = "";
67		kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
68
69		Payer payer = new Payer();
70		payer.FirstName = "";
71		payer.LastName = "";
72		payer.Id_faktury = platnosc.ID_faktury;
73
74		var invoiceDeatailsViewData = new InvoiceDetailsViewData();
75		invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
76		invoiceDeatailsViewData.Payer = payer;
77		invoiceDeatailsViewData.brutto = kwota;
	66	kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
	67	var payer = InitPayer("", "", platnosc.ID_faktury);
	68	var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);
78	69	return View(invoiceDeatailsViewData);
79		}
	70	}
80	71	[Authorize]
81	72	[AcceptVerbs(HttpVerbs.Post)]
…	…
117	108	if (ModelState.IsValid == false)
118	109	{
119		~~var viewData = new InvoiceDetailsViewData();~~
120	110	string kwota = "";
121	111	kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
122		viewData.brutto = kwota;
123		viewData.Payer = payer;
124		viewData.vPlatnosciEcard = platnosc;
	112	var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota );
125	113	return View("Show",viewData);
126	114	}
…	…
154	142	return View("Error1", errorViewData);
155	143	}
156		var invoiceDeatailsViewData = new InvoiceDetailsViewData();
157		invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
158		invoiceDeatailsViewData.Payer = null;
159		invoiceDeatailsViewData.Status = status;
	144	var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, status, "" );
160	145	return View(invoiceDeatailsViewData);
161	146	}
…	…
203	188	return View();
204	189	}
	190	private Payer InitPayer(string FirstName, string LastName, int Id_faktury)
	191	{
	192	Payer payer = new Payer();
	193	payer.FirstName = "";
	194	payer.LastName = "";
	195	payer.Id_faktury = Id_faktury;
	196	return payer;
	197	}
	198	private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
	199	{
	200	var invoiceDeatailsViewData = new InvoiceDetailsViewData();
	201	invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
	202	invoiceDeatailsViewData.Payer = payer;
	203	invoiceDeatailsViewData.Status = status;
	204	invoiceDeatailsViewData.brutto = brutto;
	205	return invoiceDeatailsViewData;
	206	}
205	207
206	208	}

Pobierz w innym formacie: