+ <%
+ if (!String.IsNullOrEmpty(Model.info))
+ {
+ %>
+
+ <%=Model.info%>
+
+ <%
+ }
+ else
+ {
+ %>
+
+
+ <%=Model.vPlatnosciEcard.Faktura_Numer%>
+
-
-
- <%=Model.vPlatnosciEcard.Faktura_Numer%>
-
-
- Aby siê wylogowaæ kliknij <%=Html.ActionLink("tutaj","LogOff","Account") %>
+ Aby siê wylogowaæ kliknij <%=Html.ActionLink("tutaj","LogOff","Account") %>
+ <%} %>
Index: /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 919)
+++ /trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx (revision 926)
@@ -6,19 +6,14 @@
-
- <%
- if (!String.IsNullOrEmpty(Model.info))
- {
- %>
- <%=Model.info%>
- <%
- }else{
- %>
+
-
+
<%if (Model.vPlatnosciEcard != null && !String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer)){%>
- <%=Model.vPlatnosciEcard.Faktura_Numer%>
+
+ <% string txt = HttpContext.GetGlobalResourceObject("tlumaczenia", "blad2").ToString(); %>
+ <%=String.Format(txt, Model.vPlatnosciEcard.Faktura_Numer) %>
+
<%}%>
-
+
<%if (Model.vPlatnosciEcard != null && !String.IsNullOrEmpty(Model.vPlatnosciEcard.Faktura_Numer))
@@ -34,4 +29,3 @@
<%} %>
- <%}%>
Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 919)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 926)
@@ -98,6 +98,7 @@
else return View("Error");
}
- public ActionResult Ok(string id, string language)
- {
+ public ActionResult Ok(string id, string language, string o)
+ {
+ int order = ConvertId(o);
language = _func.setLanguage(language);
int id1 = ConvertId(id);
@@ -106,9 +107,23 @@
var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "" , "");
+
+ //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
+ //jesli tak, to sprawdzamy czy przyszlo potwierdzenie z eCardu.
+ if (order > 0)
+ {
+ if (CheckConfirm(id1, order) == 0) //nie ma potwierdzenia z eCardu
+ {
+ invoiceDeatailsViewData.info = String.Format(_t.TranslateStr("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+ }
+ else
+ {
+ if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = _t.TranslateStr("tlumaczenia", "weryfikacja");
+ }
+ }
+
return View(invoiceDeatailsViewData);
}
- public ActionResult Fail(string id, string language, string o)
- {
- int order = ConvertId(o);
+ public ActionResult Fail(string id, string language)
+ {
language = _func.setLanguage(language);
int id1 = ConvertId(id);
@@ -116,22 +131,5 @@
if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
-
var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, null, "", "");
-
- //sprawdzamy czy dla kombinacji ordernumber i idfaktury istnieje platnosc,
- //jesli tak, to sprawdzamy czy przyszlo potwierdzenie z eCardu.
- if (order > 0)
- {
- PlatnosciEcard pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == id1).SingleOrDefault();
- if (pl != null)
- {
- PotwierdzeniaEcard confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();
- if (confirm == null)
- {
- invoiceDeatailsViewData.info = _t.TranslateStr("tlumaczenia","wtrakcie");
- }
- }
-
- }
return View(invoiceDeatailsViewData);
}
@@ -175,9 +173,9 @@
_repConfirm.Insert(potwierdzenie);
UpdateStatus(ORDERNUMBER, CURRENTSTATE);
- content.Content = "OK";
+ content.Content = "OK";
}
catch(Exception ex)
{
- content.Content = "NOTOK " + ex.Message + " " + ex.GetType();
+ content.Content = "FALSE " + ex.Message + " " + ex.GetType();
}
@@ -233,4 +231,18 @@
}
}
+ public int CheckConfirm(int idfaktury, int order)
+ {
+ PlatnosciEcard pl = _repPayment.Find(p => p.ORDERNUMBER == order && p.IDFaktury == idfaktury).SingleOrDefault();
+ if (pl != null)
+ {
+ PotwierdzeniaEcard confirm = _repConfirm.Find(p => p.ORDERNUMBER == order).FirstOrDefault();
+ if (confirm == null) return 0; //potwierdzenie nie przyszlo z eCardu
+ }
+ else
+ {
+ return 2; //nie ma platnosci o takim idfaktury i ordernumber
+ }
+ return 1; //potwierdzenie przyszlo z eCardu
+ }
public IRepository