From 6774f5f47d5e2d093ed44fef81ca9243a0b84811 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Thu, 29 Nov 2018 10:33:09 +0000 Subject: - Anonymisieren von Adressen/Kundendaten git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7217 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/order/backendEdit/editPayShipping.phtml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml index a38ac1c..a688f5f 100644 --- a/views/order/backendEdit/editPayShipping.phtml +++ b/views/order/backendEdit/editPayShipping.phtml @@ -4,6 +4,8 @@ * Template für das Bearbeiten der Versand- und Zahlungsart im Backend */ + $arCalculation = $this->view['oCalculation']->getCalculationArray(); + $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping_data) { @@ -32,15 +34,15 @@ if ($this->getBackendTaxview() === WPSG_BRUTTO) { - $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency')); - $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency')); - + $price_shipping = wpsg_ff(($arCalculation['shipping'][0]['brutto_single']??0), $this->get_option('wpsg_currency')); + $price_payment = wpsg_ff(($arCalculation['payment'][0]['brutto_single']??0), $this->get_option('wpsg_currency')); + $price_suffix = ' ('.__('Brutto', 'wpsg').')'; } else { - - $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency')); - $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency')); + + $price_shipping = wpsg_ff(($arCalculation['shipping'][0]['netto_single']??0), $this->get_option('wpsg_currency')); + $price_payment = wpsg_ff(($arCalculation['payment'][0]['netto_single']??0), $this->get_option('wpsg_currency')); $price_suffix = ' ('.__('Netto', 'wpsg').')'; -- cgit v1.2.3