diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml index 21c464bd..4ce1761b 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml @@ -651,1619 +651,18 @@ - + - + var antiForgeryToken = $(`@Html.AntiForgeryToken()`).val(); + var urlLoadAllToPrintUrlAjax = `@Url.Page("./Index", "LoadAllToPrint")`; + var PaginationUrlAjax = `@Url.Page("./Index", "Pagination")`; + var PrintOneUrl = `#showmodal=@Url.Page("/Company/Checkouts/Index", "PrintOne")`; + var PrintOneMobileUrl = `#showmodal=@Url.Page("/Company/Checkouts/Index", "PrintOneMobile")`; + var CheckoutPrintAllUrl = `@Url.Page("/Company/Checkouts/CheckoutPrintAll")`; + + console.log(urlLoadAllToPrintUrlAjax); + + var itemsYearList = @Html.Raw(Json.Serialize(Model.YearlyList.OrderBy(x => x))); + + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintAll.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintAll.cshtml index 93f465b0..93216888 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintAll.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintAll.cshtml @@ -23,9 +23,9 @@ padding-top: 15px; } - .container2:last-of-type { - height: 280mm; - } + .container2:last-of-type { + height: 280mm; + } .modal-dialog { max-width: 100%; @@ -37,7 +37,8 @@ }*/ @@page { size: A4; - margin: 0mm; + margin: 10mm + /* margin: 0mm; */ page-break-after: auto; } @@ -58,41 +59,68 @@ @@media print { body * { - visibility: hidden; - page-break-after: auto; + visibility: hidden !important; + page-break-after: auto !important; } + body { + background-color: #ffffff !important; + } + + .container2, #printSection { + background-color: #ffffff !important; + } + html, body { - height: 100%; + /* height: 100%; */ + width: 210mm; + height: 297mm; margin: 0 !important; padding: 0 !important; overflow: hidden; + background-color: #ffffff !important; + -webkit-print-color-adjust: exact; } + .container2 { + height: 100%; + page-break-inside: avoid; + } + + .container2:last-of-type { + height: auto; + } + + .modal-dialog { + width: 100%; + max-width: 210mm; + } + #printSection, #printSection * { - visibility: visible; - page-break-after: auto; + visibility: visible !important; + page-break-after: auto !important; } footer { - page-break-after: auto; - display: none; + page-break-after: auto !important; + display: none !important; } header { - display: none; + display: none !important; } #printSection { - position: absolute; - right: 0; - page-break-after: auto; - top: 0; + position: absolute !important; + right: 0 !important; + page-break-after: auto !important; + top: 0 !important; } .head { background-color: #cccccc !important; - -webkit-print-color-adjust: exact; + -webkit-print-color-adjust: exact !important; + print-color-adjust: exact !important; } .week { @@ -102,7 +130,8 @@ .radio-info input[type="radio"]:checked + label::after { background-color: black !important; - -webkit-print-color-adjust: exact; + -webkit-print-color-adjust: exact !important; + print-color-adjust: exact !important; } .mt-15 { diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml index 3110ce0d..beb3c8c7 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml @@ -1,315 +1,8 @@ -@using _0_Framework.Application -@using System.Security.Cryptography.X509Certificates -@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel +@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel + @{ - + string clientVersion = _0_Framework.Application.Version.StyleVersion; + }