Zbiór zmian 952 dla trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs

Data:

2009-12-15 14:06:23 (16 years ago)

Autor:

alina

Opis:

re #215 testy i male przerobki (zmiana logo itp.)

Pliki:

• trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs (zmodyfikowane) (4 diffs)

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

@@ -1 +1 @@
 using System;
 using System.Web;
-using Platnosci.Core.Linq;
-using System.Configuration;
-using Platnosci.Core.Interface;
 using System.Net;
 using System.IO;
 using System.Linq;
 using System.Web.Mvc;
+using System.Configuration;
+using Platnosci.Core.Linq;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Models
@@ -20 +20 @@
         {
             _repPayment = repPayment;
-            _funkcjePlatnosci = new FunkcjePlatnosci();
+            _funkcjePlatnosci = new FunkcjePlatnosci(_repPayment);
         }
 
@@ -41 +41 @@
         public Merchant CreateMerchantData(vPlatnosciEcard invoice, Payer payer, string lang, string sessionId)
         {
+            var merchant = new Merchant();
+           
             var waluta = _funkcjePlatnosci.SetAmount(invoice);
-            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, _repPayment, sessionId);
+            var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
 
-            var merchant = new Merchant();
             merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
             if (ConfigurationManager.AppSettings["wersja"] == "TEST")
@@ -66 +67 @@
             merchant.LinkOk = linkOk;
             merchant.LinkFail = linkFail;
+
+            if (merchant != null) merchant.IsValid();
 
             return merchant;