Zbiór zmian 951 dla trunk/eCard/eCardMVC/Platnosci

Data:

2009-12-14 16:03:54 (16 years ago)

Autor:

alina

Opis:

re #215 dodanie testów, mała przebudowa akcji Merchant (wydzielenie funkcji)

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci

Pliki:

• Controllers/MerchantController.cs (zmodyfikowane) (5 diffs)
• Controllers/PlatnoscController.cs (zmodyfikowane) (5 diffs)
• Models/FunkcjePlatnosci.cs (zmodyfikowane) (4 diffs)
• Models/InvoiceDetailsViewData.cs (zmodyfikowane) (1 diff)
• Models/eCardData.cs (dodane)
• Platnosci.Web.csproj (zmodyfikowane) (3 diffs)
• Platnosci.Web.csproj.user (zmodyfikowane) (1 diff)

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

@@ -15 +15 @@
     public class MerchantController : Controller
     {
-        public const string BAD_HASH = "zlyHash";       //b³êdne has³o - odpowiedŸ z eCard
-        public const string CARDS = "CARDS";            //obs³uga tylko kart p³atniczych
-        public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
-        public const string KODOWANIE = "ISO-8859-2";
+        public const string BAD_HASH = "zlyHash";                  //b³êdne has³o - odpowiedŸ z eCard
         public const string HASH_ERROR_INFO = "payment not exist";
 
@@ -24 +21 @@
         private readonly IRepository<PlatnosciEcard> _repPayment; 
         private readonly FunkcjePlatnosci _funkcjePlatnosci;
+        private readonly eCardData _eCardData;
         private readonly ITranslateManager _translateManager;
 
@@ -32 +30 @@
             _funkcjePlatnosci = new FunkcjePlatnosci();
             _translateManager = new Translation();
+            _eCardData = new eCardData(_repPayment);
+        }
+        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate, eCardData ecardData)
+        {
+            _repVPayment = repVPayment;
+            _repPayment = repPayment;
+            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _translateManager = translate;
+            _eCardData = ecardData;
         }
 
         public ActionResult Merchant(Payer payer, string language)
         {
-            System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language);
             language = _funkcjePlatnosci.SetLanguage(language);
 
@@ -46 +52 @@
             
             if (!_funkcjePlatnosci.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name))
-                return View("Error1", IsError("weryfikacja", 0));           
+                return View("Error1", IsError("weryfikacja", 0));
 
-            var waluta = _funkcjePlatnosci.SetAmount(platnosc);
-            var newPayment = InitNewPayment(id1, platnosc, waluta, payer );            
-
-            var systemKs = platnosc.SystemKsiegowyId.ToString();
-            if (ConfigurationManager.AppSettings["wersja"] == "TEST")
-                systemKs = "2";
-
-            var createPayment = AddNewPayment(newPayment);
+            var merchant = _eCardData.CreateMerchantData(platnosc, payer, language, Session.SessionID);
             
-            if (createPayment == false)
+            if (merchant != null) merchant.IsValid();
+            
+            if (merchant == null || (merchant != null && (!String.IsNullOrEmpty(merchant.Error))))
                 return View("Error1", IsError("error_hash", payer.Id_faktury));
-
-            var merchant = getMerchantInfo(systemKs);
-           
-            var hash = GetHash(newPayment, merchant);
-            hash = hash.Replace("\n","");
-          
-            if (hash == BAD_HASH || hash == "" || hash == HASH_ERROR_INFO)
-                return View("Error1", IsError("error_hash", payer.Id_faktury));
-
-            //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
-            var orderek = _repPayment.GetOrdernumber(newPayment.ORDERDESCRIPTION, newPayment.IDFaktury, newPayment.Data);
-
-            var linkFail = ConfigurationManager.AppSettings["Strona"];
-            linkFail += "/" + language + ConfigurationManager.AppSettings["LinkFail"];
-            linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek;
-
-            var linkOk = ConfigurationManager.AppSettings["Strona"];
-            linkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"];
-            linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek;
-
-            if (merchant != null && !String.IsNullOrEmpty(merchant.Id))
-                SendRequest(newPayment, hash, merchant, linkFail, linkOk);
-            else 
-                return View("Error1", IsError("error_hash", payer.Id_faktury));
-
+            
+            var adres = _eCardData.GetUrl(merchant);
+            Response.Redirect(adres);           
             return new EmptyResult();          
-        }        
-        private PlatnosciEcard InitNewPayment(int id, vPlatnosciEcard platnosc, Waluta waluta, Payer payer)
-        {
-            var newPayment = new PlatnosciEcard();
-            newPayment.IDFaktury = id;
-            newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
-            newPayment.nip = platnosc.nip;
-            newPayment.nrZlecenia = "";
-            newPayment.AMOUNT = waluta.Amount;
-            newPayment.CURRENCY = waluta.Currency;
-            newPayment.SESSIONID = Session.SessionID;
-            newPayment.NAME = payer.FirstName;
-            newPayment.SURNAME = payer.LastName;
-            newPayment.AUTODEPOSIT = true;
-            newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); 
-            newPayment.CHARSET = KODOWANIE;
-            newPayment.COUNTRY = KOD_POLSKA;
-            newPayment.JS = true;
-            newPayment.PAYMENTTYPE = CARDS;
-            newPayment.Data = DateTime.Now;
-            newPayment.Status = null;
-            newPayment.Status_data = null;
-            return newPayment;
-        }
-        
-        private bool AddNewPayment(PlatnosciEcard platnosc)
-        {
-            if (platnosc != null)
-            {                
-                _repPayment.Insert(platnosc);
-                return true;
-            }
-            return false;
-        }
-
-        private string GetHash(PlatnosciEcard p, Merchant merchant)
-        {
-            var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data).First();
-
-            if (platnosc == null || merchant == null) return HASH_ERROR_INFO;
-
-            var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER;
-            var req = (HttpWebRequest)WebRequest.Create(adres);
-            var dane = "&orderDescription=&amount=" + platnosc.AMOUNT;
-            dane += "&currency=" + platnosc.CURRENCY;
-            dane += string.Format("&merchantId={0}&password={1}", merchant.Id, merchant.Password);
-
-            var bdata = System.Text.Encoding.ASCII.GetBytes(dane);
-            req.Method = "POST";
-            req.ContentType = "application/x-www-form-urlencoded";
-            req.ContentLength = dane.Length;
-
-            var reqStream = req.GetRequestStream();
-            reqStream.Write(bdata, 0, bdata.Length);
-            reqStream.Close();
-
-            var streamResponse = new StreamReader(req.GetResponse().GetResponseStream());
-            string strResponse = streamResponse.ReadToEnd();
-            streamResponse.Close();
-                     
-            return strResponse;
-        }
-
-        private void SendRequest(PlatnosciEcard m, string hash, Merchant merchant, string linkok, string linkfail)
-        {
-            var adres = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + m.ORDERDESCRIPTION;
-
-            var dane = "&AMOUNT=" + m.AMOUNT + "&CURRENCY=" + m.CURRENCY + "&ORDERNUMBER=" + m.ORDERNUMBER;
-            dane += "&NAME=" + m.NAME + "&SURNAME=" + m.SURNAME + "&LANGUAGE=" + m.LANGUAGE + "&CHARSET=ISO-8859-2";
-            dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=" + merchant.Id + "&AUTODEPOSIT=" + m.AUTODEPOSIT;
-            dane += "&LINKFAIL=" + linkfail + "&LINKOK=" + linkok + "&SESSIONID=" + m.SESSIONID;
-            Response.Redirect(adres + dane);
-        }
+        }         
         public ErrorViewData IsError(string errortxt, int idFaktury)
         {
@@ -166 +73 @@
             else if (errortxt == "error_hash")
                 errortxt = _translateManager.Translate("tlumaczenia", "error_hash");
+            else if (errortxt == "error_hash")
+                errortxt = _translateManager.Translate("tlumaczenia", "error_hash");
 
             return _funkcjePlatnosci.InitErrorViewData(errortxt, idFaktury);
         }
-        public Merchant getMerchantInfo( string systemKs)
-        {
-            var merchant = new Merchant();
-            if (systemKs == "2")
-            {
-                merchant.Id = "171485000";
-                merchant.Password = "ashSeth2";
-            }
-            else
-            {
-                merchant.Id = "170906000";
-                merchant.Password = "JaYpqfs0";
-            }              
-            return merchant;
-        }
+        
     }
 }

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

@@ -42 +42 @@
             var platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
-
-            var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
-            
-            var payer = InitPayer(platnosc.ID_faktury);
-            
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);  
+            
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);  
 
             var tablicaPotwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
@@ -80 +76 @@
             {
                 var kwota = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); 
-                var viewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota );
+                var viewData = InitInvoiceDetailsViewData(platnosc);
                 return View("Show",viewData); 
             }
@@ -99 +95 @@
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));            
             
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
 
             //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
@@ -119 +115 @@
             if (!String.IsNullOrEmpty(IsError(platnosc).Error)) return View("Error1", IsError(platnosc));
 
-            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
+            var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);
             return View(invoiceDeatailsViewData);
         }
@@ -169 +165 @@
         }
 
-        private static InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc, Payer payer, string status, string brutto )
+        private InvoiceDetailsViewData InitInvoiceDetailsViewData(vPlatnosciEcard platnosc)
         {
             var invoiceDeatailsViewData = new InvoiceDetailsViewData();
             invoiceDeatailsViewData.vPlatnosciEcard = platnosc;
-            invoiceDeatailsViewData.Payer = payer;
-            invoiceDeatailsViewData.Status = status;
-            invoiceDeatailsViewData.brutto = brutto;
+            invoiceDeatailsViewData.Payer = InitPayer(platnosc.ID_faktury);
+            invoiceDeatailsViewData.brutto = _funkcjePlatnosci.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano);
             return invoiceDeatailsViewData;
         }

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

@@ -6 +6 @@
 using System.Configuration;
 using System.Security.Principal;
+using Platnosci.Core.Interface;
 
 
@@ -16 +17 @@
         private const string USD = "789";
         private const string PLN = "985";
+        public const string CARDS = "CARDS";            //obsługa tylko kart płatniczych
+        public const string KOD_POLSKA = "616";         //kod kraju Akceptanta - Polska
+        public const string KODOWANIE = "ISO-8859-2";
 
         public string BruttoToString(decimal? kwota, decimal? waluta, string miano)
@@ -39 +43 @@
             if (!String.IsNullOrEmpty(platnosc.waluta_miano) && platnosc.waluta_miano != "PLN")
             {
+                waluta.Amount = Convert.ToInt32(platnosc.waluta_brutto * 100);
                 switch (platnosc.waluta_miano)
                 {
@@ -118 +123 @@
             return er;
         }
+        public PlatnosciEcard CreateAndAddNewPyment(vPlatnosciEcard platnosc, Waluta waluta, Payer payer, IRepository<PlatnosciEcard> _repPayment, string sessionId)
+        {
+            var newPayment = new PlatnosciEcard();
+            newPayment.IDFaktury = platnosc.ID_faktury;
+            newPayment.ORDERDESCRIPTION = platnosc.Faktura_Numer;
+            newPayment.nip = platnosc.nip;
+            newPayment.nrZlecenia = "";
+            newPayment.AMOUNT = waluta.Amount;
+            newPayment.CURRENCY = waluta.Currency;
+            newPayment.SESSIONID = sessionId;
+            newPayment.NAME = payer.FirstName;
+            newPayment.SURNAME = payer.LastName;
+            newPayment.AUTODEPOSIT = true;
+            newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper();
+            newPayment.CHARSET = KODOWANIE;
+            newPayment.COUNTRY = KOD_POLSKA;
+            newPayment.JS = true;
+            newPayment.PAYMENTTYPE = CARDS;
+            newPayment.Data = DateTime.Now;
+            newPayment.Status = null;
+            newPayment.Status_data = null;
 
+            if (newPayment != null)
+            {
+                _repPayment.Insert(newPayment);
+                return newPayment;
+            }
+            return null;
+        }
     }
 }

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

@@ -13 +13 @@
         public vPlatnosciEcard vPlatnosciEcard { get; set; }
         public Payer Payer {get; set;}
-        public string Status { get; set; }
         public string brutto { get; set; }
         public string termin { get; set; }

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

@@ -60 +60 @@
   <ItemGroup>
     <Compile Include="App_GlobalResources\tlumaczenia.de.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
       <DependentUpon>tlumaczenia.de.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
     </Compile>
     <Compile Include="App_GlobalResources\tlumaczenia.fr.designer.cs">
@@ -99 +99 @@
     <Compile Include="Models\ErrorViewData.cs" />
     <Compile Include="Models\InvoiceDetailsViewData.cs" />
+    <Compile Include="Models\eCardData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -162 +163 @@
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App_GlobalResources\tlumaczenia.fr.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>tlumaczenia.fr.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
     <Content Include="App_GlobalResources\tlumaczenia.de.resx">
       <Generator>GlobalResourceProxyGenerator</Generator>
       <LastGenOutput>tlumaczenia.de.designer.cs</LastGenOutput>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_GlobalResources\tlumaczenia.fr.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>tlumaczenia.fr.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="App_GlobalResources\tlumaczenia.it.resx">
       <Generator>GlobalResourceProxyGenerator</Generator>

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

@@ -1 +1 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <ProjectExtensions>