Pokaż
Ignoruj:
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
Pliki:
7 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

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

    r950 r970  
    33using System.Web.Mvc; 
    44using System.Web.Security; 
    5 using Platnosci.Core.Linq; 
     5using adMoto.Payments.Core; 
     6using adMoto.Payments.Core.Data; 
     7using adMoto.Payments.Core.Interfaces; 
    68using Platnosci.Models; 
    7 using Platnosci.Core.Interface; 
    89 
    910namespace Platnosci.Controllers 
    … …  
    1213    public class AccountController : Controller 
    1314    { 
    14         private readonly IRepository<vPlatnosciEcard> _repository; 
     15        private readonly IRepository<Invoice> _repository; 
    1516        private readonly FunkcjePlatnosci _funkcjePlatnosci; 
    1617 
    … …  
    2324        public AccountController() 
    2425        { 
    25             _repository = new Repository<vPlatnosciEcard>(new DataContext()); 
     26            _repository = new Repository<Invoice>(new DataContext()); 
    2627            FormsAuth = new FormsAuthenticationService(); 
    2728            _funkcjePlatnosci = new FunkcjePlatnosci(); 
    2829        } 
    2930 
    30         public AccountController(IFormsAuthentication formsAuth, IRepository<vPlatnosciEcard> repository, FunkcjePlatnosci func) 
     31        public AccountController(IFormsAuthentication formsAuth, IRepository<Invoice> repository, FunkcjePlatnosci func) 
    3132        { 
    3233            _repository = repository; 
    … …  
    5051        { 
    5152            _funkcjePlatnosci.SetLanguage(language); 
    52             var platnosc = new vPlatnosciEcard(); 
     53            var platnosc = new Invoice(); 
    5354            if (!ValidateLogOn(nip, numerFaktury)) 
    5455            { 

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

    r959 r970  
    22using System.Linq; 
    33using System.Web.Mvc; 
     4using adMoto.Payments.Core; 
     5using adMoto.Payments.Core.Data; 
     6using adMoto.Payments.Core.Interfaces; 
    47using Platnosci.Models; 
    5 using Platnosci.Core.Linq; 
    6 using Platnosci.Core.Interface; 
    7 using System.Configuration; 
    8 using System.Net; 
    9 using System.IO; 
    10 using System.Threading; 
    118 
    129namespace Platnosci.Controllers 
    … …  
    1512    public class MerchantController : Controller 
    1613    { 
    17         private readonly IRepository<vPlatnosciEcard> _repVPayment; 
     14        private readonly IRepository<Invoice> _repVPayment; 
    1815        private readonly IRepository<PlatnosciEcard> _repPayment;  
    1916        private readonly FunkcjePlatnosci _funkcjePlatnosci; 
    … …  
    2320        public MerchantController() 
    2421        { 
    25             _repVPayment = new Repository<vPlatnosciEcard>(new DataContext()); 
     22            _repVPayment = new Repository<Invoice>(new DataContext()); 
    2623            _repPayment = new Repository<PlatnosciEcard>(new DataContext()); 
    2724            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment); 
    … …  
    2926            _eCardData = new eCardData(_repPayment); 
    3027        } 
    31         public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate) 
     28        public MerchantController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate) 
    3229        { 
    3330            _repVPayment = repVPayment; 

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

    r969 r970  
    11using System; 
    22using System.Linq; 
    3 using System.Web; 
    43using System.Web.Mvc; 
     4using adMoto.Payments.Core; 
     5using adMoto.Payments.Core.Data; 
     6using adMoto.Payments.Core.Interfaces; 
    57using Elmah; 
    68using Platnosci.Models; 
    7 using Platnosci.Core.Linq; 
    8 using Platnosci.Core.Interface; 
    9 using ApplicationException=Elmah.ApplicationException; 
    109 
    1110namespace Platnosci.Controllers 
    1211{ 
    13  
    14     //[Authorize] 
    1512    public class PlatnoscController : Controller 
    1613    { 
    1714        public const string ISPAID = "payment_deposited";       //transakcja potwierdzona do rozliczenia 
    18         private readonly IRepository<vPlatnosciEcard> _repVPayment; 
     15        private readonly IRepository<Invoice> _repVPayment; 
    1916        private readonly IRepository<PlatnosciEcard> _repPayment; 
    2017        private readonly IRepository<PotwierdzeniaEcard> _repConfirm; 
    … …  
    2421        public PlatnoscController() 
    2522        { 
    26             _repVPayment = new Repository<vPlatnosciEcard>(new DataContext()); 
     23            _repVPayment = new Repository<Invoice>(new DataContext()); 
    2724            _repPayment = new Repository<PlatnosciEcard>(new DataContext()); 
    2825            _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext()); 
    … …  
    3027            _translateManager = new Translation(); 
    3128        } 
    32         public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate) 
     29        public PlatnoscController(IRepository<Invoice> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate) 
    3330        { 
    3431            _repVPayment = repVPayment; 
    … …  
    6461            return View(invoiceDeatailsViewData); 
    6562        } 
     63 
    6664        [Authorize] 
    6765        [AcceptVerbs(HttpVerbs.Post)] 
    … …  
    139137        public ActionResult Status() 
    140138        { 
    141             ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current); 
     139            if (System.Web.HttpContext.Current != null) 
     140                ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current); 
    142141 
    143142            var potwierdzenie = new PotwierdzeniaEcard(); 
    … …  
    201200        } 
    202201 
    203         private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc) 
     202        private InvoiceDetailsViewData InitInvoiceDetailsViewData(Invoice platnosc) 
    204203        { 
    205204            var invoiceDeatailsViewData = new InvoiceDetailsViewData(); 

  • trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs

    r966 r970  
    11using System; 
    22using System.Web; 
    3 using Platnosci.Core.Linq; 
    43using System.Threading; 
    54using System.Globalization; 
    65using System.Configuration; 
    76using System.Security.Principal; 
    8 using Platnosci.Core.Interface; 
     7using adMoto.Payments.Core; 
     8using adMoto.Payments.Core.Data; 
     9using adMoto.Payments.Core.Interfaces; 
    910 
    1011 
    … …  
    5051        } 
    5152 
    52         public bool UserIdentity(vPlatnosciEcard platnosc, string userName) 
     53        public bool UserIdentity(Invoice platnosc, string userName) 
    5354        { 
    5455            return platnosc != null && platnosc.nip == userName; 
    5556        } 
    5657 
    57         public Waluta SetAmount(vPlatnosciEcard platnosc) 
     58        public Waluta SetAmount(Invoice platnosc) 
    5859        { 
    5960            var waluta = new Waluta(); 
    … …  
    122123            var css = ConfigurationManager.AppSettings["Css"]; 
    123124 
    124             if (css == "truck")  
    125                 str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - "; 
    126             else if (css == "admoto")  
    127                 str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - "; 
     125            switch (css) 
     126            { 
     127                case "truck": 
     128                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresTruck") + " - "; 
     129                    break; 
     130                case "admoto": 
     131                    str = HttpContext.GetGlobalResourceObject("tlumaczenia", "adresAdmoto") + " - "; 
     132                    break; 
     133            } 
    128134 
    129135            return str; 
    … …  
    142148            return er; 
    143149        } 
    144         public PlatnosciEcard CreateAndAddNewPyment(vPlatnosciEcard platnosc, Waluta waluta, Payer payer, string sessionId) 
     150        public PlatnosciEcard CreateAndAddNewPyment(Invoice platnosc, Waluta waluta, Payer payer, string sessionId) 
    145151        { 
    146152            var newPayment = new PlatnosciEcard(); 
    … …  
    167173            return newPayment; 
    168174        } 
    169         public ErrorViewData IsError(vPlatnosciEcard platnosc, String UserName) 
     175 
     176        public ErrorViewData IsError(Invoice platnosc, String UserName) 
    170177        { 
    171178            var errortxt = ""; 
    … …  
    178185            return InitErrorViewData(errortxt, 0); 
    179186        } 
     187 
    180188        public string GetLanguage() 
    181189        { 
    182             string language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); 
     190            var language = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); 
    183191             
    184192            if (language != "PL" && language != "EN" && language != "DE") 
    185193                return "PL";  //domyślny jezyk, w ktorym ma byc wyświetlony formularz na stronie eCard 
    186             else  
    187                 return language; 
     194             
     195            return language; 
    188196        } 
    189197    } 

  • trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs

    r951 r970  
    1 using System; 
    2 using System.Collections.Generic; 
    3 using System.Linq; 
    4 using System.Web; 
    5 using System.Web.Mvc; 
    6 using Platnosci.Core.Linq; 
    7  
     1using adMoto.Payments.Core; 
     2using adMoto.Payments.Core.Data; 
    83 
    94namespace Platnosci.Models 
    … …  
    116    public class InvoiceDetailsViewData 
    127    { 
    13         public vPlatnosciEcard vPlatnosciEcard { get; set; } 
     8        public Invoice vPlatnosciEcard { get; set; } 
    149        public Payer Payer {get; set;} 
    1510        public string brutto { get; set; } 

  • trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs

    r968 r970  
    44using System.Linq; 
    55using System.Configuration; 
    6 using Platnosci.Core.Linq; 
    7 using Platnosci.Core.Interface; 
     6using adMoto.Payments.Core; 
     7using adMoto.Payments.Core.Data; 
     8using adMoto.Payments.Core.Interfaces; 
    89 
    910namespace Platnosci.Models 
    … …  
    3839            return dane; 
    3940        } 
    40         public Merchant CreateMerchantData(vPlatnosciEcard invoice, Payer payer, string lang, string sessionId) 
     41        public Merchant CreateMerchantData(Invoice invoice, Payer payer, string lang, string sessionId) 
    4142        { 
    4243            var merchant = new Merchant(); 

  • trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj

    r969 r970  
    129129  </ItemGroup> 
    130130  <ItemGroup> 
    131     <ProjectReference Include="..\Platnosci.Core\Platnosci.Core.csproj"> 
    132       <Project>{329506B5-F705-46AE-A31D-799141FEA70E}</Project> 
    133       <Name>Platnosci.Core</Name> 
    134     </ProjectReference> 
    135   </ItemGroup> 
    136   <ItemGroup> 
    137131    <Content Include="Content\admoto.css" /> 
    138132    <Content Include="Content\truck.css" /> 
    … …  
    187181    <Content Include="Views\Platnosc\Paid.aspx" /> 
    188182    <Content Include="Views\Platnosc\Status.aspx" /> 
     183  </ItemGroup> 
     184  <ItemGroup> 
     185    <ProjectReference Include="..\adMoto.Payments.Core\adMoto.Payments.Core.csproj"> 
     186      <Project>{C14BEFFA-8EAC-4E07-AEB2-27D2B3E46469}</Project> 
     187      <Name>adMoto.Payments.Core</Name> 
     188    </ProjectReference> 
    189189  </ItemGroup> 
    190190  <ItemGroup>