Zbiór zmian 870 dla trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
- Data:
- 2009-11-03 16:06:42 (16 years ago)
- Pliki:
-
- 1 zmodyfikowane
-
trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (3 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
r868 r870 32 32 private string merchantId; 33 33 private readonly PlatnosciDataContext _context; 34 private readonly IRepository PE_rep;34 private readonly IRepository<PlatnosciEcard> _rep; 35 35 private FunkcjePlatnosci _func; 36 36 37 37 public MerchantController() 38 38 { 39 _rep = new Repository PlatnosciEcard();39 _rep = new Repository<PlatnosciEcard>(new DataContext1()); 40 40 _context = new PlatnosciDataContext(); 41 41 _func = new FunkcjePlatnosci(); … … 46 46 47 47 int id1 = Convert.ToInt32(payer.Id_faktury); 48 vPlatnosciEcard platnosc = _ context.FindInvoiceById(id1).SingleOrDefault();48 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); 49 49 50 50 if (!_func.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name)) … … 64 64 65 65 string hash = GetHash(newPayment, systemKs); 66 hash = hash.Replace("\n",""); 67 if (hash == BAD_HASH || hash == "" ) return View("Error"); 66 68 67 hash = hash.Replace("\n",""); 68 if (hash == BAD_HASH || hash == "" ) 69 { 70 return View("Error"); //nie mo¿na po³¹czyæ siê z serverem p³atnoci. Proszê spróbowaæ jeszcze raz. 71 } 72 if (platnosc.SystemKsiegowyId == 1) 73 merchantId = "170906000"; 74 else 75 merchantId = "171485000"; 69 if (systemKs == "1") merchantId = "170906000"; 70 else merchantId = "171485000"; 76 71 77 72 string link = ConfigurationManager.AppSettings["StatusLink"];
