Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/adMoto.Payments.Web.csproj
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/adMoto.Payments.Web.csproj (revision 976)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/adMoto.Payments.Web.csproj (revision 977)
@@ -89,4 +89,5 @@
+
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx (revision 949)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Views/Platnosc/Form.aspx (revision 977)
@@ -16,8 +16,8 @@
7. BIN: <%=Html.TextBox("BIN","1234")%>
8. COMMTYPE: <%=Html.TextBox("COMMTYPE","anbjbj")%>
-
9. PAYMENTTYPE: <%=Html.TextBox("PAYMENTTYPE","True")%>
-
10. DATATRANSMISJI: <%=Html.TextBox("DATATRANSMISJI")%>
-
11. EVENTTYPE: <%=Html.TextBox("EVENTTYPE","True")%>
-
12. PAYMENTNUMBER: <%=Html.TextBox("PAYMENTNUMBER","True")%>
+
9. PAYMENTTYPE: <%=Html.TextBox("PAYMENTTYPE","1")%>
+
10. DATATRANSMISJI: <%=Html.TextBox("DATATRANSMISJI", DateTime.Now)%>
+
11. EVENTTYPE: <%=Html.TextBox("EVENTTYPE","1")%>
+
12. PAYMENTNUMBER: <%=Html.TextBox("PAYMENTNUMBER","1")%>
13. PREVIOUSSTATE: <%=Html.TextBox("PREVIOUSSTATE","shshshhs")%>
14. TYPE: <%=Html.TextBox("TYPE","20") %>
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Global.asax.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Global.asax.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Global.asax.cs (revision 977)
@@ -16,5 +16,5 @@
"eCard",
"eCard/Status.aspx",
- new { controller = "Platnosc", action = "Status" }
+ new { controller = "eCard", action = "Status" }
);
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/eCardController.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/eCardController.cs (revision 977)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/eCardController.cs (revision 977)
@@ -0,0 +1,65 @@
+using System;
+using System.Web.Mvc;
+using adMoto.Payments.Core;
+using adMoto.Payments.Core.Data;
+using adMoto.Payments.Core.Interfaces;
+using Elmah;
+
+namespace adMoto.Payments.Web.Controllers
+{
+// ReSharper disable InconsistentNaming
+ public class eCardController : Controller
+// ReSharper restore InconsistentNaming
+ {
+ private readonly IRepository _eCardRepository;
+
+ public eCardController()
+ {
+ _eCardRepository = new Repository(new DataContext());
+ }
+
+ public eCardController(IRepository eCardRepository)
+ {
+ _eCardRepository = eCardRepository;
+ }
+
+ public ActionResult Status()
+ {
+ var content = new ContentResult();
+
+ try
+ {
+ if (System.Web.HttpContext.Current != null)
+ ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current);
+
+ var potwierdzenie = new PotwierdzeniaEcard();
+
+ potwierdzenie.MERCHANTNUMBER = Request["MERCHANTNUMBER"];
+ potwierdzenie.ORDERNUMBER = Convert.ToInt32(Request["ORDERNUMBER"]);
+ potwierdzenie.COMMTYPE = Request["COMMTYPE"];
+ potwierdzenie.CURRENTSTATE = Request["CURRENTSTATE"];
+ potwierdzenie.PREVIOUSSTATE = Request["PREVIOUSSTATE"];
+ potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Convert.ToInt32(Request["PAYMENTTYPE"]));
+ potwierdzenie.EVENTTYPE = Convert.ToBoolean(Convert.ToInt32(Request["EVENTTYPE"]));
+ potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Convert.ToInt32(Request["PAYMENTNUMBER"]));
+ potwierdzenie.APPROVALCODE = Request["APPROVALCODE"];
+ potwierdzenie.VALIDATIONCODE = Request["VALIDATIONCODE"];
+ potwierdzenie.BIN = Request["BIN"];
+ potwierdzenie.AUTHTIME = Convert.ToDateTime(Request["AUTHTIME"]);
+ potwierdzenie.TYPE = Request["TYPE"];
+ potwierdzenie.WITHCVC = Request["WITHCVC"];
+
+ _eCardRepository.Insert(potwierdzenie);
+
+ content.Content = "OK";
+ }
+ catch (Exception ex)
+ {
+ ErrorSignal.FromCurrentContext().Raise(ex);
+ content.Content = "FALSE " + ex.Message + " " + ex.GetType();
+ }
+
+ return content;
+ }
+ }
+}
Index: /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 971)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Web/Controllers/PlatnoscController.cs (revision 977)
@@ -135,62 +135,62 @@
}
- public ActionResult Status()
- {
- if (System.Web.HttpContext.Current != null)
- ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current);
-
- var potwierdzenie = new PotwierdzeniaEcard();
- var content = new ContentResult();
- try
- {
- if (!String.IsNullOrEmpty(Request["APPROVALCODE"]))
- potwierdzenie.APPROVALCODE = Request["APPROVALCODE"];
- if (!String.IsNullOrEmpty(Request["AUTHTIME"]))
- potwierdzenie.AUTHTIME = Convert.ToDateTime(Request["AUTHTIME"]);
- if (!String.IsNullOrEmpty(Request["BIN"])) potwierdzenie.BIN = Request["BIN"];
- if (!String.IsNullOrEmpty(Request["COMMTYPE"])) potwierdzenie.COMMTYPE = Request["COMMTYPE"];
- if (!String.IsNullOrEmpty(Request["CURRENTSTATE"]))
- potwierdzenie.CURRENTSTATE = Request["CURRENTSTATE"];
- if (!String.IsNullOrEmpty(Request["DATATRANSMISJI"]))
- potwierdzenie.DATATRANSMISJI = Convert.ToDateTime(Request["DATATRANSMISJI"]);
- if (!String.IsNullOrEmpty(Request["EVENTTYPE"]))
- potwierdzenie.EVENTTYPE = Convert.ToBoolean(Request["EVENTTYPE"]);
- if (!String.IsNullOrEmpty(Request["MERCHANTNUMBER"]))
- potwierdzenie.MERCHANTNUMBER = Request["MERCHANTNUMBER"];
- if (!String.IsNullOrEmpty(Request["ORDERNUMBER"]))
- potwierdzenie.ORDERNUMBER = Convert.ToInt32(Request["ORDERNUMBER"]);
- if (!String.IsNullOrEmpty(Request["PAYMENTNUMBER"]))
- potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Request["PAYMENTNUMBER"]);
- if (!String.IsNullOrEmpty(Request["PAYMENTTYPE"]))
- potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Request["PAYMENTTYPE"]);
- if (!String.IsNullOrEmpty(Request["PREVIOUSSTATE"]))
- potwierdzenie.PREVIOUSSTATE = Request["PREVIOUSSTATE"];
- if (!String.IsNullOrEmpty(Request["TYPE"])) potwierdzenie.TYPE = Request["TYPE"];
- if (!String.IsNullOrEmpty(Request["VALIDATIONCODE"]))
- potwierdzenie.VALIDATIONCODE = Request["VALIDATIONCODE"];
- if (!String.IsNullOrEmpty(Request["WITHCVC"])) potwierdzenie.WITHCVC = Request["WITHCVC"];
-
- if (!potwierdzenie.ORDERNUMBER.HasValue || potwierdzenie.ORDERNUMBER.Value <= 0)
- {
- content.Content = "FALSE";
- return content;
- }
-
- _repConfirm.Insert(potwierdzenie);
-
- if (potwierdzenie.ORDERNUMBER.HasValue)
- UpdateStatus(potwierdzenie.ORDERNUMBER.Value, potwierdzenie.CURRENTSTATE);
-
- content.Content = "OK";
- }
- catch (Exception ex)
- {
- ErrorSignal.FromCurrentContext().Raise(ex);
-
- content.Content = "FALSE " + ex.Message + " " + ex.GetType();
- }
-
- return content;
- }
+ //public ActionResult Status()
+ //{
+ // if (System.Web.HttpContext.Current != null)
+ // ErrorSignal.FromCurrentContext().Raise(new Exception(), System.Web.HttpContext.Current);
+
+ // var potwierdzenie = new PotwierdzeniaEcard();
+ // var content = new ContentResult();
+ // try
+ // {
+ // if (!String.IsNullOrEmpty(Request["APPROVALCODE"]))
+ // potwierdzenie.APPROVALCODE = Request["APPROVALCODE"];
+ // if (!String.IsNullOrEmpty(Request["AUTHTIME"]))
+ // potwierdzenie.AUTHTIME = Convert.ToDateTime(Request["AUTHTIME"]);
+ // if (!String.IsNullOrEmpty(Request["BIN"])) potwierdzenie.BIN = Request["BIN"];
+ // if (!String.IsNullOrEmpty(Request["COMMTYPE"])) potwierdzenie.COMMTYPE = Request["COMMTYPE"];
+ // if (!String.IsNullOrEmpty(Request["CURRENTSTATE"]))
+ // potwierdzenie.CURRENTSTATE = Request["CURRENTSTATE"];
+ // if (!String.IsNullOrEmpty(Request["DATATRANSMISJI"]))
+ // potwierdzenie.DATATRANSMISJI = Convert.ToDateTime(Request["DATATRANSMISJI"]);
+ // if (!String.IsNullOrEmpty(Request["EVENTTYPE"]))
+ // potwierdzenie.EVENTTYPE = Convert.ToBoolean(Request["EVENTTYPE"]);
+ // if (!String.IsNullOrEmpty(Request["MERCHANTNUMBER"]))
+ // potwierdzenie.MERCHANTNUMBER = Request["MERCHANTNUMBER"];
+ // if (!String.IsNullOrEmpty(Request["ORDERNUMBER"]))
+ // potwierdzenie.ORDERNUMBER = Convert.ToInt32(Request["ORDERNUMBER"]);
+ // if (!String.IsNullOrEmpty(Request["PAYMENTNUMBER"]))
+ // potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Request["PAYMENTNUMBER"]);
+ // if (!String.IsNullOrEmpty(Request["PAYMENTTYPE"]))
+ // potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Request["PAYMENTTYPE"]);
+ // if (!String.IsNullOrEmpty(Request["PREVIOUSSTATE"]))
+ // potwierdzenie.PREVIOUSSTATE = Request["PREVIOUSSTATE"];
+ // if (!String.IsNullOrEmpty(Request["TYPE"])) potwierdzenie.TYPE = Request["TYPE"];
+ // if (!String.IsNullOrEmpty(Request["VALIDATIONCODE"]))
+ // potwierdzenie.VALIDATIONCODE = Request["VALIDATIONCODE"];
+ // if (!String.IsNullOrEmpty(Request["WITHCVC"])) potwierdzenie.WITHCVC = Request["WITHCVC"];
+
+ // if (!potwierdzenie.ORDERNUMBER.HasValue || potwierdzenie.ORDERNUMBER.Value <= 0)
+ // {
+ // content.Content = "FALSE";
+ // return content;
+ // }
+
+ // _repConfirm.Insert(potwierdzenie);
+
+ // if (potwierdzenie.ORDERNUMBER.HasValue)
+ // UpdateStatus(potwierdzenie.ORDERNUMBER.Value, potwierdzenie.CURRENTSTATE);
+
+ // content.Content = "OK";
+ // }
+ // catch (Exception ex)
+ // {
+ // ErrorSignal.FromCurrentContext().Raise(ex);
+
+ // content.Content = "FALSE " + ex.Message + " " + ex.GetType();
+ // }
+
+ // return content;
+ //}
private static Payer InitPayer(int idFaktury)