Zbiór zmian 971 dla trunk/eCard/eCardMVC/Platnosci/Views/Platnosc
- Data:
- 2009-12-23 11:59:36 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC/Platnosci/Views/Platnosc
- Pliki:
-
- 4 zmodyfikowane
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Fail.aspx
r956 r971 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage< Platnosci.Models.InvoiceDetailsViewData>"%>1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>"%> 2 2 3 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 8 8 9 9 <p class="pay_error"> 10 <%if (!String.IsNullOrEmpty(Model. vPlatnosciEcard.Faktura_Numer)){%>10 <%if (!String.IsNullOrEmpty(Model.Invoice.Faktura_Numer)){%> 11 11 <asp:Label ID="lab3" runat="server" Text=""> 12 12 <% string txt = HttpContext.GetGlobalResourceObject("tlumaczenia", "blad2").ToString(); %> 13 <%=String.Format(txt, Model. vPlatnosciEcard.Faktura_Numer) %>13 <%=String.Format(txt, Model.Invoice.Faktura_Numer) %> 14 14 </asp:Label> 15 15 16 16 <%string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia", "KolejnaProba").ToString();%> 17 <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model. vPlatnosciEcard.ID_faktury }, null)%></p>17 <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.Invoice.ID_faktury }, null)%></p> 18 18 <%}%> 19 19 </p> -
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Ok.aspx
r956 r971 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage< Platnosci.Models.InvoiceDetailsViewData>"%>1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>"%> 2 2 3 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 8 <% 9 if (!String.IsNullOrEmpty(Model. info))9 if (!String.IsNullOrEmpty(Model.Info)) 10 10 { 11 11 %> 12 12 <p class="pay_error"> 13 <%=Model. info%>13 <%=Model.Info%> 14 14 </p> 15 15 <% … … 19 19 %> 20 20 <p class="Info"> 21 <%string podziekowaniaTxt = String.Format(HttpContext.GetGlobalResourceObject("tlumaczenia","podziekowania").ToString(),Model. vPlatnosciEcard.Faktura_Numer); %>21 <%string podziekowaniaTxt = String.Format(HttpContext.GetGlobalResourceObject("tlumaczenia","podziekowania").ToString(),Model.Invoice.Faktura_Numer); %> 22 22 <%=podziekowaniaTxt%> 23 23 </p> -
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx
r950 r971 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>" %> 2 <%@ Import Namespace="System" %> 3 <%@ Import Namespace="Platnosci.Models" %> 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>" %> 2 4 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 5 4 <% 6 FunkcjePlatnosci func = new FunkcjePlatnosci();7 stringstr = func.SetTitle();5 var func = new PaymentsUtils(); 6 var str = func.SetTitle(); 8 7 %> 9 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly") .ToString()%>8 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly")%> 10 9 </asp:Content> 11 10 … … 15 14 <asp:Label ID="Szczegó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label> 16 15 </div> 17 <p class="InfoPaid"><%=Model. info%></p>16 <p class="InfoPaid"><%=Model.Info%></p> 18 17 <table cellpadding="0" cellspacing="0" border="0"> 19 18 … … 34 33 <asp:Label ID="Label2" runat ="server" Text="<%$Resources:tlumaczenia,termin_wplaty%>"></asp:Label> 35 34 </td> 36 <td class="textbox"><%=Model. termin%></td>35 <td class="textbox"><%=Model.Termin%></td> 37 36 </tr> 38 37 <tr> … … 40 39 <asp:Label ID="nazwafirmy" runat ="server" Text="<%$Resources:tlumaczenia,Nazwa%>"></asp:Label> 41 40 </td> 42 <td class="textbox"><%=Model. vPlatnosciEcard.FullName%></td>41 <td class="textbox"><%=Model.Invoice.FullName%></td> 43 42 </tr> 44 43 <tr> 45 44 <td class="col1"><asp:Label ID="adres" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td> 46 <td class="textbox"><%=Model. vPlatnosciEcard.Address + " " + Model.vPlatnosciEcard.PostalCode + ", " + Model.vPlatnosciEcard.City%></td>45 <td class="textbox"><%=Model.Invoice.Address + " " + Model.Invoice.PostalCode + ", " + Model.Invoice.City%></td> 47 46 </tr> 48 47 <tr> 49 48 <td class="col1"><asp:Label ID="nip" runat ="server" Text="<%$Resources:tlumaczenia,Nip%>"></asp:Label></td> 50 <td class="textbox"><%=Model. vPlatnosciEcard.Nabywca_nip%></td>49 <td class="textbox"><%=Model.Invoice.Nabywca_nip%></td> 51 50 </tr> 52 51 <tr> 53 52 <td class="col1"><asp:Label ID="NrFaktury" runat ="server" Text="<%$Resources:tlumaczenia,NumerFaktury%>"></asp:Label></td> 54 <td class="textbox"><%=Model. vPlatnosciEcard.Faktura_Numer%></td>53 <td class="textbox"><%=Model.Invoice.Faktura_Numer%></td> 55 54 </tr> 56 55 <tr> 57 56 <td class="col1"><asp:Label ID="DataWystawienia" runat ="server" Text="<%$Resources:tlumaczenia,DataWystawienia%>"></asp:Label></td> 58 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model. vPlatnosciEcard.Data_Wystawienia)%></td>57 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Data_Wystawienia)%></td> 59 58 </tr> 60 59 <tr> 61 60 <td class="col1"><asp:Label ID="termin" runat ="server" Text="<%$Resources:tlumaczenia,TerminPlatnosci%>"></asp:Label></td> 62 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model. vPlatnosciEcard.Termin_zaplaty)%></td>61 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Termin_zaplaty)%></td> 63 62 </tr> 64 63 <tr> 65 64 <td class="col1"><asp:Label ID="brutto" runat ="server" Text="<%$Resources:tlumaczenia,Brutto%>"></asp:Label></td> 66 <td class="textbox"><%=Model. brutto%></td>65 <td class="textbox"><%=Model.Brutto%></td> 67 66 </tr> 68 67 <tr> … … 80 79 </td> 81 80 <td class="textbox"> 82 <%=Model. vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>81 <%=Model.Invoice.Imie + " " + Model.Invoice.Nazwisko%> 83 82 </td> 84 83 </tr> 85 84 <tr> 86 85 <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,ulica%>"></asp:Label></td> 87 <td class="textbox"><%=Model. vPlatnosciEcard.ulica%></td>86 <td class="textbox"><%=Model.Invoice.ulica%></td> 88 87 </tr> 89 88 <tr> 90 89 <td class="col1"><asp:Label ID="Label3" runat="server" Text="<%$Resources:tlumaczenia,Miasto%>"></asp:Label></td> 91 <td class="textbox"><%=Model. vPlatnosciEcard.kod + " " + Model.vPlatnosciEcard.miasto%></td>90 <td class="textbox"><%=Model.Invoice.kod + " " + Model.Invoice.miasto%></td> 92 91 </tr> 93 92 <tr> 94 93 <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label><br /><br /></td> 95 <td class="textbox"><%=Model. vPlatnosciEcard.telefon%><br /><br /></td>94 <td class="textbox"><%=Model.Invoice.telefon%><br /><br /></td> 96 95 </tr> 97 96 </table> -
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx
r950 r971 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.InvoiceDetailsViewData>" %> 2 <%@ Import Namespace="System" %> 3 <%@ Import Namespace="Platnosci.Models" %> 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<InvoiceDetailsViewData>" %> 2 4 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 5 4 <% 6 FunkcjePlatnosci func = new FunkcjePlatnosci();7 stringstr = func.SetTitle();5 var func = new PaymentsUtils(); 6 var str = func.SetTitle(); 8 7 %> 9 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly") .ToString()%>8 <%=str + HttpContext.GetGlobalResourceObject("tlumaczenia", "Szczegoly")%> 10 9 </asp:Content> 11 10 … … 21 20 22 21 <table cellpadding="0" cellspacing="0" border="0"> 23 <tr><td><%=Html.Hidden("Payer.Id_faktury", Model. vPlatnosciEcard.ID_faktury) %></td></tr>22 <tr><td><%=Html.Hidden("Payer.Id_faktury", Model.Invoice.ID_faktury) %></td></tr> 24 23 25 24 <%-- sekcja: szczegó³y faktury --%> … … 39 38 <asp:Label ID="nazwafirmy" runat ="server" Text="<%$Resources:tlumaczenia,Nazwa%>"></asp:Label> 40 39 </td> 41 <td class="textbox"><%=Model. vPlatnosciEcard.FullName%></td>40 <td class="textbox"><%=Model.Invoice.FullName%></td> 42 41 </tr> 43 42 <tr> 44 43 <td class="col1"><asp:Label ID="adres" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td> 45 <td class="textbox"><%=Model. vPlatnosciEcard.Address + " " + Model.vPlatnosciEcard.PostalCode + ", " + Model.vPlatnosciEcard.City%></td>44 <td class="textbox"><%=Model.Invoice.Address + " " + Model.Invoice.PostalCode + ", " + Model.Invoice.City%></td> 46 45 </tr> 47 46 <tr> 48 47 <td class="col1"><asp:Label ID="nip" runat ="server" Text="<%$Resources:tlumaczenia,Nip%>"></asp:Label></td> 49 <td class="textbox"><%=Model. vPlatnosciEcard.Nabywca_nip%></td>48 <td class="textbox"><%=Model.Invoice.Nabywca_nip%></td> 50 49 </tr> 51 50 <tr> 52 51 <td class="col1"><asp:Label ID="NrFaktury" runat ="server" Text="<%$Resources:tlumaczenia,NumerFaktury%>"></asp:Label></td> 53 <td class="textbox"><%=Model. vPlatnosciEcard.Faktura_Numer%></td>52 <td class="textbox"><%=Model.Invoice.Faktura_Numer%></td> 54 53 </tr> 55 54 <tr> 56 55 <td class="col1"><asp:Label ID="DataWystawienia" runat ="server" Text="<%$Resources:tlumaczenia,DataWystawienia%>"></asp:Label></td> 57 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model. vPlatnosciEcard.Data_Wystawienia)%></td>56 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Data_Wystawienia)%></td> 58 57 </tr> 59 58 <tr> 60 59 <td class="col1"><asp:Label ID="termin" runat ="server" Text="<%$Resources:tlumaczenia,TerminPlatnosci%>"></asp:Label></td> 61 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model. vPlatnosciEcard.Termin_zaplaty)%></td>60 <td class="textbox"><%=String.Format("{0:dd-MM-yyyy}", Model.Invoice.Termin_zaplaty)%></td> 62 61 </tr> 63 62 <tr> 64 63 <td class="col1"><asp:Label ID="brutto" runat ="server" Text="<%$Resources:tlumaczenia,Brutto%>"></asp:Label></td> 65 <td class="textbox"><%=Model. brutto%></td>64 <td class="textbox"><%=Model.Brutto%></td> 66 65 </tr> 67 66 <tr> … … 79 78 </td> 80 79 <td class="textbox"> 81 <%=Model. vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>80 <%=Model.Invoice.Imie + " " + Model.Invoice.Nazwisko%> 82 81 </td> 83 82 </tr> 84 83 <tr> 85 84 <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,ulica%>"></asp:Label></td> 86 <td class="textbox"><%=Model. vPlatnosciEcard.ulica%></td>85 <td class="textbox"><%=Model.Invoice.ulica%></td> 87 86 </tr> 88 87 <tr> 89 88 <td class="col1"><asp:Label ID="Label2" runat="server" Text="<%$Resources:tlumaczenia,Miasto%>"></asp:Label></td> 90 <td class="textbox"><%=Model. vPlatnosciEcard.kod + " " + Model.vPlatnosciEcard.miasto%></td>89 <td class="textbox"><%=Model.Invoice.kod + " " + Model.Invoice.miasto%></td> 91 90 </tr> 92 91 <tr> 93 92 <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label></td> 94 <td class="textbox"><%=Model. vPlatnosciEcard.telefon%></td>93 <td class="textbox"><%=Model.Invoice.telefon%></td> 95 94 </tr> 96 95 <tr>
