- Data:
- 2010-01-04 11:51:01 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC
- Pliki:
-
- 8 zmodyfikowane
-
adMoto.Payments.Test/Controllers/eCardControllerTests.cs (zmodyfikowane) (7 diffs)
-
adMoto.Payments.Test/UI/UIHelper.cs (zmodyfikowane) (4 diffs)
-
adMoto.Payments.Test/UI/eCardValidationTests.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Test/Utils/MerchantHelperTests.cs (zmodyfikowane) (2 diffs)
-
adMoto.Payments.Web/Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Models/MerchantHelper.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Models/PaymentsUtils.cs (zmodyfikowane) (1 diff)
-
adMoto.Payments.Web/Views/Platnosc/Form.aspx (zmodyfikowane) (3 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs
r988 r990 45 45 {"CURRENTSTATE", "4"}, 46 46 {"PREVIOUSSTATE", "5"}, 47 {"PAYMENTTYPE", " True"},48 {"EVENTTYPE", " False"},49 {"PAYMENTNUMBER", " True"},47 {"PAYMENTTYPE", "1"}, 48 {"EVENTTYPE", "0"}, 49 {"PAYMENTNUMBER", "1"}, 50 50 {"APPROVALCODE", "6"}, 51 51 {"VALIDATIONCODE", "7"}, … … 87 87 {"CURRENTSTATE", "4"}, 88 88 {"PREVIOUSSTATE", "5"}, 89 {"PAYMENTTYPE", " True"},90 {"EVENTTYPE", " False"},91 {"PAYMENTNUMBER", " True"},89 {"PAYMENTTYPE", "1"}, 90 {"EVENTTYPE", "0"}, 91 {"PAYMENTNUMBER", "1"}, 92 92 {"APPROVALCODE", "6"}, 93 93 {"VALIDATIONCODE", "7"}, … … 117 117 {"PREVIOUSSTATE", "5"}, 118 118 {"PAYMENTTYPE", "32hvhsvhv"}, 119 {"EVENTTYPE", " False"},120 {"PAYMENTNUMBER", " True"},119 {"EVENTTYPE", "0"}, 120 {"PAYMENTNUMBER", "1"}, 121 121 {"APPROVALCODE", "6"}, 122 122 {"VALIDATIONCODE", "7"}, … … 144 144 {"CURRENTSTATE", "4"}, 145 145 {"PREVIOUSSTATE", "5"}, 146 {"PAYMENTTYPE", " True"},146 {"PAYMENTTYPE", "1"}, 147 147 {"EVENTTYPE", "32hvhsvhv"}, 148 {"PAYMENTNUMBER", " True"},148 {"PAYMENTNUMBER", "1"}, 149 149 {"APPROVALCODE", "6"}, 150 150 {"VALIDATIONCODE", "7"}, … … 173 173 {"CURRENTSTATE", "4"}, 174 174 {"PREVIOUSSTATE", "5"}, 175 {"PAYMENTTYPE", " 32hvhsvhv"},176 {"EVENTTYPE", " False"},177 {"PAYMENTNUMBER", " True"},175 {"PAYMENTTYPE", "1"}, 176 {"EVENTTYPE", "0"}, 177 {"PAYMENTNUMBER", "1"}, 178 178 {"APPROVALCODE", "6"}, 179 179 {"VALIDATIONCODE", "7"}, … … 202 202 {"CURRENTSTATE", "4"}, 203 203 {"PREVIOUSSTATE", "5"}, 204 {"PAYMENTTYPE", " True"},205 {"EVENTTYPE", " False"},206 {"PAYMENTNUMBER", " True"},204 {"PAYMENTTYPE", "1"}, 205 {"EVENTTYPE", "0"}, 206 {"PAYMENTNUMBER", "1"}, 207 207 {"APPROVALCODE", "6"}, 208 208 {"VALIDATIONCODE", "76666"}, … … 218 218 Assert.That(_repConfirm.Count(), Is.EqualTo(0), "Should not have any items"); 219 219 Assert.That(result.Content.Contains("FALSE"), "Response should contain FALSE"); 220 Assert.That(result.Content.Contains("ArgumentException"), "Response should contain SqlException");220 Assert.That(result.Content.Contains("ArgumentException"), "Response should contain ArgumentException"); 221 221 } 222 222 -
trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/UIHelper.cs
r985 r990 39 39 }; 40 40 _repInvoices.Insert(invoices); 41 var invoice = _repInvoices.Find One(p => p.NUMER == 1 && p.NUMER_ROK == 1 && p.NUMER_ROZ == "SLJ" && p.ID_NABYWCY == 76131);41 var invoice = _repInvoices.Find(p => p.NUMER == 1 && p.NUMER_ROK == 1 && p.NUMER_ROZ == "SLJ" && p.ID_NABYWCY == 76131).FirstOrDefault(); 42 42 43 43 if (invoice != null) … … 51 51 _repInvoiceDetails.Insert(invoiceDetails); 52 52 53 var invoiceDetails2 = _repInvoiceDetails.Find One(p => p.ID_FAKTURY == invoiceDetails.ID_FAKTURY && p.SYMBOL_SWW == "TEST");53 var invoiceDetails2 = _repInvoiceDetails.Find(p => p.ID_FAKTURY == invoiceDetails.ID_FAKTURY && p.SYMBOL_SWW == "TEST").FirstOrDefault(); 54 54 55 55 if (invoiceDetails2 != null) … … 69 69 public void DeleteTestRecordsFromRepository(UIData uiData) 70 70 { 71 var invoice = _repInvoices.Find One(p => p.ID_FAKTURY == uiData.FAKTURA_ID);71 var invoice = _repInvoices.Find(p => p.ID_FAKTURY == uiData.FAKTURA_ID).FirstOrDefault(); 72 72 if (invoice != null) 73 73 _repInvoices.Delete(invoice); 74 74 75 var invoiceDetails = _repInvoiceDetails.Find One(p => p.ID_FAKTURA_DETAILS == uiData.FAKTURA_DETAIL_ID);75 var invoiceDetails = _repInvoiceDetails.Find(p => p.ID_FAKTURA_DETAILS == uiData.FAKTURA_DETAIL_ID).FirstOrDefault(); 76 76 if (invoiceDetails != null) 77 77 _repInvoiceDetails.Delete(invoiceDetails); … … 81 81 { 82 82 _repPayment = new Repository<PlatnosciEcard>(new DataContext()); 83 var payment = _repPayment.Find One(p => p.IDFaktury == uiData.FAKTURA_ID &&83 var payment = _repPayment.Find(p => p.IDFaktury == uiData.FAKTURA_ID && 84 84 p.NAME == uiData.Test_firstname && 85 85 p.SURNAME == uiData.Test_surname && 86 86 p.ORDERDESCRIPTION == uiData.Test_numer_faktury && 87 p.nip == uiData.Test_nip) ;87 p.nip == uiData.Test_nip).FirstOrDefault(); 88 88 89 89 if (payment != null) -
trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/eCardValidationTests.cs
r988 r990 89 89 { 90 90 var ie = new IE(adres); 91 ie.TextField(Find.ByName("EVENTTYPE")).TypeText("212 ");91 ie.TextField(Find.ByName("EVENTTYPE")).TypeText("212dsf"); 92 92 ie.Button(Find.ById("dalej")).Click(); 93 93 Assert.IsTrue(ie.ContainsText("FALSE")); -
trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantHelperTests.cs
r985 r990 1 1 using System; 2 using System.Linq; 2 3 using adMoto.Payments.Core; 3 4 using adMoto.Payments.Core.Data; … … 201 202 //Act 202 203 eCardData.CreateMerchantData(invoice, payer, "pl", "ahaah"); 203 var payment = repPayment.Find One(i => i.IDFaktury == idFaktury);204 var payment = repPayment.Find(i => i.IDFaktury == idFaktury).FirstOrDefault(); 204 205 205 206 //Assert -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/MerchantController.cs
r984 r990 36 36 public ActionResult Merchant(Payer payer, string language) 37 37 { 38 language =_paymentsUtils.SetLanguage(language);38 _paymentsUtils.SetLanguage(language); 39 39 40 40 var id1 = Convert.ToInt32(payer.Id_faktury); -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/MerchantHelper.cs
r984 r990 33 33 dane += "&LANGUAGE=" + merchant.Payment.LANGUAGE + "&CHARSET=ISO-8859-2"; 34 34 dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + merchant.Hash; 35 dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT= " + merchant.Payment.AUTODEPOSIT;35 dane += "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=1"; 36 36 dane += "&LINKFAIL=" + merchant.LinkFail + "&LINKOK=" + merchant.LinkOk; 37 37 dane += "&SESSIONID=" + merchant.Payment.SESSIONID; -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Models/PaymentsUtils.cs
r984 r990 83 83 } 84 84 85 public stringSetLanguage(string lang)85 public void SetLanguage(string lang) 86 86 { 87 if (lang == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) return; 88 89 string culture; 87 90 switch (lang) 88 91 { 92 case "en": 93 culture = "en-GB"; 94 break; 89 95 case "de": 90 case "en": 91 case "pl": 92 if (lang != Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToLower()) 93 { 94 var culture = "pl-PL"; 95 switch (lang) 96 { 97 case "pl": 98 culture = "pl-PL"; 99 break; 100 case "en": 101 culture = "en-US"; 102 break; 103 case "de": 104 culture = "de-DE"; 105 break; 106 } 107 108 Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); 109 Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture); 110 } 96 culture = "de-DE"; 97 break; 98 default: 99 culture = "pl-PL"; 111 100 break; 112 101 } 113 return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower(); 102 103 Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture); 104 Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture); 114 105 } 115 106 -
trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx
r985 r990 14 14 <tr> 15 15 <td>2. ORDERNUMBER: </td> 16 <td><%=Html.TextBox("ORDERNUMBER", Convert.ToInt32(1234))%></td>16 <td><%=Html.TextBox("ORDERNUMBER", 1234)%></td> 17 17 </tr> 18 18 <tr> … … 42 42 <tr> 43 43 <td>9. PAYMENTTYPE: </td> 44 <td><%=Html.TextBox("PAYMENTTYPE", Convert.ToBoolean(1))%></td>44 <td><%=Html.TextBox("PAYMENTTYPE", 1)%></td> 45 45 </tr> 46 46 <tr> … … 50 50 <tr> 51 51 <td>11. EVENTTYPE: </td> 52 <td><%=Html.TextBox("EVENTTYPE", Convert.ToBoolean(1))%></td>52 <td><%=Html.TextBox("EVENTTYPE", 1)%></td> 53 53 </tr> 54 54 <tr> 55 55 <td>12. PAYMENTNUMBER: </td> 56 <td><%=Html.TextBox("PAYMENTNUMBER", Convert.ToBoolean(1))%></td>56 <td><%=Html.TextBox("PAYMENTNUMBER", 1)%></td> 57 57 </tr> 58 58 <tr>
