Nawigacja

← Previous Change
Next Change →

eCardMVC

Data:

2009-12-11 17:16:00 (16 years ago)

Autor:

marek

Opis:

re #215 - drobny refactoring

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

: 11 zmodyfikowane

Platnosci.Tests/Web/Function.cs (zmodyfikowane) (1 diff)
Platnosci.Tests/Web/UIAccountTest.cs (zmodyfikowane) (2 diffs)
Platnosci.Tests/Web/UIPlatnosciTests.cs (zmodyfikowane) (2 diffs)
Platnosci/Controllers/AccountController.cs (zmodyfikowane) (2 diffs)
Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (2 diffs)
Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (4 diffs)
Platnosci/Models/FunkcjePlatnosci.cs (zmodyfikowane) (3 diffs)
Platnosci/Views/Account/LogOn.aspx (zmodyfikowane) (1 diff)
Platnosci/Views/Platnosc/Paid.aspx (zmodyfikowane) (1 diff)
Platnosci/Views/Platnosc/Show.aspx (zmodyfikowane) (1 diff)
Platnosci/Views/Shared/Error1.aspx (zmodyfikowane) (1 diff)

Legenda:

: Bez zmian
: Dodane
: Usunięte

trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs

r931	r950
16	16	platnosc.Brutto = brutto;
17	17	platnosc.SystemKsiegowyId = systemKsiegowy;
	18	//platnosc.waluta_miano
18	19
19	20	return platnosc;

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs

r932	r950
9	9	[Test]
10	10	[Category("UI")]
	11	public void CheckErrorLogin()
	12	{
	13	var ie = new IE("http://localhost:3646/pl/Account/LogOn");
	14	ie.TextField(Find.ByName("numerFaktury")).TypeText("");
	15	ie.TextField(Find.ByName("nip")).TypeText("");
	16	ie.Button(Find.ById("loguj")).Click();
	17	Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się"));
	18	ie.ForceClose();
	19	ie.Close();
	20	ie.Dispose();
	21	}
	22
	23	[Test]
	24	[Category("UI")]
11	25	public void CheckLoginCorrect()
12	26	{
…	…
17	31	Assert.IsTrue(ie.ContainsText("została uregulowana"));
18	32	ie.ForceClose();
19		}
20		[Test]
21		[Category("UI")]
22		public void CheckErrorLogin()
23		{
24		var ie = new IE("http://localhost:3646/pl/Account/LogOn");
25		ie.TextField(Find.ByName("numerFaktury")).TypeText("");
26		ie.TextField(Find.ByName("nip")).TypeText("");
27		ie.Button(Find.ById("loguj")).Click();
28		Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się"));
29		ie.ForceClose();
	33	ie.Close();
	34	ie.Dispose();
30	35	}
31	36	}

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs

r932	r950
7	7	public class UIPlatnosciTests
8	8	{
	9	[Test]
	10	[Category("UI")]
	11	public void CheckCorrectPay()
	12	{
	13	const string test = "test";
	14	var ie = new IE("http://localhost:3646/pl/Account/LogOn");
	15	ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
	16	ie.TextField(Find.ByName("nip")).TypeText("854956281");
	17	ie.Button(Find.ById("loguj")).Click();
	18
	19	ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
	20	ie.TextField(Find.ByName("Payer.LastName")).TypeText(test);
	21	ie.Button(Find.ById("place")).Click();
	22	Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test));
	23	ie.ForceClose();
	24	ie.Close();
	25	ie.Dispose();
	26	}
	27
9	28	[Test]
10	29	[Category("UI")]
…	…
22	41	Assert.IsTrue(ie.ContainsText("Proszę podać"));
23	42	ie.ForceClose();
24		}
25		[Test]
26		[Category("UI")]
27		public void CheckCorrectPay()
28		{
29		const string test = "test";
30		var ie = new IE("http://localhost:3646/pl/Account/LogOn");
31		ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
32		ie.TextField(Find.ByName("nip")).TypeText("854956281");
33		ie.Button(Find.ById("loguj")).Click();
34
35		ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
36		ie.TextField(Find.ByName("Payer.LastName")).TypeText(test);
37		ie.Button(Find.ById("place")).Click();
38		Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test));
39		ie.ForceClose();
	43	ie.Close();
	44	ie.Dispose();
40	45	}
41	46	}

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

r949	r950
40	40	return RedirectToAction("LogOn", "Account", new { language = "pl" });
41	41
42		_funkcjePlatnosci.setLanguage(language);
	42	_funkcjePlatnosci.SetLanguage(language);
43	43	return View();
44	44	}
…	…
49	49	public ActionResult LogOn(string nip, string numerFaktury, string returnUrl, string language)
50	50	{
51		_funkcjePlatnosci.setLanguage(language);
	51	_funkcjePlatnosci.SetLanguage(language);
52	52	var platnosc = new vPlatnosciEcard();
53	53	if (!ValidateLogOn(nip, numerFaktury))

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

r949	r950
37	37	{
38	38	System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language);
39		language = _funkcjePlatnosci.setLanguage(language);
	39	language = _funkcjePlatnosci.SetLanguage(language);
40	40
41	41	var id1 = Convert.ToInt32(payer.Id_faktury);
…	…
48	48	return View("Error1", IsError("weryfikacja", 0));
49	49
50		var waluta = _funkcjePlatnosci.setAmount(platnosc);
	50	var waluta = _funkcjePlatnosci.SetAmount(platnosc);
51	51	var newPayment = InitNewPayment(id1, platnosc, waluta, payer );
52	52

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

r949	r950
37	37	public ActionResult Show(string id, string language)
38	38	{
39		language = _funkcjePlatnosci.setLanguage(language);
	39	language = _funkcjePlatnosci.SetLanguage(language);
40	40	var id1 = ConvertId(id);
41	41
…	…
63	63	public ActionResult Show(Payer payer, string language)
64	64	{
65		language = _funkcjePlatnosci.setLanguage(language);
	65	language = _funkcjePlatnosci.SetLanguage(language);
66	66
67	67	var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
…	…
91	91	var order = ConvertId(o);
92	92
93		language = _funkcjePlatnosci.setLanguage(language);
	93	language = _funkcjePlatnosci.SetLanguage(language);
94	94
95	95	var id1 = ConvertId(id);
…	…
114	114	public ActionResult Fail(string id, string language)
115	115	{
116		language = _funkcjePlatnosci.setLanguage(language);
	116	language = _funkcjePlatnosci.SetLanguage(language);
117	117	var id1 = ConvertId(id);
118	118	var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();

trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs

r948	r950
1	1	using System;
2		~~using System.Collections.Generic;~~
3		~~using System.Linq;~~
4	2	using System.Web;
5	3	using Platnosci.Core.Linq;
6	4	using System.Threading;
7	5	using System.Globalization;
8		~~using System.Web.Mvc;~~
9	6	using System.Configuration;
10	7	using System.Security.Principal;
…	…
22	19	public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
23	20	{
24		string brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
	21	var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
	22
25	23	if (waluta > 0 && (miano != "" \|\| miano != "PLN"))
26	24	{
…	…
29	27	return brutto;
30	28	}
	29
31	30	public bool UserIdentity(vPlatnosciEcard platnosc, string userName)
32	31	{
33		if (platnosc != null && platnosc.nip == userName)
	32	return platnosc != null && platnosc.nip == userName;
	33	}
	34
	35	public Waluta SetAmount(vPlatnosciEcard platnosc)
	36	{
	37	var waluta = new Waluta {Amount = Convert.ToInt32(platnosc.Brutto*100)};
	38
	39	if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN")
34	40	{
35		~~return true;~~
36		}
37		~~return false;~~
38		}
39		~~public Waluta setAmount(vPlatnosciEcard platnosc){~~
40
41		~~Waluta waluta = new Waluta()~~;
42		~~waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100)~~;
43
44		~~if (String.IsNullOrEmpty(platnosc.waluta_miano) \|\| platnosc.waluta_miano == "PLN")~~
45		{
46		~~waluta.Currency = PLN;~~
	41	switch (platnosc.waluta_miano)
	42	{
	43	case "EUR":
	44	waluta.Currency = EUR;
	45	break;
	46	case "GBP":
	47	waluta.Currency = GBP;
	48	break;
	49	case "USD":
	50	waluta.Currency = USD;
	51	break;
	52	}
47	53	}
48	54	else
49	55	{
50		if (platnosc.waluta_miano == "EUR")
51		{
52		waluta.Currency = EUR;
53		}
54		else if (platnosc.waluta_miano == "GBP")
55		{
56		waluta.Currency = GBP;
57		}
58		else if (platnosc.waluta_miano == "USD")
59		{
60		waluta.Currency = USD;
61		}
	56	waluta.Currency = PLN;
62	57	}
63	58	return waluta;
64	59	}
65		~~public string setLanguage(string lang){~~
66	60
67		if (lang == "pl" \|\| lang == "en" \|\| lang == "de" )//\|\| lang == "it" \|\| lang == "fr")
	61	public string SetLanguage(string lang)
	62	{
	63	switch (lang)
68	64	{
69		if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower())
70		{
71		string culture = "pl-PL";
72		if (lang == "pl") culture = "pl-PL";
73		else if (lang == "en") culture = "en-US";
74		else if (lang == "de") culture = "de-DE";
75		// else if (lang == "it") culture = "it-IT";
76		// else if (lang == "fr") culture = "fr-FR";
	65	case "de":
	66	case "en":
	67	case "pl":
	68	if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower())
	69	{
	70	var culture = "pl-PL";
	71	switch (lang)
	72	{
	73	case "pl":
	74	culture = "pl-PL";
	75	break;
	76	case "en":
	77	culture = "en-US";
	78	break;
	79	case "de":
	80	culture = "de-DE";
	81	break;
	82	}
	83	// else if (lang == "it") culture = "it-IT";
	84	// else if (lang == "fr") culture = "fr-FR";
77	85
78		Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);
79		Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
80		}
	86	Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);
	87	Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
	88	}
	89	break;
81	90	}
82		string pom = CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
83		return ~~pom~~;
	91
	92	return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
84	93	}
85		public string setTitle()
	94
	95	public string SetTitle()
86	96	{
87		string str = "";
88		string css = ConfigurationManager.AppSettings["Css"].ToString();
89
90		if (css == "truck") str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck").ToString() + " - ";
91		else if (css == "admoto") str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto").ToString() + " - ";
92
	97	var str = "";
	98	var css = ConfigurationManager.AppSettings["Css"];
	99
	100	if (css == "truck")
	101	str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - ";
	102	else if (css == "admoto")
	103	str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - ";
	104
93	105	return str;
94	106	}
95		public void SetUserLogger(string nip, string faktura){
96
97		string User = nip + "-" + faktura;
98		Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(User, ""), null);
	107
	108	public void SetUserLogger(string nip, string faktura)
	109	{
	110
	111	var user = nip + "-" + faktura;
	112	Thread.CurrentPrincipal = new GenericPrincipal(new GenericIdentity(user, ""), null);
99	113	}
	114
100	115	public ErrorViewData InitErrorViewData(string errortxt, int idFaktury)
101	116	{
102		ErrorViewData er = new ErrorViewData();
103		er.Error = errortxt;
104		er.InvoiceId = idFaktury;
	117	var er = new ErrorViewData { Error = errortxt, InvoiceId = idFaktury };
105	118	return er;
106	119	}
107
	120
108	121	}
109	122	}
110
111

trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx

r940	r950
5	5	<%
6	6	FunkcjePlatnosci func = new FunkcjePlatnosci();
7		string str = func.setTitle();
	7	string str = func.SetTitle();
8	8	%>
9	9	<%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "PageLogin").ToString()%>

trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx

r948	r950
5	5	<%
6	6	FunkcjePlatnosci func = new FunkcjePlatnosci();
7		string str = func.setTitle();
	7	string str = func.SetTitle();
8	8	%>
9	9	<%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%>

trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx

r948	r950
5	5	<%
6	6	FunkcjePlatnosci func = new FunkcjePlatnosci();
7		string str = func.setTitle();
	7	string str = func.SetTitle();
8	8	%>
9	9	<%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly").ToString()%>

trunk/eCard/eCardMVC/Platnosci/Views/Shared/Error1.aspx

r948	r950
4	4	<%
5	5	FunkcjePlatnosci func = new FunkcjePlatnosci();
6		string str = func.setTitle();
	6	string str = func.SetTitle();
7	7	%>
8	8	</asp:Content>

Nawigacja

Zbiór zmian 950 dla trunk/eCard/eCardMVC

Legenda:

Pobierz w innym formacie: