- Data:
- 2009-12-28 15:17:15 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC
- Pliki:
-
- 4 dodane
- 18 zmodyfikowane
-
adMoto.Payments.Core/Data/FAKTURA_DETAIL.cs (dodane)
-
adMoto.Payments.Core/Data/FAKTURY.cs (dodane)
-
adMoto.Payments.Core/adMoto.Payments.Core.csproj (zmodyfikowane) (1 diff)
-
adMoto.Payments.Test/Controllers/MerchantControllerTests.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs (zmodyfikowane) (12 diffs)
-
adMoto.Payments.Test/Controllers/eCardControllerTests.cs (zmodyfikowane) (3 diffs)
-
adMoto.Payments.Test/Fakes/TestDataHelper.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Test/UI/AuthenticationTests.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Test/UI/MerchantTests.cs (zmodyfikowane) (4 diffs)
-
adMoto.Payments.Test/UI/UIData.cs (dodane)
-
adMoto.Payments.Test/UI/UIHelper.cs (dodane)
-
adMoto.Payments.Test/UI/ValidationTests.cs (zmodyfikowane) (6 diffs)
-
adMoto.Payments.Test/Utils/MerchantTests.cs (zmodyfikowane) (5 diffs)
-
adMoto.Payments.Test/Utils/PaymentUtilsTests.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Test/Utils/TestDataHelperTests.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Test/Utils/eCardDataTests.cs (zmodyfikowane) (8 diffs)
-
adMoto.Payments.Test/adMoto.Payments.Test.csproj (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Controllers/AccountController.cs (zmodyfikowane) (4 diffs)
-
adMoto.Payments.Web/Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Controllers/PlatnoscController.cs (zmodyfikowane) (7 diffs)
-
adMoto.Payments.Web/Models/MerchantHelper.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Models/PaymentsUtils.cs (zmodyfikowane) (2 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/adMoto.Payments.Core/adMoto.Payments.Core.csproj
r971 r984 55 55 <ItemGroup> 56 56 <Compile Include="Data\DataContext.cs" /> 57 <Compile Include="Data\FAKTURY.cs" /> 58 <Compile Include="Data\FAKTURA_DETAIL.cs" /> 57 59 <Compile Include="Data\Platnosci.designer.cs"> 58 60 <DependentUpon>Platnosci.dbml</DependentUpon> -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs
r982 r984 22 22 //Arrange 23 23 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 24 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);25 repVPayment.Insert( platnosc);24 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0); 25 repVPayment.Insert(invoice); 26 26 27 27 var payer = _testDataHelper.CreatePayer(123, "test", "test"); … … 45 45 //Arrange 46 46 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 47 var platnosc= _testDataHelper.CreateInvoice(12, "nip1", "", 0, 0);48 repVPayment.Insert( platnosc);47 var invoice = _testDataHelper.CreateInvoice(12, "nip1", "", 0, 0); 48 repVPayment.Insert(invoice); 49 49 50 50 var payer = _testDataHelper.CreatePayer(123, "test", "test"); -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs
r982 r984 22 22 private readonly TestDataHelper _testDataHelper = new TestDataHelper(); 23 23 24 //[Test]25 //[Category("Unit")]26 //public void Status_Action_Saves_Correct_Transaction()27 //{28 // //Arrange29 // var repository = new Repository<PlatnosciEcard>(new FakeDataContext());30 // var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);31 // repository.Insert(platnosci);32 // repository.SubmitChanges();33 34 // IRepository<PotwierdzeniaEcard> rep = new Repository<PotwierdzeniaEcard>(new FakeDataContext());35 36 // var builder = new TestControllerBuilder();37 // var controller = new PlatnoscController(null, repository, rep, _translateManager);38 // builder.InitializeController(controller);39 // builder.QueryString.Add("MERCHANTNUMBER", MERCHANT_NUMBER);40 // builder.QueryString.Add("AUTHTIME", DateTime.Now.ToString());41 // builder.QueryString.Add("DATATRANSMISJI", DateTime.Now.ToString());42 // builder.QueryString.Add("ORDERNUMBER", _orderNumber.ToString());43 // builder.QueryString.Add("CURRENTSTATE", CODE_OK);44 45 // //Act46 // controller.Status();47 // System.Diagnostics.Debug.WriteLine("rep:" + rep.Count() + " repPl: " + repository.Count() );48 // var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault();49 50 // //Assert51 // Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER));52 53 // //Act54 // var paymentAfterUpdate = repository.FindOne(_orderNumber);55 // System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status);56 57 // //Assert58 // Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));59 //}60 61 //[Test]62 //[Category("Unit")]63 //public void Status_Action_Payment_Is_Not_Update_When_Currentstate_Is_CODE_BAD()64 //{65 // //Arrange66 // var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());67 // var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);68 // repPayment.Insert(platnosci);69 // repPayment.SubmitChanges();70 // IRepository<PotwierdzeniaEcard> repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());71 72 // var builder = new TestControllerBuilder();73 // var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager);74 // builder.InitializeController(controller);75 // builder.QueryString.Add("MERCHANTNUMBER", MERCHANT_NUMBER);76 // builder.QueryString.Add("AUTHTIME", DateTime.Now.ToString());77 // builder.QueryString.Add("DATATRANSMISJI", DateTime.Now.ToString());78 // builder.QueryString.Add("ORDERNUMBER", _orderNumber.ToString());79 // builder.QueryString.Add("CURRENTSTATE", CODE_BAD);80 81 // //Act82 // controller.Status();83 // var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault();84 85 // //Assert86 // Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(MERCHANT_NUMBER));87 88 // //Act89 // var paymentAfterUpdate = repPayment.FindOne(_orderNumber);90 // System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status);91 92 // //Assert93 // Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false));94 //}95 96 24 [Test] 97 25 [Category("Unit")] … … 100 28 //Arrange 101 29 IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 102 PlatnosciEcard p latnosc= _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);103 repPayment.Insert(p latnosc);30 PlatnosciEcard payment = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1); 31 repPayment.Insert(payment); 104 32 105 33 //Act … … 120 48 //Arrange 121 49 IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 122 var p latnosc= _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);123 repPayment.Insert(p latnosc);50 var payment= _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1); 51 repPayment.Insert(payment); 124 52 125 53 var controller = new PlatnoscController(null, repPayment, null, _translateManager); … … 140 68 //Arrange 141 69 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 142 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);143 repVPayment.Insert( platnosc);70 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0); 71 repVPayment.Insert(invoice); 144 72 145 73 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 161 89 //Arrange 162 90 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 163 var platnosc= _testDataHelper.CreateInvoice(123, "nip2", "", 0, 0);164 repVPayment.Insert( platnosc);91 var invoice = _testDataHelper.CreateInvoice(123, "nip2", "", 0, 0); 92 repVPayment.Insert(invoice); 165 93 166 94 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 211 139 //Arrange 212 140 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 213 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);214 repVPayment.Insert( platnosc);141 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 142 repVPayment.Insert(invoice); 215 143 216 144 var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext()); … … 239 167 //Arrange 240 168 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 241 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);242 repVPayment.Insert( platnosc);169 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 170 repVPayment.Insert(invoice); 243 171 244 172 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 260 188 //Arrange 261 189 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 262 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);263 repVPayment.Insert( platnosc);190 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 191 repVPayment.Insert(invoice); 264 192 265 193 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 281 209 //Arrange 282 210 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 283 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);284 repVPayment.Insert( platnosc);285 286 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 287 controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1"); 288 var name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";289 var payer = _testDataHelper.CreatePayer(123, name, "test");211 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 212 repVPayment.Insert(invoice); 213 214 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 215 controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1"); 216 var firstname = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; 217 var payer = _testDataHelper.CreatePayer(123, firstname, "test"); 290 218 291 219 //Act … … 302 230 //Arrange 303 231 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 304 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);305 repVPayment.Insert( platnosc);232 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 233 repVPayment.Insert(invoice); 306 234 307 235 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 323 251 //Arrange 324 252 IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext()); 325 var platnosc= _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);326 repVPayment.Insert( platnosc);253 var invoice = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0); 254 repVPayment.Insert(invoice); 327 255 328 256 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); … … 333 261 //Act 334 262 controller.Show(payer, "pl"); 335 263 336 264 //Assert 337 265 System.Diagnostics.Debug.WriteLine("Model powinien byc 'true'. Jest " + controller.ModelState.IsValid); -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs
r982 r984 18 18 // ReSharper restore InconsistentNaming 19 19 { 20 private readonly TestDataHelper _testDataHelper = new TestDataHelper(); 20 21 private IRepository<PotwierdzeniaEcard> _repConfirm; 21 22 private IRepository<PlatnosciEcard> _repPayment; 23 private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia 24 private const string CODE_BAD = "payment_declined"; //transakcja odrzucona 25 22 26 private eCardController CreateController() 23 27 { … … 25 29 26 30 var builder = new TestControllerBuilder(); 27 return builder.CreateController<eCardController>(_repConfirm); 31 return builder.CreateController<eCardController>(_repConfirm); 28 32 } 29 33 … … 147 151 Assert.That(result.Content.Contains("ArgumentException"), "Response should contain SqlException"); 148 152 } 149 } 153 /*[Test] 154 [Category("Unit")] 155 public void Status_Action_Saves_Correct_Transaction() 156 { 157 //Arrange 158 _repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 159 var payment = _testDataHelper.CreateNewPayment(2, false, DateTime.Now, 12345); 160 _repPayment.Insert(payment); 161 _repPayment.SubmitChanges(); 162 163 var controller = CreateController(); 164 var valueCollection = new NameValueCollection { 165 {"MERCHANTNUMBER", "1"}, 166 {"ORDERNUMBER", "2"}, 167 {"AUTHTIME", DateTime.Now.ToString()}, 168 {"CURRENTSTATE", CODE_OK}}; 169 controller.Request.Form.Add(valueCollection); 170 171 //Act 172 controller.Status(); 173 var confirm = _repConfirm.Find(o => o.ORDERNUMBER == 2).SingleOrDefault(); 174 175 //Assert 176 Assert.That(confirm.MERCHANTNUMBER, Is.EqualTo("1")); 177 178 //Act 179 var paymentAfterUpdate = _repPayment.FindOne(2); 180 System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); 181 182 //Assert 183 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); 184 }*/ 185 /*[Test] 186 [Category("Unit")] 187 public void Status_Action_Payment_Is_Not_Update_When_Currentstate_Is_CODE_BAD() 188 { 189 //Arrange 190 _repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 191 var payment = _testDataHelper.CreateNewPayment(2, false, DateTime.Now, 12345); 192 _repPayment.Insert(payment); 193 _repPayment.SubmitChanges(); 194 195 var controller = CreateController(); 196 var valueCollection = new NameValueCollection { 197 {"MERCHANTNUMBER", "1"}, 198 {"ORDERNUMBER", "2"}, 199 {"AUTHTIME", DateTime.Now.ToString()}, 200 {"CURRENTSTATE", CODE_BAD}}; 201 controller.Request.Form.Add(valueCollection); 202 203 //Act 204 controller.Status(); 205 var confirm = _repConfirm.Find(o => o.ORDERNUMBER == 2).SingleOrDefault(); 206 207 //Assert 208 Assert.That(confirm.MERCHANTNUMBER, Is.EqualTo("1")); 209 210 //Act 211 var paymentAfterUpdate = _repPayment.FindOne(2); 212 System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status); 213 214 //Assert 215 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); 216 }*/ 217 218 } 150 219 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Fakes/TestDataHelper.cs
r982 r984 11 11 public Invoice CreateInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy) 12 12 { 13 var platnosc= new Invoice();14 platnosc.ID_faktury = id;15 platnosc.nip = nip;16 platnosc.Faktura_Numer = invoiceNumber;17 platnosc.Brutto = brutto;18 platnosc.SystemKsiegowyId = systemKsiegowy;13 var invoice = new Invoice(); 14 invoice.ID_faktury = id; 15 invoice.nip = nip; 16 invoice.Faktura_Numer = invoiceNumber; 17 invoice.Brutto = brutto; 18 invoice.SystemKsiegowyId = systemKsiegowy; 19 19 20 return platnosc;20 return invoice; 21 21 } 22 22 public Invoice CreateForeignInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy, decimal walutaBrutto, string currency) 23 23 { 24 var platnosc= new Invoice();25 platnosc.ID_faktury = id;26 platnosc.nip = nip;27 platnosc.Faktura_Numer = invoiceNumber;28 platnosc.Brutto = brutto;29 platnosc.waluta_brutto = walutaBrutto;30 platnosc.waluta_miano = currency.ToUpper();31 platnosc.SystemKsiegowyId = systemKsiegowy;24 var invoice = new Invoice(); 25 invoice.ID_faktury = id; 26 invoice.nip = nip; 27 invoice.Faktura_Numer = invoiceNumber; 28 invoice.Brutto = brutto; 29 invoice.waluta_brutto = walutaBrutto; 30 invoice.waluta_miano = currency.ToUpper(); 31 invoice.SystemKsiegowyId = systemKsiegowy; 32 32 33 return platnosc;33 return invoice; 34 34 } 35 35 public PlatnosciEcard CreateNewPayment(int orderNumber, bool status, DateTime data, int invoiceId) 36 36 { 37 var p latnosc= new PlatnosciEcard();38 p latnosc.ORDERNUMBER = orderNumber;39 p latnosc.Status = status;40 p latnosc.Status_data = data;41 p latnosc.IDFaktury = invoiceId;37 var payment = new PlatnosciEcard(); 38 payment.ORDERNUMBER = orderNumber; 39 payment.Status = status; 40 payment.Status_data = data; 41 payment.IDFaktury = invoiceId; 42 42 43 return p latnosc;43 return payment; 44 44 } 45 45 public PotwierdzeniaEcard CreateConfirm(string code, int ordernumber) … … 61 61 public ControllerContext CreateControllerContext(string userIdentity) 62 62 { 63 64 63 var mock = new Mock<ControllerContext>(); 65 64 mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(userIdentity); -
trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/AuthenticationTests.cs
r982 r984 7 7 public class AuthenticationTests 8 8 { 9 private readonly UIHelper _uidata = new UIHelper(); 10 9 11 [Test] 10 12 [Category("UI")] … … 25 27 public void Can_Login_When_Using_Correct_Login_Information() 26 28 { 29 var uiData = _uidata.CreateAndAddTestRecordToRepository(0); 30 27 31 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 28 ie.TextField(Find.ByName("numerFaktury")).TypeText( "24/HOL/2009");29 ie.TextField(Find.ByName("nip")).TypeText( "501379568");32 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 33 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 30 34 ie.Button(Find.ById("loguj")).Click(); 31 Assert.IsTrue(ie.ContainsText(" została uregulowana"));35 Assert.IsTrue(ie.ContainsText("Szczegóły zlecenia")); 32 36 ie.ForceClose(); 33 37 ie.Close(); 34 38 ie.Dispose(); 39 40 _uidata.DeleteTestRecordsFromRepository(uiData); 35 41 } 36 42 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs
r982 r984 7 7 public class MerchantTests 8 8 { 9 private readonly UIHelper _uidata = new UIHelper(); 10 9 11 [Test] 10 12 [Category("UI")] 11 13 public void Redirects_To_Ecard_When_All_Details_Are_Correct() 12 14 { 15 //dodanie testowego rekordu do tabel: FAKTURY, FAKTURA_DETAILS 16 var uiData = _uidata.CreateAndAddTestRecordToRepository(2); 17 13 18 const string test = "test"; 19 uiData.Test_surname = test; 20 uiData.Test_firstname = test; 21 14 22 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");23 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 24 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 17 25 ie.Button(Find.ById("loguj")).Click(); 18 26 … … 25 33 ie.Close(); 26 34 ie.Dispose(); 35 36 //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS 37 _uidata.DeleteTestRecordsFromRepository(uiData); 38 39 //usuniecie rekordu z tabeli PatnosciEcard 40 _uidata.DeleteTestPaymentFromRepository(uiData); 27 41 } 28 42 … … 31 45 public void Returns_ZlyHash_When_Invoice_Amount_Is_Zero() 32 46 { 33 // wartosc faktury 1/SLJ/2009jest 0 (zero)47 // wartosc testowej faktury 1/SLJ/1 jest 0 (zero) 34 48 // wowczas eCard powinien zwrocic zlyHash - stala informujaca, ze cos jest nie tak... 49 var uiData = _uidata.CreateAndAddTestRecordToRepository(0); 35 50 36 51 const string test = "test"; 52 uiData.Test_surname = test; 53 uiData.Test_firstname = test; 54 37 55 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 38 ie.TextField(Find.ByName("numerFaktury")).TypeText( "1/SLJ/2009");39 ie.TextField(Find.ByName("nip")).TypeText( "9730727417");56 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 57 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 40 58 ie.Button(Find.ById("loguj")).Click(); 41 59 … … 47 65 ie.Close(); 48 66 ie.Dispose(); 67 68 //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS 69 _uidata.DeleteTestRecordsFromRepository(uiData); 49 70 } 50 71 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/ValidationTests.cs
r982 r984 7 7 public class ValidationTests 8 8 { 9 private readonly UIHelper _uidata = new UIHelper(); 10 9 11 [Test] 10 12 [Category("UI")] 11 13 public void Validates_When_Firstname_Is_Too_Long() 12 14 { 15 var uiData = _uidata.CreateAndAddTestRecordToRepository(2); 16 13 17 const string test = "test"; 18 14 19 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 15 ie.TextField(Find.ByName("numerFaktury")).TypeText( "1/SLJ/2009");16 ie.TextField(Find.ByName("nip")).TypeText( "9730727417");20 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 21 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 17 22 ie.Button(Find.ById("loguj")).Click(); 18 23 … … 24 29 ie.Close(); 25 30 ie.Dispose(); 31 32 //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS 33 _uidata.DeleteTestRecordsFromRepository(uiData); 26 34 } 27 35 … … 30 38 public void Validates_When_Surname_Is_Too_Long() 31 39 { 40 var uiData = _uidata.CreateAndAddTestRecordToRepository(2); 41 32 42 const string test = "test"; 43 33 44 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 34 ie.TextField(Find.ByName("numerFaktury")).TypeText( "1/SLJ/2009");35 ie.TextField(Find.ByName("nip")).TypeText( "9730727417");45 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 46 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 36 47 ie.Button(Find.ById("loguj")).Click(); 37 48 … … 43 54 ie.Close(); 44 55 ie.Dispose(); 56 57 //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS 58 _uidata.DeleteTestRecordsFromRepository(uiData); 45 59 } 46 60 … … 49 63 public void Validates_When_LastName_Is_Empty() 50 64 { 65 var uiData = _uidata.CreateAndAddTestRecordToRepository(2); 66 51 67 const string test = "test"; 68 52 69 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 53 ie.TextField(Find.ByName("numerFaktury")).TypeText( "27/ASZ/2009");54 ie.TextField(Find.ByName("nip")).TypeText( "854956281");70 ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury); 71 ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip); 55 72 ie.Button(Find.ById("loguj")).Click(); 56 73 … … 62 79 ie.Close(); 63 80 ie.Dispose(); 81 82 //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS 83 _uidata.DeleteTestRecordsFromRepository(uiData); 64 84 } 65 85 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs
r982 r984 13 13 { 14 14 //Arrange 15 var p = new PlatnosciEcard16 {17 AMOUNT = 100,18 AUTODEPOSIT = true,19 ORDERDESCRIPTION = "abc/2009"20 };21 var m = new Merchant { Payment = p};15 var payment = new PlatnosciEcard 16 { 17 AMOUNT = 100, 18 AUTODEPOSIT = true, 19 ORDERDESCRIPTION = "abc/2009" 20 }; 21 var merchant = new Merchant { Payment = payment }; 22 22 23 23 //Act 24 m .IsValid();25 var result = m .Error;24 merchant.IsValid(); 25 var result = merchant.Error; 26 26 27 27 //Assert … … 34 34 { 35 35 //Arrange 36 var p = new PlatnosciEcard37 {38 AMOUNT = 100,39 AUTODEPOSIT = true,40 ORDERDESCRIPTION = "abc/2009",41 CURRENCY = "test",42 NAME = "test",43 SURNAME = "test"44 };45 var m = new Merchant { Payment = p};36 var payment = new PlatnosciEcard 37 { 38 AMOUNT = 100, 39 AUTODEPOSIT = true, 40 ORDERDESCRIPTION = "abc/2009", 41 CURRENCY = "test", 42 NAME = "test", 43 SURNAME = "test" 44 }; 45 var merchant = new Merchant { Payment = payment }; 46 46 47 47 //Act 48 m .IsValid();49 var result = m .Error;48 merchant.IsValid(); 49 var result = merchant.Error; 50 50 51 51 //Assert … … 58 58 { 59 59 //Arrange 60 var p = new PlatnosciEcard60 var payment = new PlatnosciEcard 61 61 { 62 62 AMOUNT = 100, … … 69 69 ORDERNUMBER = 100 70 70 }; 71 var m = new Merchant71 var merchant = new Merchant 72 72 { 73 Payment = p ,73 Payment = payment, 74 74 Id = "aaaa", 75 75 Password = "aa", … … 80 80 81 81 //Act 82 m .IsValid();83 var result = m .Error;82 merchant.IsValid(); 83 var result = merchant.Error; 84 84 85 85 //Assert -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/PaymentUtilsTests.cs
r982 r984 23 23 { 24 24 //Arrange 25 var funkcjePlantosi= new PaymentsUtils();25 var paymentsUtils = new PaymentsUtils(); 26 26 27 27 //Act 28 var result = funkcjePlantosi.GetCurrency(input);28 var result = paymentsUtils.GetCurrency(input); 29 29 30 30 //Assert … … 60 60 { 61 61 //Arrange 62 var funkcjePlantosi= new PaymentsUtils();62 var paymentUtils = new PaymentsUtils(); 63 63 64 64 //Act 65 var result = funkcjePlantosi.BruttoToString(100, 1, input);65 var result = paymentUtils.BruttoToString(100, 1, input); 66 66 67 67 //Act -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/TestDataHelperTests.cs
r982 r984 7 7 { 8 8 [TestFixture] 9 public class TestDataHelperTests 9 public class TestDataHelperTests 10 10 { 11 11 private readonly TestDataHelper _testDataHelper = new TestDataHelper(); … … 15 15 public void TestInsertMethodForPayment() 16 16 { 17 var fake = new FakeDataContext(); 18 var vPlatnosciEcardRepository = new Repository<Invoice>(fake); 17 var repVPayment = new Repository<Invoice>(new FakeDataContext()); 19 18 20 var platnosc= _testDataHelper.CreateInvoice(123, "nip", "", 0, 0);21 vPlatnosciEcardRepository.Insert(platnosc);19 var invoice1 = _testDataHelper.CreateInvoice(123, "nip", "", 0, 0); 20 repVPayment.Insert(invoice1); 22 21 23 var pl = vPlatnosciEcardRepository.FindOne(123);24 Assert.That( pl.nip, Is.EqualTo("nip"));22 var invoice2 = repVPayment.FindOne(123); 23 Assert.That(invoice2.nip, Is.EqualTo("nip")); 25 24 } 26 25 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs
r983 r984 21 21 //Arrange 22 22 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 23 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);24 repPayment.Insert(p latnosc);25 26 var ecarddata = new MerchantHelper(repPayment); 27 28 var merchant = new Merchant 29 {30 Payment = platnosc,31 Id = "171485000",32 Password = "ashSeth2",33 };23 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 24 repPayment.Insert(payment); 25 26 var ecarddata = new MerchantHelper(repPayment); 27 28 var merchant = new Merchant 29 { 30 Payment = payment, 31 Id = "171485000", 32 Password = "ashSeth2", 33 }; 34 34 35 35 //Act … … 46 46 //Arrange 47 47 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 48 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);49 50 repPayment.Insert(p latnosc);48 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 49 50 repPayment.Insert(payment); 51 51 52 52 var ecarddata = new MerchantHelper(repPayment); … … 55 55 { 56 56 Payment = new PlatnosciEcard 57 {58 ORDERDESCRIPTION = "dd",59 IDFaktury = 21,60 Data = DateTime.Now61 },57 { 58 ORDERDESCRIPTION = "dd", 59 IDFaktury = 21, 60 Data = DateTime.Now 61 }, 62 62 Id = "171485000", 63 63 Password = "ashSeth2", … … 76 76 //Arrange 77 77 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 78 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);79 p latnosc.AMOUNT = 229;80 p latnosc.CURRENCY = PaymentsUtils.PLN;81 82 repPayment.Insert(p latnosc);83 84 var ecarddata = new MerchantHelper(repPayment); 85 86 var merchant = new Merchant 87 { 88 Payment = p latnosc,78 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 79 payment.AMOUNT = 229; 80 payment.CURRENCY = PaymentsUtils.PLN; 81 82 repPayment.Insert(payment); 83 84 var ecarddata = new MerchantHelper(repPayment); 85 86 var merchant = new Merchant 87 { 88 Payment = payment, 89 89 Id = "171485000", 90 90 Password = "ashSeth2", … … 104 104 //Arrange 105 105 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 106 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);107 p latnosc.AMOUNT = 0;108 p latnosc.CURRENCY = PaymentsUtils.PLN;109 110 repPayment.Insert(p latnosc);111 112 var ecarddata = new MerchantHelper(repPayment); 113 114 var merchant = new Merchant 115 { 116 Payment = p latnosc,106 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 107 payment.AMOUNT = 0; 108 payment.CURRENCY = PaymentsUtils.PLN; 109 110 repPayment.Insert(payment); 111 112 var ecarddata = new MerchantHelper(repPayment); 113 114 var merchant = new Merchant 115 { 116 Payment = payment, 117 117 Id = "171485000", 118 118 Password = "ashSeth2", … … 132 132 //Arrange 133 133 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 134 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);135 p latnosc.AMOUNT = 229;136 p latnosc.CURRENCY = PaymentsUtils.PLN;137 138 repPayment.Insert(p latnosc);139 140 var ecarddata = new MerchantHelper(repPayment); 141 142 var merchant = new Merchant 143 { 144 Payment = p latnosc,134 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 135 payment.AMOUNT = 229; 136 payment.CURRENCY = PaymentsUtils.PLN; 137 138 repPayment.Insert(payment); 139 140 var ecarddata = new MerchantHelper(repPayment); 141 142 var merchant = new Merchant 143 { 144 Payment = payment, 145 145 Id = "TEST", 146 146 Password = "test", … … 160 160 //Arrange 161 161 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 162 var p latnosc= _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);163 p latnosc.AMOUNT = 11;164 p latnosc.CURRENCY = PaymentsUtils.PLN;165 166 repPayment.Insert(p latnosc);167 168 var ecarddata = new MerchantHelper(repPayment); 169 170 var merchant = new Merchant 171 { 172 Payment = p latnosc,162 var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); 163 payment.AMOUNT = 11; 164 payment.CURRENCY = PaymentsUtils.PLN; 165 166 repPayment.Insert(payment); 167 168 var ecarddata = new MerchantHelper(repPayment); 169 170 var merchant = new Merchant 171 { 172 Payment = payment, 173 173 Id = "171485000", 174 174 Password = "ashSeth2", … … 301 301 { 302 302 //Arrange 303 var p l= new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" };304 var m = new Merchant { Payment = pl, Id = "ABCD" };303 var payment = new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" }; 304 var merchant = new Merchant { Payment = payment, Id = "ABCD" }; 305 305 var eCardData = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext())); 306 306 307 307 //Act 308 var result = eCardData.GetUrl(m );309 310 //Assert 311 System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + m );308 var result = eCardData.GetUrl(merchant); 309 310 //Assert 311 System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + merchant); 312 312 Assert.That(result, Is.Not.EqualTo("")); 313 313 } -
trunk/eCard/eCardMVC/adMoto.Payments.Test/adMoto.Payments.Test.csproj
r982 r984 84 84 <Compile Include="Properties\AssemblyInfo.cs" /> 85 85 <Compile Include="TestRunner.cs" /> 86 <Compile Include="UI\UIData.cs" /> 87 <Compile Include="UI\UIHelper.cs" /> 86 88 <Compile Include="Utils\eCardDataTests.cs" /> 87 89 <Compile Include="Utils\PaymentUtilsTests.cs" /> -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/AccountController.cs
r971 r984 29 29 } 30 30 31 public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils func)31 public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, PaymentsUtils paymentsUtils) 32 32 { 33 33 _repository = repository; 34 34 FormsAuth = formsAuth ?? new FormsAuthenticationService(); 35 _paymentsUtils = func;35 _paymentsUtils = paymentsUtils; 36 36 } 37 37 … … 51 51 { 52 52 _paymentsUtils.SetLanguage(language); 53 var platnosc = new Invoice(); 53 var invoice = new Invoice(); 54 54 55 if (!ValidateLogOn(nip, numerFaktury)) 55 { 56 return View(); 57 58 invoice = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault(); 59 60 if (invoice == null) 56 61 return View(); 57 } 58 59 var login = _repository.FindInvoiceByNipNumber(nip, numerFaktury).SingleOrDefault(); 60 platnosc = login; 61 if (platnosc == null) return View(); 62 62 63 _paymentsUtils.SetUserLogger(nip, numerFaktury); 63 64 … … 65 66 66 67 if (!String.IsNullOrEmpty(returnUrl)) 67 {68 68 return Redirect(returnUrl); 69 }70 69 71 return RedirectToAction("Show", "Platnosc", new { id = platnosc.ID_faktury });70 return RedirectToAction("Show", "Platnosc", new { id = invoice.ID_faktury }); 72 71 } 73 72 … … 86 85 if (String.IsNullOrEmpty(nip)) 87 86 ModelState.AddModelError("nip", errNip); 87 88 88 if (String.IsNullOrEmpty(numerFaktury)) 89 89 ModelState.AddModelError("numerFaktury", errFaktura); -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs
r971 r984 39 39 40 40 var id1 = Convert.ToInt32(payer.Id_faktury); 41 var platnosc= _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();41 var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); 42 42 43 var errorViewData = _paymentsUtils.IsError( platnosc, ControllerContext.HttpContext.User.Identity.Name);43 var errorViewData = _paymentsUtils.IsError(invoice, ControllerContext.HttpContext.User.Identity.Name); 44 44 if (!String.IsNullOrEmpty(errorViewData.Error)) 45 45 return View("Error1", errorViewData); 46 46 47 var merchant = _merchantHelper.CreateMerchantData( platnosc, payer, language, Session.SessionID);47 var merchant = _merchantHelper.CreateMerchantData(invoice, payer, language, Session.SessionID); 48 48 49 49 if (merchant == null || !String.IsNullOrEmpty(merchant.Error)) -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs
r978 r984 43 43 var id1 = ConvertId(id); 44 44 45 var platnosc= _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();45 var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); 46 46 47 var errorViewData = _paymentsUtils.IsError( platnosc, HttpContext.User.Identity.Name);47 var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name); 48 48 if (!String.IsNullOrEmpty(errorViewData.Error)) 49 49 return View("Error1", errorViewData); 50 50 51 var invoiceDeatailsViewData = InitInvoiceDetailsViewData( platnosc);51 var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice); 52 52 53 var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); 53 var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1); //szukamy uregulowanej faktury 54 54 if (tablicaPotwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana 55 55 { 56 56 var dataZaplaty = String.Format("{0:dd-MM-yyyy}", tablicaPotwierdzenia[0].AUTHTIME); 57 invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), platnosc.Faktura_Numer, dataZaplaty);57 invoiceDeatailsViewData.Info = String.Format(_translateManager.Translate("tlumaczenia", "zaplacono"), invoice.Faktura_Numer, dataZaplaty); 58 58 invoiceDeatailsViewData.Termin = dataZaplaty; 59 59 return View("Paid", invoiceDeatailsViewData); … … 80 80 if (ModelState.IsValid == false) 81 81 { 82 var platnosc= _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();83 var errorViewData = _paymentsUtils.IsError( platnosc, HttpContext.User.Identity.Name);82 var invoice = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault(); 83 var errorViewData = _paymentsUtils.IsError(invoice, HttpContext.User.Identity.Name); 84 84 85 85 if (!String.IsNullOrEmpty(errorViewData.Error)) 86 86 return View("Error1", errorViewData); 87 87 88 return View("Show", InitInvoiceDetailsViewData( platnosc));88 return View("Show", InitInvoiceDetailsViewData(invoice)); 89 89 } 90 90 return RedirectToAction("Merchant", "Merchant", payer); … … 96 96 _paymentsUtils.SetLanguage(language); 97 97 var id1 = ConvertId(id); 98 var platnosc= _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();98 var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); 99 99 100 if ( platnosc== null)100 if (invoice == null) 101 101 return View("Error1", _paymentsUtils.InitErrorViewData(_translateManager.Translate("tlumaczenia", "brakdanych"), 0)); 102 102 103 var invoiceDeatailsViewData = InitInvoiceDetailsViewData( platnosc);103 var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice); 104 104 105 105 //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc, … … 119 119 _paymentsUtils.SetLanguage(language); 120 120 var id1 = ConvertId(id); 121 var platnosc= _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();121 var invoice = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault(); 122 122 123 if ( platnosc== null)123 if (invoice == null) 124 124 return View("Error1", 125 125 _paymentsUtils.InitErrorViewData( 126 126 _translateManager.Translate("tlumaczenia", "brakdanych"), 0)); 127 127 128 var invoiceDeatailsViewData = InitInvoiceDetailsViewData( platnosc);128 var invoiceDeatailsViewData = InitInvoiceDetailsViewData(invoice); 129 129 return View(invoiceDeatailsViewData); 130 130 } … … 141 141 } 142 142 143 private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice platnosc)143 private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice invoice) 144 144 { 145 145 var invoiceDeatailsViewData = new InvoiceDetailsViewData(); 146 invoiceDeatailsViewData.Invoice = platnosc;147 invoiceDeatailsViewData.Payer = InitPayer( platnosc.ID_faktury);148 invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString( platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);146 invoiceDeatailsViewData.Invoice = invoice; 147 invoiceDeatailsViewData.Payer = InitPayer(invoice.ID_faktury); 148 invoiceDeatailsViewData.Brutto = _paymentsUtils.BruttoToString(invoice.Brutto, invoice.waluta_brutto, invoice.waluta_miano); 149 149 return invoiceDeatailsViewData; 150 150 } … … 158 158 public void UpdateStatus(int ordernumber, string currentstate) 159 159 { 160 var p latnosc= _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();160 var payment = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault(); 161 161 162 if (p latnosc!= null && currentstate == ISPAID)162 if (payment != null && currentstate == ISPAID) 163 163 { 164 p latnosc.Status = true;165 p latnosc.Status_data = DateTime.Now;164 payment.Status = true; 165 payment.Status_data = DateTime.Now; 166 166 _repPayment.SubmitChanges(); 167 167 } … … 170 170 public int CheckConfirm(int idfaktury, int order) 171 171 { 172 var p l= _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();172 var payment = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault(); 173 173 174 if (p l!= null)174 if (payment != null) 175 175 { 176 176 var confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault(); -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs
r971 r984 94 94 throw new ArgumentNullException("merchant"); 95 95 96 var p latnosc= _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();96 var payment = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault(); 97 97 98 if (p latnosc== null)98 if (payment == null) 99 99 merchant.Hash = HASH_ERROR_INFO; 100 100 else 101 101 { 102 var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + p latnosc.ORDERNUMBER;102 var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + payment.ORDERNUMBER; 103 103 var req = (HttpWebRequest)WebRequest.Create(adres); 104 var dane = "&orderDescription=&amount=" + p latnosc.AMOUNT;105 dane += "¤cy=" + p latnosc.CURRENCY;104 var dane = "&orderDescription=&amount=" + payment.AMOUNT; 105 dane += "¤cy=" + payment.CURRENCY; 106 106 dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password); 107 107 -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs
r971 r984 40 40 _translateManager = translate; 41 41 } 42 public string BruttoToString(decimal? kwota, decimal? waluta , string miano)42 public string BruttoToString(decimal? kwota, decimal? waluta_brutto, string miano) 43 43 { 44 44 var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN "; 45 45 46 46 if (!String.IsNullOrEmpty(miano)) 47 if (waluta > 0 && miano.ToUpper() != "PLN")48 brutto += "(" + (waluta .ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";47 if (waluta_brutto > 0 && miano.ToUpper() != "PLN") 48 brutto += "(" + (waluta_brutto.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")"; 49 49 50 50 return brutto; 51 51 } 52 52 53 public bool UserIdentity(Invoice platnosc, string userName)53 public bool UserIdentity(Invoice invoice, string userName) 54 54 { 55 return platnosc != null && platnosc.nip == userName;55 return invoice != null && invoice.nip == userName; 56 56 } 57 57 58 public Waluta SetAmount(Invoice platnosc)58 public Waluta SetAmount(Invoice invoice) 59 59 { 60 var waluta = new Waluta {Currency = GetCurrency( platnosc.waluta_miano)};60 var waluta = new Waluta {Currency = GetCurrency(invoice.waluta_miano)}; 61 61 62 waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32( platnosc.Brutto * 100) : Convert.ToInt32(platnosc.waluta_brutto * 100);62 waluta.Amount = waluta.Currency == PLN ? Convert.ToInt32(invoice.Brutto * 100) : Convert.ToInt32(invoice.waluta_brutto * 100); 63 63 64 64 return waluta; … … 144 144 return er; 145 145 } 146 public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId)146 public PlatnosciEcard CreateAndAddNewPyment(Invoice invoice, Waluta waluta, Payer payer, string sessionId) 147 147 { 148 var newPayment = new PlatnosciEcard();149 newPayment.IDFaktury = platnosc.ID_faktury;150 newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;151 newPayment.nip = platnosc.nip;152 newPayment.nrZlecenia = "";153 newPayment.AMOUNT = waluta.Amount;154 newPayment.CURRENCY = waluta.Currency;155 newPayment.SESSIONID = sessionId;156 newPayment.NAME = payer.FirstName;157 newPayment.SURNAME = payer.LastName;158 newPayment.AUTODEPOSIT = true;159 newPayment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard160 newPayment.CHARSET = KODOWANIE;161 newPayment.COUNTRY = KOD_POLSKA;162 newPayment.JS = true;163 newPayment.PAYMENTTYPE = CARDS;164 newPayment.Data = DateTime.Now;165 newPayment.Status = null;166 newPayment.Status_data = null;148 var payment = new PlatnosciEcard(); 149 payment.IDFaktury = invoice.ID_faktury; 150 payment.ORDERDESCRIPTION = invoice.Faktura_Numer; 151 payment.nip = invoice.nip; 152 payment.nrZlecenia = ""; 153 payment.AMOUNT = waluta.Amount; 154 payment.CURRENCY = waluta.Currency; 155 payment.SESSIONID = sessionId; 156 payment.NAME = payer.FirstName; 157 payment.SURNAME = payer.LastName; 158 payment.AUTODEPOSIT = true; 159 payment.LANGUAGE = GetLanguage(); //ustawiamy jezyk, w ktorym ma byc wyświetlany formularz na stronie eCard 160 payment.CHARSET = KODOWANIE; 161 payment.COUNTRY = KOD_POLSKA; 162 payment.JS = true; 163 payment.PAYMENTTYPE = CARDS; 164 payment.Data = DateTime.Now; 165 payment.Status = null; 166 payment.Status_data = null; 167 167 168 _repPayment.Insert( newPayment);169 return newPayment;168 _repPayment.Insert(payment); 169 return payment; 170 170 } 171 171 172 public ErrorViewData IsError(Invoice platnosc, String userName)172 public ErrorViewData IsError(Invoice invoice, String userName) 173 173 { 174 174 var errortxt = ""; 175 175 176 if ( platnosc== null)176 if (invoice == null) 177 177 errortxt = _translateManager.Translate("tlumaczenia", "brakdanych"); 178 else if (!UserIdentity( platnosc, userName))178 else if (!UserIdentity(invoice, userName)) 179 179 errortxt = _translateManager.Translate("tlumaczenia", "weryfikacja"); 180 180
