From 1cf465027ddbaf950843c2eb3bfe15652d6cc718 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 5 Mar 2021 12:23:49 +0000
Subject: - Feature: Bestellvariablen in Mails

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7867 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml      | 6 ++++--
 views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'views/mods')

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>
-- 
cgit v1.2.3