Index: trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Models/InvoiceDetailsViewData.cs (revision 883) @@ -14,5 +14,7 @@ public Payer Payer {get; set;} public string Status { get; set; } - public string brutto { get; set; } + public string brutto { get; set; } + public string termin { get; set; } + public string info { get; set; } } } Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 880) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 883) @@ -1,5 +1,5 @@  - ProjectFiles + ShowAllFiles Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs (revision 883) @@ -126,4 +126,22 @@ /// + /// Looks up a localized string similar to DANE FAKTURY. + /// + internal static string DaneFaktury { + get { + return ResourceManager.GetString("DaneFaktury", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DANE WŁAŚCICIELA KARTY KREDYTOWEJ. + /// + internal static string DaneWlasciciela { + get { + return ResourceManager.GetString("DaneWlasciciela", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Data wystawienia:. /// @@ -246,5 +264,5 @@ /// - /// Looks up a localized string similar to Kontakt do Twojego opiekuna handlowego:. + /// Looks up a localized string similar to Kontakt do Twojego opiekuna handlowego. /// internal static string Kontakt { @@ -279,4 +297,13 @@ get { return ResourceManager.GetString("Nazwisko", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to niezapłacona. + /// + internal static string niezaplacona { + get { + return ResourceManager.GetString("niezaplacona", resourceCulture); } } @@ -376,4 +403,13 @@ /// + /// Looks up a localized string similar to Status faktury:. + /// + internal static string Status_faktury { + get { + return ResourceManager.GetString("Status_faktury", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Szczegóły zlecenia. /// @@ -394,9 +430,18 @@ /// - /// Looks up a localized string similar to Termin platności. + /// Looks up a localized string similar to Termin płatności. /// internal static string TerminPlatnosci { get { return ResourceManager.GetString("TerminPlatnosci", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Termin zapłaty:. + /// + internal static string termin_wplaty { + get { + return ResourceManager.GetString("termin_wplaty", resourceCulture); } } @@ -488,4 +533,13 @@ /// + /// Looks up a localized string similar to zapłacona. + /// + internal static string zaplacona { + get { + return ResourceManager.GetString("zaplacona", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Płatność za fakturę numer {0} została uregulowana dnia {1}.. /// Index: trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx (revision 883) @@ -167,5 +167,5 @@ - Kontakt do Twojego opiekuna handlowego: + Kontakt do Twojego opiekuna handlowego @@ -191,5 +191,5 @@ - Termin platności + Termin płatności @@ -261,3 +261,21 @@ Logowanie nie powiodło się. Popraw błędy i spróbuj zalogować sie ponownie. + + Status faktury: + + + Termin zapłaty: + + + DANE FAKTURY + + + DANE WŁAŚCICIELA KARTY KREDYTOWEJ + + + niezapłacona + + + zapłacona + Index: trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 883) +++ trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx (revision 883) @@ -0,0 +1,90 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="System" %> + + <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ShowTitle").ToString()%> + + + + +

+ +

+

<%=Model.info%>

+ + + <%-- sekcja: szczegó³y faktury --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- sekcja: kontakt do opiekuna handlowego--%> + + + + + + + + + + + + + + + +
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneFaktury").ToString()%> +
+ + <%=HttpContext.GetGlobalResourceObject("tlumaczenia","zaplacona").ToString()%>
+ + <%=Model.termin%>
+ + <%=Model.vPlatnosciEcard.FullName%>
<%=Model.vPlatnosciEcard.Address + " " + Model.vPlatnosciEcard.PostalCode + ", " + Model.vPlatnosciEcard.City%>
<%=Model.vPlatnosciEcard.Nabywca_nip%>
<%=Model.vPlatnosciEcard.Faktura_Numer%>
<%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Data_Wystawienia)%>
<%=String.Format("{0:dd-MM-yyyy}", Model.vPlatnosciEcard.Termin_zaplaty)%>
<%=Model.brutto%>
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%> +
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> + + <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%> +
<%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%>


<%=Model.vPlatnosciEcard.telefon%>

+ + Index: trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 882) +++ trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 883) @@ -12,28 +12,22 @@

+ <% using (Html.BeginForm("Show", "Platnosc", FormMethod.Post, new { id = "myform" })){ %> + + <%-- sekcja: szczegó³y faktury --%> - - - - - - - - - - - - - + + + + + + + + <%-- sekcja: kontakt do opiekuna handlowego--%> + + + + + + + + + + + + + + + + + + + <%-- sekcja: dane wlasciciela karty --%> + + + - Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 881) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 883) @@ -22,4 +22,5 @@ public class PlatnoscController : Controller { + public const string ISPAID = "payment_deposited"; //transakcja potwierdzona do rozliczenia private readonly PlatnosciDataContext _context; private readonly IDataContext _context1; @@ -65,17 +66,20 @@ vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); - - var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1); - if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana - { - string data_zaplaty = String.Format("{0:dd-MM-yyyy}",tablica_potwierdzenia[0].AUTHTIME); - ErrorViewData errorViewData = _func.InitErrorViewData(String.Format(zaplacono, platnosc.Faktura_Numer, data_zaplaty)); - return View("Error1", errorViewData); - } + string kwota = ""; kwota = _func.BruttoToString(platnosc.Brutto, platnosc.waluta_brutto, platnosc.waluta_miano); var payer = InitPayer("", "", platnosc.ID_faktury); - var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota); - return View(invoiceDeatailsViewData); + var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota); + + var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1); + if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana + { + string data_zaplaty = String.Format("{0:dd-MM-yyyy}", tablica_potwierdzenia[0].AUTHTIME); + invoiceDeatailsViewData.info = String.Format(zaplacono, platnosc.Faktura_Numer, data_zaplaty); + invoiceDeatailsViewData.termin = data_zaplaty; + return View("Paid", invoiceDeatailsViewData); + } + + return View(invoiceDeatailsViewData); } [Authorize] @@ -166,5 +170,5 @@ _rep.Insert(potwierdzenie); - UpdateStatus(ORDERNUMBER, VALIDATIONCODE); + UpdateStatus(ORDERNUMBER, CURRENTSTATE); return View(); } @@ -218,8 +222,8 @@ return errorViewData; } - public void UpdateStatus(int ordernumber, string validationcode) + public void UpdateStatus(int ordernumber, string currentstate) { var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault(); - if (platnosc != null && platnosc.Status == true && validationcode == "000") + if (platnosc != null && platnosc.Status == true && currentstate == ISPAID) { platnosc.Status = true; Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 880) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 883) @@ -79,9 +79,4 @@ tlumaczenia.en.resx - - tlumaczenia.pl.resx - True - True - True @@ -168,10 +163,4 @@ - - GlobalResourceProxyGenerator - tlumaczenia.pl.designer.cs - - - GlobalResourceProxyGenerator @@ -198,4 +187,5 @@ + Index: trunk/eCard/eCardMVC/Platnosci/Content/Site.css =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 883) @@ -37,7 +37,6 @@ h4 { - padding: 0 0 10px 0; - color: Red; - text-decoration: underline; + padding: 0 0 0 0; + color:#E00000; } h5, h6 @@ -237,4 +236,9 @@ font-weight: bold; width: 150px; + padding-top: 5px +} +.col +{ + padding-top: 5px; } .bold @@ -274,4 +278,26 @@ width: 100pt; } - - +.pustaLinia +{ + height: 20px; + +} +.naglowekTab +{ + font-weight: bold; + padding-top: 5px; + padding-bottom: 5pt; + background-color: #F5F5F5; + text-align: center; +} +.InfoPaid +{ + font-weight: bold; + font-size: 14px; +} +#unpaid +{ + color:#E00000; +} + +
<%=Html.Hidden("Payer.Id_faktury", Model.vPlatnosciEcard.ID_faktury) %>
- <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString()%> + + <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneFaktury").ToString()%>
- <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> - - <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>
<%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%>


<%=Model.vPlatnosciEcard.telefon%>

+ + <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "niezaplacona").ToString()%>
@@ -66,6 +60,40 @@ <%=Model.brutto%>
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%> +
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> + + <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%> +
<%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%>
<%=Model.vPlatnosciEcard.telefon%>
+ <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneWlasciciela").ToString()%> +

+