Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/adMoto.Payments.Test.csproj
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/adMoto.Payments.Test.csproj (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/adMoto.Payments.Test.csproj (revision 984)
@@ -84,4 +84,6 @@
+
+
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs (revision 983)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs (revision 984)
@@ -21,15 +21,15 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
- repPayment.Insert(platnosc);
-
- var ecarddata = new MerchantHelper(repPayment);
-
- var merchant = new Merchant
- {
- Payment = platnosc,
- Id = "171485000",
- Password = "ashSeth2",
- };
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+ repPayment.Insert(payment);
+
+ var ecarddata = new MerchantHelper(repPayment);
+
+ var merchant = new Merchant
+ {
+ Payment = payment,
+ Id = "171485000",
+ Password = "ashSeth2",
+ };
//Act
@@ -46,7 +46,7 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-
- repPayment.Insert(platnosc);
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+
+ repPayment.Insert(payment);
var ecarddata = new MerchantHelper(repPayment);
@@ -55,9 +55,9 @@
{
Payment = new PlatnosciEcard
- {
- ORDERDESCRIPTION = "dd",
- IDFaktury = 21,
- Data = DateTime.Now
- },
+ {
+ ORDERDESCRIPTION = "dd",
+ IDFaktury = 21,
+ Data = DateTime.Now
+ },
Id = "171485000",
Password = "ashSeth2",
@@ -76,15 +76,15 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
- platnosc.AMOUNT = 229;
- platnosc.CURRENCY = PaymentsUtils.PLN;
-
- repPayment.Insert(platnosc);
-
- var ecarddata = new MerchantHelper(repPayment);
-
- var merchant = new Merchant
- {
- Payment = platnosc,
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+ payment.AMOUNT = 229;
+ payment.CURRENCY = PaymentsUtils.PLN;
+
+ repPayment.Insert(payment);
+
+ var ecarddata = new MerchantHelper(repPayment);
+
+ var merchant = new Merchant
+ {
+ Payment = payment,
Id = "171485000",
Password = "ashSeth2",
@@ -104,15 +104,15 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
- platnosc.AMOUNT = 0;
- platnosc.CURRENCY = PaymentsUtils.PLN;
-
- repPayment.Insert(platnosc);
-
- var ecarddata = new MerchantHelper(repPayment);
-
- var merchant = new Merchant
- {
- Payment = platnosc,
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+ payment.AMOUNT = 0;
+ payment.CURRENCY = PaymentsUtils.PLN;
+
+ repPayment.Insert(payment);
+
+ var ecarddata = new MerchantHelper(repPayment);
+
+ var merchant = new Merchant
+ {
+ Payment = payment,
Id = "171485000",
Password = "ashSeth2",
@@ -132,15 +132,15 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
- platnosc.AMOUNT = 229;
- platnosc.CURRENCY = PaymentsUtils.PLN;
-
- repPayment.Insert(platnosc);
-
- var ecarddata = new MerchantHelper(repPayment);
-
- var merchant = new Merchant
- {
- Payment = platnosc,
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+ payment.AMOUNT = 229;
+ payment.CURRENCY = PaymentsUtils.PLN;
+
+ repPayment.Insert(payment);
+
+ var ecarddata = new MerchantHelper(repPayment);
+
+ var merchant = new Merchant
+ {
+ Payment = payment,
Id = "TEST",
Password = "test",
@@ -160,15 +160,15 @@
//Arrange
var repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
- platnosc.AMOUNT = 11;
- platnosc.CURRENCY = PaymentsUtils.PLN;
-
- repPayment.Insert(platnosc);
-
- var ecarddata = new MerchantHelper(repPayment);
-
- var merchant = new Merchant
- {
- Payment = platnosc,
+ var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+ payment.AMOUNT = 11;
+ payment.CURRENCY = PaymentsUtils.PLN;
+
+ repPayment.Insert(payment);
+
+ var ecarddata = new MerchantHelper(repPayment);
+
+ var merchant = new Merchant
+ {
+ Payment = payment,
Id = "171485000",
Password = "ashSeth2",
@@ -301,13 +301,13 @@
{
//Arrange
- var pl = new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" };
- var m = new Merchant { Payment = pl, Id = "ABCD" };
+ var payment = new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" };
+ var merchant = new Merchant { Payment = payment, Id = "ABCD" };
var eCardData = new MerchantHelper(new Repository(new FakeDataContext()));
//Act
- var result = eCardData.GetUrl(m);
-
- //Assert
- System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + m);
+ var result = eCardData.GetUrl(merchant);
+
+ //Assert
+ System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + merchant);
Assert.That(result, Is.Not.EqualTo(""));
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/TestDataHelperTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/TestDataHelperTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/TestDataHelperTests.cs (revision 984)
@@ -7,5 +7,5 @@
{
[TestFixture]
- public class TestDataHelperTests
+ public class TestDataHelperTests
{
private readonly TestDataHelper _testDataHelper = new TestDataHelper();
@@ -15,12 +15,11 @@
public void TestInsertMethodForPayment()
{
- var fake = new FakeDataContext();
- var vPlatnosciEcardRepository = new Repository(fake);
+ var repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip", "", 0, 0);
- vPlatnosciEcardRepository.Insert(platnosc);
+ var invoice1 = _testDataHelper.CreateInvoice(123, "nip", "", 0, 0);
+ repVPayment.Insert(invoice1);
- var pl = vPlatnosciEcardRepository.FindOne(123);
- Assert.That(pl.nip, Is.EqualTo("nip"));
+ var invoice2 = repVPayment.FindOne(123);
+ Assert.That(invoice2.nip, Is.EqualTo("nip"));
}
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/PaymentUtilsTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/PaymentUtilsTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/PaymentUtilsTests.cs (revision 984)
@@ -23,8 +23,8 @@
{
//Arrange
- var funkcjePlantosi = new PaymentsUtils();
+ var paymentsUtils = new PaymentsUtils();
//Act
- var result = funkcjePlantosi.GetCurrency(input);
+ var result = paymentsUtils.GetCurrency(input);
//Assert
@@ -60,8 +60,8 @@
{
//Arrange
- var funkcjePlantosi = new PaymentsUtils();
+ var paymentUtils = new PaymentsUtils();
//Act
- var result = funkcjePlantosi.BruttoToString(100, 1, input);
+ var result = paymentUtils.BruttoToString(100, 1, input);
//Act
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs (revision 984)
@@ -13,15 +13,15 @@
{
//Arrange
- var p = new PlatnosciEcard
- {
- AMOUNT = 100,
- AUTODEPOSIT = true,
- ORDERDESCRIPTION = "abc/2009"
- };
- var m = new Merchant { Payment = p };
+ var payment = new PlatnosciEcard
+ {
+ AMOUNT = 100,
+ AUTODEPOSIT = true,
+ ORDERDESCRIPTION = "abc/2009"
+ };
+ var merchant = new Merchant { Payment = payment };
//Act
- m.IsValid();
- var result = m.Error;
+ merchant.IsValid();
+ var result = merchant.Error;
//Assert
@@ -34,18 +34,18 @@
{
//Arrange
- var p = new PlatnosciEcard
- {
- AMOUNT = 100,
- AUTODEPOSIT = true,
- ORDERDESCRIPTION = "abc/2009",
- CURRENCY = "test",
- NAME = "test",
- SURNAME = "test"
- };
- var m = new Merchant { Payment = p };
+ var payment = new PlatnosciEcard
+ {
+ AMOUNT = 100,
+ AUTODEPOSIT = true,
+ ORDERDESCRIPTION = "abc/2009",
+ CURRENCY = "test",
+ NAME = "test",
+ SURNAME = "test"
+ };
+ var merchant = new Merchant { Payment = payment };
//Act
- m.IsValid();
- var result = m.Error;
+ merchant.IsValid();
+ var result = merchant.Error;
//Assert
@@ -58,5 +58,5 @@
{
//Arrange
- var p = new PlatnosciEcard
+ var payment = new PlatnosciEcard
{
AMOUNT = 100,
@@ -69,7 +69,7 @@
ORDERNUMBER = 100
};
- var m = new Merchant
+ var merchant = new Merchant
{
- Payment = p,
+ Payment = payment,
Id = "aaaa",
Password = "aa",
@@ -80,6 +80,6 @@
//Act
- m.IsValid();
- var result = m.Error;
+ merchant.IsValid();
+ var result = merchant.Error;
//Assert
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs (revision 984)
@@ -22,76 +22,4 @@
private readonly TestDataHelper _testDataHelper = new TestDataHelper();
- //[Test]
- //[Category("Unit")]
- //public void Status_Action_Saves_Correct_Transaction()
- //{
- // //Arrange
- // var repository = new Repository(new FakeDataContext());
- // var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
- // repository.Insert(platnosci);
- // repository.SubmitChanges();
-
- // IRepository rep = new Repository(new FakeDataContext());
-
- // var builder = new TestControllerBuilder();
- // var controller = new PlatnoscController(null, repository, rep, _translateManager);
- // builder.InitializeController(controller);
- // builder.QueryString.Add("MERCHANTNUMBER", MERCHANT_NUMBER);
- // builder.QueryString.Add("AUTHTIME", DateTime.Now.ToString());
- // builder.QueryString.Add("DATATRANSMISJI", DateTime.Now.ToString());
- // builder.QueryString.Add("ORDERNUMBER", _orderNumber.ToString());
- // builder.QueryString.Add("CURRENTSTATE", CODE_OK);
-
- // //Act
- // controller.Status();
- // System.Diagnostics.Debug.WriteLine("rep:" + rep.Count() + " repPl: " + repository.Count() );
- // var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault();
-
- // //Assert
- // Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER));
-
- // //Act
- // var paymentAfterUpdate = repository.FindOne(_orderNumber);
- // System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status);
-
- // //Assert
- // Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));
- //}
-
- //[Test]
- //[Category("Unit")]
- //public void Status_Action_Payment_Is_Not_Update_When_Currentstate_Is_CODE_BAD()
- //{
- // //Arrange
- // var repPayment = new Repository(new FakeDataContext());
- // var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
- // repPayment.Insert(platnosci);
- // repPayment.SubmitChanges();
- // IRepository repConfirm = new Repository(new FakeDataContext());
-
- // var builder = new TestControllerBuilder();
- // var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager);
- // builder.InitializeController(controller);
- // builder.QueryString.Add("MERCHANTNUMBER", MERCHANT_NUMBER);
- // builder.QueryString.Add("AUTHTIME", DateTime.Now.ToString());
- // builder.QueryString.Add("DATATRANSMISJI", DateTime.Now.ToString());
- // builder.QueryString.Add("ORDERNUMBER", _orderNumber.ToString());
- // builder.QueryString.Add("CURRENTSTATE", CODE_BAD);
-
- // //Act
- // controller.Status();
- // var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault();
-
- // //Assert
- // Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER));
-
- // //Act
- // var paymentAfterUpdate = repPayment.FindOne(_orderNumber);
- // System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status);
-
- // //Assert
- // Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false));
- //}
-
[Test]
[Category("Unit")]
@@ -100,6 +28,6 @@
//Arrange
IRepository repPayment = new Repository(new FakeDataContext());
- PlatnosciEcard platnosc = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
- repPayment.Insert(platnosc);
+ PlatnosciEcard payment = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
+ repPayment.Insert(payment);
//Act
@@ -120,6 +48,6 @@
//Arrange
IRepository repPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
- repPayment.Insert(platnosc);
+ var payment= _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
+ repPayment.Insert(payment);
var controller = new PlatnoscController(null, repPayment, null, _translateManager);
@@ -140,6 +68,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -161,6 +89,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip2", "", 0, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip2", "", 0, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -211,6 +139,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
var repConfirm = new Repository(new FakeDataContext());
@@ -239,6 +167,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -260,6 +188,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -281,11 +209,11 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
-
- var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
- controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
- var name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
- var payer = _testDataHelper.CreatePayer(123, name, "test");
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
+
+ var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+ controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
+ var firstname = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+ var payer = _testDataHelper.CreatePayer(123, firstname, "test");
//Act
@@ -302,6 +230,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -323,6 +251,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(invoice);
var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
@@ -333,5 +261,5 @@
//Act
controller.Show(payer, "pl");
-
+
//Assert
System.Diagnostics.Debug.WriteLine("Model powinien byc 'true'. Jest " + controller.ModelState.IsValid);
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 984)
@@ -18,6 +18,10 @@
// ReSharper restore InconsistentNaming
{
+ private readonly TestDataHelper _testDataHelper = new TestDataHelper();
private IRepository _repConfirm;
-
+ private IRepository _repPayment;
+ private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia
+ private const string CODE_BAD = "payment_declined"; //transakcja odrzucona
+
private eCardController CreateController()
{
@@ -25,5 +29,5 @@
var builder = new TestControllerBuilder();
- return builder.CreateController(_repConfirm);
+ return builder.CreateController(_repConfirm);
}
@@ -147,4 +151,69 @@
Assert.That(result.Content.Contains("ArgumentException"), "Response should contain SqlException");
}
- }
+ /*[Test]
+ [Category("Unit")]
+ public void Status_Action_Saves_Correct_Transaction()
+ {
+ //Arrange
+ _repPayment = new Repository(new FakeDataContext());
+ var payment = _testDataHelper.CreateNewPayment(2, false, DateTime.Now, 12345);
+ _repPayment.Insert(payment);
+ _repPayment.SubmitChanges();
+
+ var controller = CreateController();
+ var valueCollection = new NameValueCollection {
+ {"MERCHANTNUMBER", "1"},
+ {"ORDERNUMBER", "2"},
+ {"AUTHTIME", DateTime.Now.ToString()},
+ {"CURRENTSTATE", CODE_OK}};
+ controller.Request.Form.Add(valueCollection);
+
+ //Act
+ controller.Status();
+ var confirm = _repConfirm.Find(o => o.ORDERNUMBER == 2).SingleOrDefault();
+
+ //Assert
+ Assert.That(confirm.MERCHANTNUMBER, Is.EqualTo("1"));
+
+ //Act
+ var paymentAfterUpdate = _repPayment.FindOne(2);
+ System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status);
+
+ //Assert
+ Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));
+ }*/
+ /*[Test]
+ [Category("Unit")]
+ public void Status_Action_Payment_Is_Not_Update_When_Currentstate_Is_CODE_BAD()
+ {
+ //Arrange
+ _repPayment = new Repository(new FakeDataContext());
+ var payment = _testDataHelper.CreateNewPayment(2, false, DateTime.Now, 12345);
+ _repPayment.Insert(payment);
+ _repPayment.SubmitChanges();
+
+ var controller = CreateController();
+ var valueCollection = new NameValueCollection {
+ {"MERCHANTNUMBER", "1"},
+ {"ORDERNUMBER", "2"},
+ {"AUTHTIME", DateTime.Now.ToString()},
+ {"CURRENTSTATE", CODE_BAD}};
+ controller.Request.Form.Add(valueCollection);
+
+ //Act
+ controller.Status();
+ var confirm = _repConfirm.Find(o => o.ORDERNUMBER == 2).SingleOrDefault();
+
+ //Assert
+ Assert.That(confirm.MERCHANTNUMBER, Is.EqualTo("1"));
+
+ //Act
+ var paymentAfterUpdate = _repPayment.FindOne(2);
+ System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status);
+
+ //Assert
+ Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));
+ }*/
+
+ }
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs (revision 984)
@@ -22,6 +22,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
+ repVPayment.Insert(invoice);
var payer = _testDataHelper.CreatePayer(123, "test", "test");
@@ -45,6 +45,6 @@
//Arrange
IRepository repVPayment = new Repository(new FakeDataContext());
- var platnosc = _testDataHelper.CreateInvoice(12, "nip1", "", 0, 0);
- repVPayment.Insert(platnosc);
+ var invoice = _testDataHelper.CreateInvoice(12, "nip1", "", 0, 0);
+ repVPayment.Insert(invoice);
var payer = _testDataHelper.CreatePayer(123, "test", "test");
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Fakes/TestDataHelper.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Fakes/TestDataHelper.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Fakes/TestDataHelper.cs (revision 984)
@@ -11,35 +11,35 @@
public Invoice CreateInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy)
{
- var platnosc = new Invoice();
- platnosc.ID_faktury = id;
- platnosc.nip = nip;
- platnosc.Faktura_Numer = invoiceNumber;
- platnosc.Brutto = brutto;
- platnosc.SystemKsiegowyId = systemKsiegowy;
+ var invoice = new Invoice();
+ invoice.ID_faktury = id;
+ invoice.nip = nip;
+ invoice.Faktura_Numer = invoiceNumber;
+ invoice.Brutto = brutto;
+ invoice.SystemKsiegowyId = systemKsiegowy;
- return platnosc;
+ return invoice;
}
public Invoice CreateForeignInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy, decimal walutaBrutto, string currency)
{
- var platnosc = new Invoice();
- platnosc.ID_faktury = id;
- platnosc.nip = nip;
- platnosc.Faktura_Numer = invoiceNumber;
- platnosc.Brutto = brutto;
- platnosc.waluta_brutto = walutaBrutto;
- platnosc.waluta_miano = currency.ToUpper();
- platnosc.SystemKsiegowyId = systemKsiegowy;
+ var invoice = new Invoice();
+ invoice.ID_faktury = id;
+ invoice.nip = nip;
+ invoice.Faktura_Numer = invoiceNumber;
+ invoice.Brutto = brutto;
+ invoice.waluta_brutto = walutaBrutto;
+ invoice.waluta_miano = currency.ToUpper();
+ invoice.SystemKsiegowyId = systemKsiegowy;
- return platnosc;
+ return invoice;
}
public PlatnosciEcard CreateNewPayment(int orderNumber, bool status, DateTime data, int invoiceId)
{
- var platnosc = new PlatnosciEcard();
- platnosc.ORDERNUMBER = orderNumber;
- platnosc.Status = status;
- platnosc.Status_data = data;
- platnosc.IDFaktury = invoiceId;
+ var payment = new PlatnosciEcard();
+ payment.ORDERNUMBER = orderNumber;
+ payment.Status = status;
+ payment.Status_data = data;
+ payment.IDFaktury = invoiceId;
- return platnosc;
+ return payment;
}
public PotwierdzeniaEcard CreateConfirm(string code, int ordernumber)
@@ -61,5 +61,4 @@
public ControllerContext CreateControllerContext(string userIdentity)
{
-
var mock = new Mock();
mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(userIdentity);
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs (revision 984)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs (revision 984)
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Test.Fakes;
+using adMoto.Payments.Web.Models;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Interfaces;
+
+namespace adMoto.Payments.Test.UI
+{
+ public class UIHelper
+ {
+ private readonly TestDataHelper _testDataHelper = new TestDataHelper();
+ private IRepository _repInvoices;
+ private IRepository _repInvoiceDetails;
+ private IRepository _repPayment;
+ private UIData uiData;
+ private string nip = "test"; //testowy klient o id 76131
+ private string numer_faktury = "1/SLJ/1";
+
+ public UIData CreateAndAddTestRecordToRepository(int amount)
+ {
+ _repInvoices = new Repository(new DataContext());
+ var invoices = new FAKTURY
+ {
+ NUMER = 1,
+ NUMER_ROZ = "SLJ",
+ NUMER_ROK = 1,
+ NABYWCA_NIP = nip,
+ ID_SPRZEDAWCY = 2,
+ ID_NABYWCY = 76131, //testowy klient
+ waluta_brutto = Convert.ToDouble(amount),
+ waluta_miano = "EUR"
+ };
+ _repInvoices.Insert(invoices);
+ var invoice = _repInvoices.FindOne(p => p.NUMER == 1 && p.NUMER_ROK == 1 && p.NUMER_ROZ == "SLJ" && p.ID_NABYWCY == 76131);
+
+ if (invoice != null)
+ {
+ _repInvoiceDetails = new Repository(new DataContext());
+ var invoiceDetails = new FAKTURA_DETAIL
+ {
+ ID_FAKTURY = invoice.ID_FAKTURY,
+ SYMBOL_SWW = "TEST"
+ };
+ _repInvoiceDetails.Insert(invoiceDetails);
+
+ var invoiceDetails2 = _repInvoiceDetails.FindOne(p => p.ID_FAKTURY == invoiceDetails.ID_FAKTURY && p.SYMBOL_SWW == "TEST");
+
+ if (invoiceDetails2 != null)
+ {
+ uiData = new UIData
+ {
+ FAKTURA_ID = Convert.ToInt32(invoiceDetails2.ID_FAKTURY),
+ FAKTURA_DETAIL_ID = invoiceDetails2.ID_FAKTURA_DETAILS,
+ Test_nip = nip,
+ Test_numer_faktury = numer_faktury
+ };
+ }
+ }
+ return uiData;
+ }
+
+ public void DeleteTestRecordsFromRepository(UIData uiData)
+ {
+ var invoice = _repInvoices.FindOne(p => p.ID_FAKTURY == uiData.FAKTURA_ID);
+ if (invoice != null)
+ _repInvoices.Delete(invoice);
+
+ var invoiceDetails = _repInvoiceDetails.FindOne(p => p.ID_FAKTURA_DETAILS == uiData.FAKTURA_DETAIL_ID);
+ if (invoiceDetails != null)
+ _repInvoiceDetails.Delete(invoiceDetails);
+ }
+
+ public void DeleteTestPaymentFromRepository(UIData uiData)
+ {
+ _repPayment = new Repository(new DataContext());
+ var payment = _repPayment.FindOne(p => p.IDFaktury == uiData.FAKTURA_ID &&
+ p.NAME == uiData.Test_firstname &&
+ p.SURNAME == uiData.Test_surname &&
+ p.ORDERDESCRIPTION == uiData.Test_numer_faktury &&
+ p.nip == uiData.Test_nip);
+
+ if (payment != null)
+ _repPayment.Delete(payment);
+ }
+
+ }
+}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/ValidationTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/ValidationTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/ValidationTests.cs (revision 984)
@@ -7,12 +7,17 @@
public class ValidationTests
{
+ private readonly UIHelper _uidata = new UIHelper();
+
[Test]
[Category("UI")]
public void Validates_When_Firstname_Is_Too_Long()
{
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(2);
+
const string test = "test";
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("1/SLJ/2009");
- ie.TextField(Find.ByName("nip")).TypeText("9730727417");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
@@ -24,4 +29,7 @@
ie.Close();
ie.Dispose();
+
+ //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+ _uidata.DeleteTestRecordsFromRepository(uiData);
}
@@ -30,8 +38,11 @@
public void Validates_When_Surname_Is_Too_Long()
{
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(2);
+
const string test = "test";
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("1/SLJ/2009");
- ie.TextField(Find.ByName("nip")).TypeText("9730727417");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
@@ -43,4 +54,7 @@
ie.Close();
ie.Dispose();
+
+ //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+ _uidata.DeleteTestRecordsFromRepository(uiData);
}
@@ -49,8 +63,11 @@
public void Validates_When_LastName_Is_Empty()
{
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(2);
+
const string test = "test";
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
- ie.TextField(Find.ByName("nip")).TypeText("854956281");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
@@ -62,4 +79,7 @@
ie.Close();
ie.Dispose();
+
+ //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+ _uidata.DeleteTestRecordsFromRepository(uiData);
}
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/AuthenticationTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/AuthenticationTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/AuthenticationTests.cs (revision 984)
@@ -7,4 +7,6 @@
public class AuthenticationTests
{
+ private readonly UIHelper _uidata = new UIHelper();
+
[Test]
[Category("UI")]
@@ -25,12 +27,16 @@
public void Can_Login_When_Using_Correct_Login_Information()
{
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(0);
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("24/HOL/2009");
- ie.TextField(Find.ByName("nip")).TypeText("501379568");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
- Assert.IsTrue(ie.ContainsText("została uregulowana"));
+ Assert.IsTrue(ie.ContainsText("Szczegóły zlecenia"));
ie.ForceClose();
ie.Close();
ie.Dispose();
+
+ _uidata.DeleteTestRecordsFromRepository(uiData);
}
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs (revision 982)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs (revision 984)
@@ -7,12 +7,20 @@
public class MerchantTests
{
+ private readonly UIHelper _uidata = new UIHelper();
+
[Test]
[Category("UI")]
public void Redirects_To_Ecard_When_All_Details_Are_Correct()
{
+ //dodanie testowego rekordu do tabel: FAKTURY, FAKTURA_DETAILS
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(2);
+
const string test = "test";
+ uiData.Test_surname = test;
+ uiData.Test_firstname = test;
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
- ie.TextField(Find.ByName("nip")).TypeText("854956281");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
@@ -25,4 +33,10 @@
ie.Close();
ie.Dispose();
+
+ //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+ _uidata.DeleteTestRecordsFromRepository(uiData);
+
+ //usuniecie rekordu z tabeli PatnosciEcard
+ _uidata.DeleteTestPaymentFromRepository(uiData);
}
@@ -31,11 +45,15 @@
public void Returns_ZlyHash_When_Invoice_Amount_Is_Zero()
{
- // wartosc faktury 1/SLJ/2009 jest 0 (zero)
+ // wartosc testowej faktury 1/SLJ/1 jest 0 (zero)
// wowczas eCard powinien zwrocic zlyHash - stala informujaca, ze cos jest nie tak...
+ var uiData = _uidata.CreateAndAddTestRecordToRepository(0);
const string test = "test";
+ uiData.Test_surname = test;
+ uiData.Test_firstname = test;
+
var ie = new IE("http://localhost:3646/pl/Account/LogOn");
- ie.TextField(Find.ByName("numerFaktury")).TypeText("1/SLJ/2009");
- ie.TextField(Find.ByName("nip")).TypeText("9730727417");
+ ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+ ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
ie.Button(Find.ById("loguj")).Click();
@@ -47,4 +65,7 @@
ie.Close();
ie.Dispose();
+
+ //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+ _uidata.DeleteTestRecordsFromRepository(uiData);
}
}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIData.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIData.cs (revision 984)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIData.cs (revision 984)
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace adMoto.Payments.Test.UI
+{
+ public class UIData
+ {
+ public int FAKTURA_ID { get; set; }
+ public int FAKTURA_DETAIL_ID { get; set; }
+ public string Test_nip { get; set; }
+ public string Test_numer_faktury { get; set; }
+ public string Test_firstname { get; set; }
+ public string Test_surname { get; set; }
+ }
+}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj (revision 984)
@@ -55,4 +55,6 @@
+
+
Platnosci.dbml
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURA_DETAIL.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURA_DETAIL.cs (revision 984)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURA_DETAIL.cs (revision 984)
@@ -0,0 +1,13 @@
+using adMoto.Payments.Core.Interfaces;
+
+namespace adMoto.Payments.Core.Data
+{
+ public partial class FAKTURA_DETAIL : IIdentifiable
+ {
+ public int Id
+ {
+ get { return ID_FAKTURA_DETAILS; }
+ }
+
+ }
+}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURY.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURY.cs (revision 984)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Core/Data/FAKTURY.cs (revision 984)
@@ -0,0 +1,13 @@
+using adMoto.Payments.Core.Interfaces;
+
+namespace adMoto.Payments.Core.Data
+{
+ public partial class FAKTURY : IIdentifiable
+ {
+ public int Id
+ {
+ get { return ID_FAKTURY; }
+ }
+
+ }
+}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs (revision 984)
@@ -94,14 +94,14 @@
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();
+ var payment = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
- if (platnosc == null)
+ if (payment == null)
merchant.Hash = HASH_ERROR_INFO;
else
{
- var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER;
+ var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + payment.ORDERNUMBER;
var req = (HttpWebRequest)WebRequest.Create(adres);
- var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
- dane += "¤cy=" + platnosc.CURRENCY;
+ var dane = "&orderDescription=&amount=" + payment.AMOUNT;
+ dane += "¤cy=" + payment.CURRENCY;
dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs (revision 984)
@@ -40,25 +40,25 @@
_translateManager = translate;
}
- public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
+ public string BruttoToString(decimal? kwota, decimal? waluta_brutto, 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() + ")";
+ if (waluta_brutto > 0 && miano.ToUpper() != "PLN")
+ brutto += "(" + (waluta_brutto.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
return brutto;
}
- public bool UserIdentity(Invoice platnosc, string userName)
+ public bool UserIdentity(Invoice invoice, string userName)
{
- return platnosc != null && platnosc.nip == userName;
+ return invoice != null && invoice.nip == userName;
}
- public Waluta SetAmount(Invoice platnosc)
+ public Waluta SetAmount(Invoice invoice)
{
- var waluta = new Waluta {Currency = GetCurrency(platnosc.waluta_miano)};
+ var waluta = new Waluta {Currency = GetCurrency(invoice.waluta_miano)};
- waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100);
+ waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(invoice.Brutto * 100) : Convert.ToInt32(invoice.waluta_brutto * 100);
return waluta;
@@ -144,37 +144,37 @@
return er;
}
- public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId)
+ public PlatnosciEcard CreateAndAddNewPyment(Invoice invoice, 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;
+ var payment = new PlatnosciEcard();
+ payment.IDFaktury = invoice.ID_faktury;
+ payment.ORDERDESCRIPTION = invoice.Faktura_Numer;
+ payment.nip = invoice.nip;
+ payment.nrZlecenia = "";
+ payment.AMOUNT = waluta.Amount;
+ payment.CURRENCY = waluta.Currency;
+ payment.SESSIONID = sessionId;
+ payment.NAME = payer.FirstName;
+ payment.SURNAME = payer.LastName;
+ payment.AUTODEPOSIT = true;
+ payment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard
+ payment.CHARSET = KODOWANIE;
+ payment.COUNTRY = KOD_POLSKA;
+ payment.JS = true;
+ payment.PAYMENTTYPE = CARDS;
+ payment.Data = DateTime.Now;
+ payment.Status = null;
+ payment.Status_data = null;
- _repPayment.Insert(newPayment);
- return newPayment;
+ _repPayment.Insert(payment);
+ return payment;
}
- public ErrorViewData IsError(Invoice platnosc, String userName)
+ public ErrorViewData IsError(Invoice invoice, String userName)
{
var errortxt = "";
- if (platnosc == null)
+ if (invoice == null)
errortxt = _translateManager.Translate("tlumaczenia", "brakdanych");
- else if (!UserIdentity(platnosc, userName))
+ else if (!UserIdentity(invoice, userName))
errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja");
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs (revision 984)
@@ -29,9 +29,9 @@
}
- public AccountController(IFormsAuthentication formsAuth, IRepository repository, PaymentsUtils func)
+ public AccountController(IFormsAuthentication formsAuth, IRepository repository, PaymentsUtils paymentsUtils)
{
_repository = repository;
FormsAuth = formsAuth ?? new FormsAuthenticationService();
- _paymentsUtils = func;
+ _paymentsUtils = paymentsUtils;
}
@@ -51,13 +51,14 @@
{
_paymentsUtils.SetLanguage(language);
- var platnosc = new Invoice();
+ var invoice = new Invoice();
+
if (!ValidateLogOn(nip, numerFaktury))
- {
+ return View();
+
+ invoice = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault();
+
+ if (invoice == null)
return View();
- }
-
- var login = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault();
- platnosc = login;
- if (platnosc == null) return View();
+
_paymentsUtils.SetUserLogger(nip, numerFaktury);
@@ -65,9 +66,7 @@
if (!String.IsNullOrEmpty(returnUrl))
- {
return Redirect(returnUrl);
- }
- return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });
+ return RedirectToAction("Show", "Platnosc", new { id = invoice.ID_faktury });
}
@@ -86,4 +85,5 @@
if (String.IsNullOrEmpty(nip))
ModelState.AddModelError("nip", errNip);
+
if (String.IsNullOrEmpty(numerFaktury))
ModelState.AddModelError("numerFaktury", errFaktura);
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs (revision 984)
@@ -39,11 +39,11 @@
var id1 = Convert.ToInt32(payer.Id_faktury);
- var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+ var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
- var errorViewData = _paymentsUtils.IsError(platnosc, ControllerContext.HttpContext.User.Identity.Name);
+ var errorViewData = _paymentsUtils.IsError(invoice, ControllerContext.HttpContext.User.Identity.Name);
if (!String.IsNullOrEmpty(errorViewData.Error))
return View("Error1", errorViewData);
- var merchant = _merchantHelper.CreateMerchantData(platnosc, payer, language, Session.SessionID);
+ var merchant = _merchantHelper.CreateMerchantData(invoice, payer, language, Session.SessionID);
if (merchant == null || !String.IsNullOrEmpty(merchant.Error))
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 978)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 984)
@@ -43,17 +43,17 @@
var id1 = ConvertId(id);
- var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+ var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
- var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
+ var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name);
if (!String.IsNullOrEmpty(errorViewData.Error))
return View("Error1", errorViewData);
- var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+ var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
- var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
+ var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); //szukamy uregulowanej faktury
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.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), invoice.Faktura_Numer, dataZaplaty);
invoiceDeatailsViewData.Termin = dataZaplaty;
return View("Paid", invoiceDeatailsViewData);
@@ -80,11 +80,11 @@
if (ModelState.IsValid == false)
{
- var platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
- var errorViewData = _paymentsUtils.IsError(platnosc, HttpContext.User.Identity.Name);
+ var invoice = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
+ var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name);
if (!String.IsNullOrEmpty(errorViewData.Error))
return View("Error1", errorViewData);
- return View("Show", InitInvoiceDetailsViewData(platnosc));
+ return View("Show", InitInvoiceDetailsViewData(invoice));
}
return RedirectToAction("Merchant", "Merchant", payer);
@@ -96,10 +96,10 @@
_paymentsUtils.SetLanguage(language);
var id1 = ConvertId(id);
- var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+ var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
- if (platnosc == null)
+ if (invoice == null)
return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
- var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+ var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
//sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
@@ -119,12 +119,12 @@
_paymentsUtils.SetLanguage(language);
var id1 = ConvertId(id);
- var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
+ var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
- if (platnosc == null)
+ if (invoice == null)
return View("Error1",
_paymentsUtils.InitErrorViewData(
_translateManager.Translate("tlumaczenia", "brakdanych"), 0));
- var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
+ var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice);
return View(invoiceDeatailsViewData);
}
@@ -141,10 +141,10 @@
}
- private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice platnosc)
+ private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice invoice)
{
var invoiceDeatailsViewData = new InvoiceDetailsViewData();
- invoiceDeatailsViewData.Invoice = platnosc;
- invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
- invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
+ invoiceDeatailsViewData.Invoice = invoice;
+ invoiceDeatailsViewData.Payer = InitPayer(invoice.ID_faktury);
+ invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(invoice.Brutto, invoice.waluta_brutto, invoice.waluta_miano);
return invoiceDeatailsViewData;
}
@@ -158,10 +158,10 @@
public void UpdateStatus(int ordernumber, string currentstate)
{
- var platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
+ var payment = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
- if (platnosc != null && currentstate == ISPAID)
+ if (payment != null && currentstate == ISPAID)
{
- platnosc.Status = true;
- platnosc.Status_data = DateTime.Now;
+ payment.Status = true;
+ payment.Status_data = DateTime.Now;
_repPayment.SubmitChanges();
}
@@ -170,7 +170,7 @@
public int CheckConfirm(int idfaktury, int order)
{
- var pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
+ var payment = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
- if (pl != null)
+ if (payment != null)
{
var confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();