From 02142897fd830fd8533f445554f7f130a82d5abe Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Tue, 2 Aug 2022 11:27:53 +0000 Subject: - Meldung wenn keine Produkte beim Rechnungsschreiben markiert sind git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8057 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_rechnungen/invoice_pdf.phtml | 1 - .../order_view_orderdata_after.phtml | 107 ++++++++++++++++++--- views/mods/mod_rechnungen/order_view_row.phtml | 8 +- 3 files changed, 98 insertions(+), 18 deletions(-) (limited to 'views/mods') diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 0b6d5fd..ffbba40 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -313,7 +313,6 @@ if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, (($this->view['basket']['noMwSt'] == '1')?'0.00 %':wpsg_ff($p['mwst_value'], '%')), 0, 0, 'C'); diff --git a/views/mods/mod_rechnungen/order_view_orderdata_after.phtml b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml index d8daed2..f8b4b5e 100755 --- a/views/mods/mod_rechnungen/order_view_orderdata_after.phtml +++ b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml @@ -156,11 +156,7 @@ - + @@ -182,8 +178,52 @@ }; let el_invoice_wpsg_rechnungen_preview = document.getElementById('invoice_wpsg_rechnungen_preview'); - let el_invoice_wpsg_rechnungen_submit = document.getElementById('el_invoice_wpsg_rechnungen_submit'); + let el_invoice_wpsg_rechnungen_submit = document.getElementById('invoice_wpsg_rechnungen_submit'); + function check_invoice_amount(event) { + + let ok = false; + + for (let el_checkbox of document.getElementsByClassName('wpsg_check_amount')) { + + if (el_checkbox.checked) { + + if (parseInt(el_checkbox.nextElementSibling.value) > 0) { + + ok = true; break; + + } + + } + + } + + if (ok) { + + if (event.target.getAttribute("id") === 'invoice_wpsg_rechnungen_submit') { + + window.setTimeout(function() { location.href = ' $oOrder->getId()]); + + ?>'; }, 1000); + + } + + } else { + + alert(''); + + event.stopPropagation(); + event.preventDefault(); + + } + + } + + el_invoice_wpsg_rechnungen_preview.addEventListener('click', check_invoice_amount); + el_invoice_wpsg_rechnungen_submit.addEventListener('click', check_invoice_amount); + @@ -256,11 +296,7 @@ - + @@ -270,7 +306,51 @@ let el_invoice_wpsg_storno_preview = document.getElementById('invoice_wpsg_storno_preview'); let el_invoice_wpsg_storno_submit = document.getElementById('invoice_wpsg_storno_submit'); - + + function check_invoice_amount(event) { + + let ok = false; + + for (let el_checkbox of document.getElementsByClassName('wpsg_check_amount')) { + + if (el_checkbox.checked) { + + if (parseInt(el_checkbox.nextElementSibling.value) > 0) { + + ok = true; break; + + } + + } + + } + + if (ok) { + + if (event.target.getAttribute("id") === 'invoice_wpsg_storno_submit') { + + window.setTimeout(function() { location.href = ' $oOrder->getId()]); + + ?>'; }, 1000); + + } + + } else { + + alert(''); + + event.stopPropagation(); + event.preventDefault(); + + } + + } + + el_invoice_wpsg_storno_preview.addEventListener('click', check_invoice_amount); + el_invoice_wpsg_storno_submit.addEventListener('click', check_invoice_amount); + @@ -304,7 +384,8 @@ label[for="invoice_shippay"] .link_invoice, label[for="storno_shippay"] .link_invoice { padding:0; } - .wpsg_mod_rechnungen_row { display:block; width:100%; padding:5px; } + .wpsg_mod_rechnungen_row { display:block; width:100%; } + .wpsg_mod_rechnungen_row > div { padding:5px; } .wpsg_mod_rechnungen_row .invoice_wrap:not(:only-child) { margin-top:0.5rem; } .wpsg_mod_rechnungen_row .invoice_wrap > a:first-child { padding-left:0; } diff --git a/views/mods/mod_rechnungen/order_view_row.phtml b/views/mods/mod_rechnungen/order_view_row.phtml index 97e2667..f6a2064 100644 --- a/views/mods/mod_rechnungen/order_view_row.phtml +++ b/views/mods/mod_rechnungen/order_view_row.phtml @@ -36,8 +36,8 @@
- - + + @@ -63,8 +63,8 @@
- - + + -- cgit v1.2.3