From b111237bc90b50f2725385fa2dd7e17bf97c37c3 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 7 Mar 2019 06:36:12 +0000
Subject: - Alte Berechnung Versand- und Zahlungskosten entfernt

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

(limited to 'views/warenkorb/basket.phtml')

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index b4864a1..0f2c471 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -235,24 +235,34 @@
 					<?php } ?>
 				</div>
 				<div class="value">
-					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
-						if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
-						{
-
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { 
+						
+						$shipping_tax_key = $this->view['basket']['arCalculation']['shipping'][0]['tax_key'];
+						
+						if ($shipping_tax_key === '0') {
+							
 							echo __('anteilig', 'wpsg');
-
-						}
-						else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))
-						{
-
-							echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
-
+							
+						} else {
+							
+							echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$shipping_tax_key]['tax_value'], '%');
+							
 						}
-				 	}
-					?>
+						 						
+				 	} ?>
 				</div>
 				<div class="value">
-					<?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
+					<?php 
+						
+						echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));
+						
+						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>';
+							
+						}
+						
+					?>
 				</div>
 			</div>
 
@@ -276,24 +286,33 @@
 					</div>
 					<div class="value">
 						<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
-
-							if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
-							{
-
+							
+							$payment_tax_key = $this->view['basket']['arCalculation']['payment'][0]['tax_key'];
+							
+							if ($payment_tax_key === '0') {
+								
 								echo __('anteilig', 'wpsg');
-
+								
+							} else {
+								
+								echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$payment_tax_key]['tax_value'], '%');
+								
 							}
-							else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment))
-							{
-
-								echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
-
-							}
-
+							 
 						} ?>
 					</div>
 					<div class="value">
-						<?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
+						<?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>';
+								
+							}
+							
+						?>
 					</div>
 				</div>
 			<?php } ?>
-- 
cgit v1.2.3