Zbiór zmian 870 dla trunk/eCard/eCardMVC/Platnosci
- Data:
- 2009-11-03 16:06:42 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC/Platnosci/Controllers
- Pliki:
-
- 3 zmodyfikowane
-
AccountController.cs (zmodyfikowane) (2 diffs)
-
MerchantController.cs (zmodyfikowane) (3 diffs)
-
PlatnoscController.cs (zmodyfikowane) (6 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs
r866 r870 32 32 public AccountController() 33 33 { 34 _repository = new Repository<vPlatnosciEcard>( );34 _repository = new Repository<vPlatnosciEcard>(new DataContext1()); 35 35 FormsAuth = new FormsAuthenticationService(); 36 36 _context = new PlatnosciDataContext(); … … 65 65 else 66 66 { 67 var Login = _context.FindInvoiceByNipNumber(nip, numer_faktury).SingleOrDefault(); 67 var Login = _repository.FindInvoiceByNipNumber(nip, numer_faktury).SingleOrDefault(); 68 //_context.FindInvoiceByNipNumber(nip, numer_faktury).SingleOrDefault(); 68 69 platnosc = Login; 69 70 if (platnosc == null) return View(); -
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"]; -
trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
r868 r870 12 12 using System.Web.UI; 13 13 using System.Threading; 14 using System.Data.Linq; 15 using System.Web.Configuration; 14 16 15 17 namespace Platnosci.Controllers … … 19 21 { 20 22 private readonly PlatnosciDataContext _context; 21 private readonly IRepositoryPT _rep; 23 private readonly IDataContext _context1; 24 private readonly IRepository<PotwierdzeniaEcard> _rep; 25 private readonly IRep<PotwierdzeniaEcard> _repository; 22 26 private FunkcjePlatnosci _func; 23 27 28 24 29 public PlatnoscController() 25 30 { 26 31 _context = new PlatnosciDataContext(); 27 _rep = new Repository PotwierdzeniaEcard();32 _rep = new Repository<PotwierdzeniaEcard>(new DataContext1()); 28 33 _func = new FunkcjePlatnosci(); 34 } 35 public PlatnoscController(IDataContext datacontext){ 36 _rep = new Repository<PotwierdzeniaEcard>(datacontext); 37 _context1 = datacontext; 29 38 } 30 39 public ActionResult Show(string id, string language) … … 40 49 { 41 50 } 42 vPlatnosciEcard platnosc = _context.FindInvoiceById(id1).SingleOrDefault();43 51 52 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); 44 53 //sprawdzamy czy numer faktury dotyczy zalogowanego usera 45 54 ErrorViewData errorViewData = new ErrorViewData(); … … 55 64 } 56 65 57 var tablica_potwierdzenia = _ context.FindItemsByIdFaktury(id1);66 var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1); 58 67 if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana 59 68 { … … 83 92 { 84 93 } 85 vPlatnosciEcard platnosc = _ context.FindInvoiceById(id1).SingleOrDefault();94 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); 86 95 ErrorViewData errorViewData = new ErrorViewData(); 87 96 if (platnosc == null) … … 130 139 //id1=0 -> error type = platnoscIsNotExist; 131 140 } 132 vPlatnosciEcard platnosc = _ context.FindInvoiceById(id1).SingleOrDefault();141 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); 133 142 ErrorViewData errorViewData = new ErrorViewData(); 134 143 if (platnosc == null)
