Zbiór zmian 957

Data:

2009-12-21 11:02:46 (16 years ago)

Autor:

alina

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Tests/Web/Function.cs (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (zmodyfikowane) (3 diffs)
• Platnosci.Tests/Web/MerchantControllerTests.cs (zmodyfikowane) (3 diffs)
• Platnosci.Tests/Web/TestMethods.cs (zmodyfikowane) (3 diffs)
• Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
• Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (2 diffs)
• Platnosci/Models/FunkcjePlatnosci.cs (zmodyfikowane) (3 diffs)
• Platnosci/Models/eCardData.cs (zmodyfikowane) (3 diffs)

trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs

@@ -27 +27 @@
             platnosc.Brutto = brutto;
             platnosc.waluta_brutto = walutaBrutto;
-            platnosc.waluta_miano = currency;
+            platnosc.waluta_miano = currency.ToUpper();
             platnosc.SystemKsiegowyId = systemKsiegowy;
            

trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using NUnit.Framework;
+using Platnosci.Models;
+using Platnosci.Core.Linq;
+using Platnosci.Core.Interface;
 
-using NUnit.Framework;
-
-using Platnosci.Models;
 
 namespace Platnosci.Tests.Web
@@ -13 +14 @@
     class FunkcjePlatnosciTests
     {
+        private readonly Function _function = new Function();
+        private readonly ITranslateManager _translateManager = new FakeTranslation();
+
         [Test, Sequential]
         [Category("Unit")]
@@ -24 +28 @@
             Assert.That(result, Is.EqualTo(output));
         }
+        [Test]
+        [Category("Unit")]
+        public void TestMethodCreateAndAddNewPaymentOk()
+        {
+            var idFaktury = 123;
+            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
+            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
+            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
+            var payer = _function.CreatePayer(idFaktury, "test", "test");
+            var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN };
+            var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
+
+            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
+            Assert.That(payment.IDFaktury, Is.EqualTo(idFaktury));
+        }
     }
 }

trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs

@@ -22 +22 @@
             vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0);
             repVPayment.Insert(platnosc);
-
+            
             Payer payer = _function.CreatePayer(123, "test", "test");
-
-            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            
+            var controller = new MerchantController(repVPayment, null, _translateManager);
             controller.ControllerContext = _function.CreateControllerContext("nip2");
 
-            var result = controller.Show(payer, "pl") as ViewResult;
+            var result = controller.Merchant(payer, "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
@@ -44 +44 @@
             Payer payer = _function.CreatePayer(123, "test", "test");
 
-            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            var controller = new MerchantController(repVPayment, null, _translateManager);
             controller.ControllerContext = _function.CreateControllerContext("nip2");
 
-            var result = controller.Show(payer, "pl") as ViewResult;
+            var result = controller.Merchant(payer, "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
@@ -71 +71 @@
             var payment = repPayment.FindOne(i => i.IDFaktury == idFaktury);
 
-            System.Diagnostics.Debug.WriteLine(payment + " -- Faktura jest w EUR.");
+            System.Diagnostics.Debug.WriteLine("Faktura jest w EUR.");
             System.Diagnostics.Debug.WriteLine("PLN:" + amountPL + "," + " EUR:" + amountEUR);
             Assert.That(payment.AMOUNT, Is.EqualTo(amountEUR * 100));

trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs

@@ -1 +1 @@
 using NUnit.Framework;
 using Platnosci.Core.Linq;
-using Platnosci.Models;
-using System.Linq;
 using Platnosci.Core.Interface;
 
@@ -11 +9 @@
     {
         private readonly Function _function = new Function();
-        private readonly ITranslateManager _translateManager = new FakeTranslation();
 
         [Test]
@@ -27 +24 @@
             System.Diagnostics.Debug.WriteLine("Wartosc nip ma byc 'nip'. Jest " + pl.nip);
             Assert.That(pl.nip, Is.EqualTo("nip"));
-        }
-        [Test]
-        [Category("Unit")]
-        public void TestMethodCreateAndAddNewPaymentOk()
-        {
-            var idFaktury = 123;
-            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
-            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
-            var payer = _function.CreatePayer(idFaktury, "test", "test");
-            var waluta = new Waluta {Amount = 200, Currency = "PLN"};
-            var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta ,payer, "sessionId");
-
-            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
-            Assert.That(payment.IDFaktury, Is.EqualTo(idFaktury));
-        }
+        }        
 
     }

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

@@ -29 +29 @@
             _eCardData = new eCardData(_repPayment);
         }
-        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate, eCardData ecardData)
+        public MerchantController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, ITranslateManager translate)
         {
             _repVPayment = repVPayment;
             _repPayment = repPayment;
             _translateManager = translate;
-            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);            
-            _eCardData = ecardData;
+            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment, _translateManager);
+            _eCardData = new eCardData(_repPayment);
         }
-
         public ActionResult Merchant(Payer payer, string language)
         {

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

@@ -44 +44 @@
 
             var errorViewData = _funkcjePlatnosci.IsError(platnosc, HttpContext.User.Identity.Name);
-            if (!String.IsNullOrEmpty(errorViewData.Error)) return View("Error1", errorViewData);
+            if (!String.IsNullOrEmpty(errorViewData.Error)) 
+                return View("Error1", errorViewData);
             
             var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc);  
@@ -108 +109 @@
                 invoiceDeatailsViewData.info = _translateManager.Translate("tlumaczenia", "weryfikacja");
            
-            return View(invoiceDeatailsViewData);      
+            return View(invoiceDeatailsViewData);       
         }
         public ActionResult Fail(string id, string language) 

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

@@ -43 +43 @@
             var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
             
-            if (waluta > 0 && (miano != "" || miano != "PLN"))
-            {
-                brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano + ")";
-            }
+            if (waluta > 0 && (miano != "" || miano.ToUpper() != "PLN"))
+                brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
+
             return brutto;
         }
@@ -58 +57 @@
         {
             var waluta = new Waluta();
+            waluta.Currency = GetCurrency(platnosc.waluta_miano);
 
-            waluta.Currency = GetCurrency(platnosc.waluta_miano);
             if (waluta.Currency == PLN)
                 waluta.Amount = Convert.ToInt32(platnosc.Brutto * 100);
@@ -114 +113 @@
                     break;
             }
-
             return CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToLower();
         }

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

@@ -26 +26 @@
         {
             if (merchant == null) 
-                throw new ArgumentNullException("merchant");
+                throw new ArgumentNullException("parametr merchant is null in GetUrl method");
             
             var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION;
@@ -51 +51 @@
 
             merchant.Payment = newPayment;
-            getMerchantInfo(merchant);
+            GetMerchantInfo(merchant);
             SetHash(merchant);
 
@@ -72 +72 @@
             return merchant;
         }
-        public void getMerchantInfo(Merchant merchant)
+        public void GetMerchantInfo(Merchant merchant)
         {
             if (merchant.SystemKsiegowy == "2")