From e5f9738d7fe60f53f723566fc69d0ccf96f2936c Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 7 Mar 2019 12:48:47 +0000
Subject: - Versandkostenfrei mit , / Task #656

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7358 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/basket.phtml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 7169a18..0342a18 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -232,10 +232,10 @@
 					<?php } ?>
 				</div>
 				<div class="value">
-					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { 
+					<?php if ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') && isset($this->view['basket']['arCalculation']['shipping'][0]['tax_key'])) { 
 						
 						$shipping_tax_key = $this->view['basket']['arCalculation']['shipping'][0]['tax_key'];
-						
+ 						
 						if ($shipping_tax_key === '0') {
 							
 							echo __('anteilig', 'wpsg');
@@ -251,11 +251,15 @@
 				<div class="value">
 					<?php 
 						
-						echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));
+						if (isset($this->view['basket']['arCalculation']['shipping'][0]['tax_key'])) {
 						
-						if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) {
+							echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));
 							
-							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')</span>';
+							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>';
+								
+							}
 							
 						}
 						
@@ -282,7 +286,7 @@
 						<?php } ?>
 					</div>
 					<div class="value">
-						<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
+						<?php if ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') && isset($this->view['basket']['arCalculation']['payment'][0]['tax_key'])) {
 							
 							$payment_tax_key = $this->view['basket']['arCalculation']['payment'][0]['tax_key'];
 							
@@ -301,11 +305,15 @@
 					<div class="value">
 						<?php 
 							
-							echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); 
-						
-							if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) {
-								
-								echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')</span>';
+							if (isset($this->view['basket']['arCalculation']['payment'][0]['tax_key'])) {
+							
+								echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); 
+							
+								if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) {
+									
+									echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')</span>';
+									
+								}
 								
 							}
 							
-- 
cgit v1.2.3