From 879e6e21d6f713adee950bafc11fe02c505f7cb1 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 29 Nov 2018 09:50:04 +0000
Subject: - Anonymisieren von Adressen/Kundendaten

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

diff --git a/views/order/index.phtml b/views/order/index.phtml
index 9d97268..1dc7aba 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -118,11 +118,11 @@
                             <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), @$_REQUEST['search_customer']); ?>
                             
                             <br />
-                            
-                            <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) $arShippingSelect[$shipping_id] = $shipping['name']; ?>
+							
+                            <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) if (!isset($shipping['active']) || $shipping['active'] === '1') $arShippingSelect[$shipping_id] = $shipping['name'].' ('.wpsg_ff($shipping['price']).')'; ?>
                             <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, @$_REQUEST['add_shipping']); ?>
 
-                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) $arPaymentSelect[$payment_id] = $payment['name']; ?>
+                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1')  $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff($payment['price']).')'; ?>
                             <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, @$_REQUEST['add_payment']); ?>
                             
                             <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen')); ?><br />
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml
index 335d55b..fb99e21 100644
--- a/views/order/product_table.phtml
+++ b/views/order/product_table.phtml
@@ -291,4 +291,6 @@
 	
 	</tbody>
 </table>
+
+<?php wpsg_debug($arCalculation);  ?>
 	
\ No newline at end of file
-- 
cgit v1.2.3