Nawigacja

Zbiór zmian 954 dla trunk

Data:

2009-12-15 15:40:16 (16 years ago)

Autor:

alina

Opis:

re #215 przerobki

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

r949	r954
1	1	using System;
2	2	using System.Collections.Generic;
	3	using System.Configuration;
3	4	using System.Linq;
4	5	using Platnosci.Core.Interface;
…	…
13	14	public DataContext()
14	15	{
15		_dataContext = new PlatnosciDataContext();
	16	var connectionString = ConfigurationManager.ConnectionStrings["BazaReklamConnectionString"];
	17	if (connectionString == null)
	18	throw new ArgumentNullException("BazaReklamConnectionString");
	19	_dataContext = new PlatnosciDataContext(connectionString.ConnectionString);
16	20	}
17	21

r952	r954
84	84	<Compile Include="Properties\AssemblyInfo.cs" />
85	85	<Compile Include="TestRunner.cs" />
	86	<Compile Include="Web\FunkcjePlatnosciTests.cs" />
86	87	<Compile Include="Web\MerchantControllerTests.cs" />
87	88	<Compile Include="Web\FakeDataContext.cs" />

r952	r954
37	37	var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
38	38	var payer = _function.CreatePayer(idFaktury, "test", "test");
39		var waluta = new Waluta {Amount = 200,Currency = "PLN"};
	39	var waluta = new Waluta {Amount = 200, Currency = "PLN"};
40	40	var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta ,payer, "sessionId");
41	41

r933	r954
9	9	<add key="eCard.Url" value="https://pay.ecard.pl/servlet/PSTEST"/>
10	10	</appSettings>
	11	<connectionStrings>
	12	<add name="BazaReklamConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
	13	</connectionStrings>
11	14
12	15	<NUnit>

r948	r954
269	269	<value>Die Rechnung mit der Nummer {0} wurde am {1} bezahlt.</value>
270	270	</data>
	271	<data name="ToLongValue" xml:space="preserve">
	272	<value>Erlaubte Anzahl der Zeichen ist {0}.</value>
	273	</data>
271	274	</root>

r953	r954
432	432
433	433	/// <summary>
434		/// Looks up a localized string similar to Too many characters. ~~The maximum number of characters allowed in a field~~ is {0}..
	434	/// Looks up a localized string similar to Too many characters. Maximum number of characters is {0}..
435	435	/// </summary>
436	436	internal static string ToLongValue {

r953	r954
270	270	</data>
271	271	<data name="ToLongValue" xml:space="preserve">
272		<value>Too many characters. ~~The maximum number of characters allowed in a field~~ is {0}.</value>
	272	<value>Too many characters. Maximum number of characters is {0}.</value>
273	273	</data>
274	274	</root>

r952	r954
65	65
66	66	var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
67
68		if (!String.IsNullOrEmpty(~~IsError(platnosc).Error)) return View("Error1", IsError(platnosc)~~);
	67	var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
	68	if (!String.IsNullOrEmpty(errorViewData.Error)) return View("Error1", errorViewData);
69	69
70	70	if (String.IsNullOrEmpty(payer.FirstName))

r952	r954
13	13	public class FunkcjePlatnosci
14	14	{
15		p~~rivate~~ const string EUR = "978";
16		p~~rivate~~ const string GBP = "826";
17		p~~rivate~~ const string USD = "789";
18		p~~rivate~~ const string PLN = "985";
	15	public const string EUR = "978";
	16	public const string GBP = "826";
	17	public const string USD = "789";
	18	public const string PLN = "985";
19	19	public const string CARDS = "CARDS"; //obsługa tylko kart płatniczych
20	20	public const string KOD_POLSKA = "616"; //kod kraju Akceptanta - Polska
…	…
58	58	{
59	59	var waluta = new Waluta();
60
61		if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN")
	60
	61	waluta.Currency = GetCurrency(platnosc.waluta_miano);
	62	if (waluta.Currency == PLN)
62	63	{
63		waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
64		switch (platnosc.waluta_miano)
65		{
66		case "EUR":
67		waluta.Currency = EUR;
68		break;
69		case "GBP":
70		waluta.Currency = GBP;
71		break;
72		case "USD":
73		waluta.Currency = USD;
74		break;
75		}
	64	waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
76	65	}
77	66	else
78	67	{
79		waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
80		waluta.Currency = PLN;
	68	waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
81	69	}
	70
82	71	return waluta;
	72	}
	73
	74	public string GetCurrency(string currency)
	75	{
	76	if (string.IsNullOrEmpty(currency))
	77	return PLN;
	78
	79	switch (currency.ToUpper())
	80	{
	81	case "EUR":
	82	return EUR;
	83	case "GBP":
	84	return GBP;
	85	case "USD":
	86	return USD;
	87	default:
	88	return PLN;
	89	}
83	90	}
84	91

r952	r954
61	61	-->
62	62	<connectionStrings>
63		<add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=\|DataDirectory\|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
64		<add name="Platnosci.Core.Properties.Settings.BAZA_REKLAM_TESTConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
	63	<add name="BazaReklamConnectionString" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True;User ID=wwwadmin;Password=adm1648" providerName="System.Data.SqlClient"/>
65	64	</connectionStrings>
66	65	<system.web>