Zbiór zmian 970 dla trunk/eCard/eCardMVC/Platnosci/Controllers

Data:

2009-12-23 11:26:06 (16 years ago)

Autor:

marek

Opis:

re #215 - dodanie nowego projektu z lepsza nazwa i typem projektu

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci/Controllers

Pliki:

• AccountController.cs (zmodyfikowane) (4 diffs)
• MerchantController.cs (zmodyfikowane) (4 diffs)
• PlatnoscController.cs (zmodyfikowane) (6 diffs)

trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs

@@ -3 +3 @@
 using System.Web.Mvc;
 using System.Web.Security;
-using Platnosci.Core.Linq;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
 using Platnosci.Models;
-using Platnosci.Core.Interface;
 
 namespace Platnosci.Controllers
@@ -12 +13 @@
     public class AccountController : Controller
     {
-        private readonly IRepository<vPlatnosciEcard> _repository;
+        private readonly IRepository<Invoice> _repository;
         private readonly FunkcjePlatnosci _funkcjePlatnosci;
 
@@ -23 +24 @@
         public AccountController()
         {
-            _repository = new Repository<vPlatnosciEcard>(new DataContext());
+            _repository = new Repository<Invoice>(new DataContext());
             FormsAuth = new FormsAuthenticationService();
             _funkcjePlatnosci = new FunkcjePlatnosci();
         }
 
-        public AccountController(IFormsAuthentication formsAuth, IRepository<vPlatnosciEcard> repository, FunkcjePlatnosci func)
+        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, FunkcjePlatnosci func)
         {
             _repository = repository;
@@ -50 +51 @@
         {
             _funkcjePlatnosci.SetLanguage(language);
-            var platnosc = new vPlatnosciEcard();
+            var platnosc = new Invoice();
             if (!ValidateLogOn(nip, numerFaktury))
             {

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

@@ -2 +2 @@
 using System.Linq;
 using System.Web.Mvc;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
 using Platnosci.Models;
-using Platnosci.Core.Linq;
-using Platnosci.Core.Interface;
-using System.Configuration;
-using System.Net;
-using System.IO;
-using System.Threading;
 
 namespace Platnosci.Controllers
@@ -15 +12 @@
     public class MerchantController : Controller
     {
-        private readonly IRepository<vPlatnosciEcard> _repVPayment;
+        private readonly IRepository<Invoice> _repVPayment;
         private readonly IRepository<PlatnosciEcard> _repPayment; 
         private readonly FunkcjePlatnosci _funkcjePlatnosci;
@@ -23 +20 @@
         public MerchantController()
         {
-            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext());
+            _repVPayment = new Repository<Invoice>(new DataContext());
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
@@ -29 +26 @@
             _eCardData = new eCardData(_repPayment);
         }
-        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
+        public MerchantController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
         {
             _repVPayment = repVPayment;

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
 using Elmah;
 using Platnosci.Models;
-using Platnosci.Core.Linq;
-using Platnosci.Core.Interface;
-using ApplicationException=Elmah.ApplicationException;
 
 namespace Platnosci.Controllers
 {
-
-    //[Authorize]
     public class PlatnoscController : Controller
     {
         public const string ISPAID = "payment_deposited";       //transakcja potwierdzona do rozliczenia
-        private readonly IRepository<vPlatnosciEcard> _repVPayment;
+        private readonly IRepository<Invoice> _repVPayment;
         private readonly IRepository<PlatnosciEcard> _repPayment;
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
@@ -24 +21 @@
         public PlatnoscController()
         {
-            _repVPayment = new Repository<vPlatnosciEcard>(new DataContext());
+            _repVPayment = new Repository<Invoice>(new DataContext());
             _repPayment = new Repository<PlatnosciEcard>(new DataContext());
             _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext());
@@ -30 +27 @@
             _translateManager = new Translation();
         }
-        public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate)
+        public PlatnoscController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate)
         {
             _repVPayment = repVPayment;
@@ -64 +61 @@
             return View(invoiceDeatailsViewData);
         }
+
         [Authorize]
         [AcceptVerbs(HttpVerbs.Post)]
@@ -139 +137 @@
         public ActionResult Status()
         {
-            ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current);
+            if (System.Web.HttpContext.Current != null)
+                ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current);
 
             var potwierdzenie = new PotwierdzeniaEcard();
@@ -201 +200 @@
         }
 
-        private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc)
+        private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice platnosc)
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();