- Feature: Bestellvariablen in Mails

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7867 0d5edaf7-2b12-4e95-93f4-047927463d4b

7 files changed, 21 insertions, 15 deletions

diff --git a/views/mailtemplates/html/adminmail.phtml b/views/mailtemplates/html/adminmail.phtml
index ca04f8c..ca3da26 100644
--- a/views/mailtemplates/html/adminmail.phtml
+++ b/views/mailtemplates/html/adminmail.phtml
@@ -19,7 +19,7 @@
 

 <?php $this->render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?> 

 

-<?php $this->callMods('mail_aftercalculation', array(&$this->view['basket']['checkout']['o_id'])); ?> 

+<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>

 

 <?php if (wpsg_isSizedString($this->view['basket']['checkout']['comment'])) { ?>

 <h2><?php echo __('Bestellkommentar', 'wpsg') ?></h2>

diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml
index a7bb1f9..f4e1eff 100644
--- a/views/mailtemplates/html/kundenmail.phtml
+++ b/views/mailtemplates/html/kundenmail.phtml
@@ -21,7 +21,7 @@
 

 <?php $this->render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?>

 

-<?php $this->callMods('mail_aftercalculation', array(&$this->view['basket']['checkout']['o_id'])); ?>

+<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>

 

 <?php if (wpsg_isSizedString($this->view['basket']['checkout']['comment'])) { ?>

 <h2><?php echo __('Bestellkommentar', 'wpsg') ?></h2>

diff --git a/views/mailtemplates/order.phtml b/views/mailtemplates/order.phtml
index 3e85a53..ae91725 100644
--- a/views/mailtemplates/order.phtml
+++ b/views/mailtemplates/order.phtml
@@ -120,5 +120,5 @@
      <?php echo wpsg_pad_right(__('Gesamtpreis:', 'wpsg'), 37); ?>

 <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?>

 <?php $this->callMods('mail_order_end', [&$this->view['basket']['arCalculation'], false]); ?>

- 

-<?php $this->callMods('mail_aftercalculation', array(&$this->view['basket']['checkout']['o_id'])); ?>
\ No newline at end of file
+

+<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>
\ No newline at end of file
diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
index 9e4e969..41f5d67 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
@@ -103,12 +103,12 @@
 <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')), 31); ?>

 <?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> 

      <?php echo wpsg_pad_right(__('Versandkosten', 'wpsg'), 40); ?>

-<?php echo wpsg_pad_left(wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'],'% '), 10); ?>

+<?php echo wpsg_pad_left(wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value']??0,'% '), 10); ?>

 <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 21); ?> 

 <?php } ?>

 <?php if ($this->view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>

      <?php echo wpsg_pad_right(__('Zahlungsart', 'wpsg'), 40); ?>

-<?php echo wpsg_pad_left(wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'],'% '), 10); ?>

+<?php echo wpsg_pad_left(wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value']??0,'% '), 10); ?>

 <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 21); ?> 

 <?php } ?>

 <?php //wpsg_debug($this->view['basket']['mwst']) ?>

@@ -128,6 +128,8 @@
      <?php echo wpsg_pad_right(__('Gesamtpreis', 'wpsg'), 37); ?>

 <?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?> 

 

+<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>

+

 <?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?> 

  

 <?php echo __('Es gelten unsere Allgemeinen Geschaeftsbedingungen (AGB).', 'wpsg'); ?>  

diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
index c3f135d..c36f4a2 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
@@ -21,7 +21,7 @@
 

 <?php $this->render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?> 

 

-<?php $this->callMods('mail_aftercalculation', array(&$this->view['basket']['checkout']['o_id'])); ?>

+<?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>

 

 <?php if (wpsg_isSizedString($this->view['basket']['checkout']['comment'])) { ?>

 <h2><?php echo __('Bestellkommentar', 'wpsg') ?></h2>

diff --git a/views/order/index.phtml b/views/order/index.phtml
index afd03b7..681457d 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -362,13 +362,17 @@
                                     }

 								

 								?>

-                            

-                                <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),

-                                    $oOrderProduct->getCount(),

-									wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(), 'wpsg-product-edit-'.wpsg_getInt($product_id)),

-                                    $oOrderProduct->getProductName(),

-                                    wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))

-                                ); ?><br />

+

+                                <?php

+

+                                    echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),

+                                        $oOrderProduct->getCount(),

+                                        wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(), 'wpsg-product-edit-'.wpsg_getInt($product_id)),

+                                        $oOrderProduct->getProductName(),

+                                        wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))

+                                    );

+

+                                ?><br />

                                 

                                 <?php if ($oAbo !== null) { ?>

  

diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 98442fa..3cad1d3 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -368,7 +368,7 @@
 						

 						echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));

 						

-						if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) {

+						if (strpos(($this->view['basket']['arCalculation']['shipping'][0]['set']??''), '%') !== false) {

 							

 							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')</span>';