diff options
| author | karl <noreply@maennchen1.de> | 2022-10-28 11:12:57 +0000 |
|---|---|---|
| committer | karl <noreply@maennchen1.de> | 2022-10-28 11:12:57 +0000 |
| commit | a6cd31a06784373ff37b32bdce055f01bbfcbb44 (patch) | |
| tree | 7077cd69c4ccab8012095c2d84041d60bcb08db5 /views | |
| parent | ba2962eb7141a61cdd97b96b6c16b257f41a1d07 (diff) | |
- Bugfix: Multirechnung erstellung
- Bugfix: Rechnungsansicht in der Bestellverwaltung
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8130 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views')
| -rw-r--r-- | views/mods/mod_kundenverwaltung/register.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/multi_invoice_pdf.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/order_view.phtml | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/views/mods/mod_kundenverwaltung/register.phtml b/views/mods/mod_kundenverwaltung/register.phtml index 0e97e04..dfa1ae5 100644 --- a/views/mods/mod_kundenverwaltung/register.phtml +++ b/views/mods/mod_kundenverwaltung/register.phtml @@ -441,8 +441,6 @@ <div class="wpsg_clear"></div>
</form>
- <!-- <div class="g-recaptcha" data-sitekey="<?php echo $this->get_option('wpsg_mod_kundenveraltung_recaptcha_key'); ?>"></div> -->
-
<script>
// DSGVO Layer Script
document.querySelector('.layer_link').addEventListener('click', function() {
diff --git a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml index d9aaedb..7f4cb75 100644 --- a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml @@ -192,7 +192,7 @@ // noMwSt
$head_data = array_values($this->view['multi_data']['order_data'])[0];
- if ( ($head_data['oCalculation']->getTaxMode() === wpsg_calculation::TAXMODE_B2B) && ($head_data['oOrder']->isInnerEu()) ) {
+ if ( ($head_data['oCalculation']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B) && ($head_data['oOrder']->isInnerEu()) ) {
$bNoTax = true;
} else {
$bNoTax = false;
diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml index 9a900b3..fb4aa27 100644 --- a/views/mods/mod_rechnungen/order_view.phtml +++ b/views/mods/mod_rechnungen/order_view.phtml @@ -34,8 +34,14 @@ <a target="_blank" onclick="if (!confirm('<?php echo __('Sind Sie sicher, dass Sie eine Kopie dieser Rechnung/Rechnungskorrektur erneut an den Kunden senden möchten?', 'wpsg'); ?>')) return false;" href="<?php
- echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$this->view['data']['id']);
-
+ if ($r['o_id'] != '0') {
+ // Multirechnung
+ echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$r['o_ids'][0].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$r['o_ids'][0]);
+ } else {
+ // normale Rechnung
+ echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$this->view['data']['id']);
+ }
+
?>"><?php echo ' '.__("Kopie senden", "wpsg"); ?></a>
</div>
|