From 7ea9c7548f71c5e3b54527e2f8807caf9c243c22 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 7 Mar 2019 07:17:22 +0000
Subject: - Bestellung anlegen, damit die Platzhalter an PayPal ersetzt werden
 können / Gutscheine
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7349 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/basket.phtml   | 41 +++++++++++++++++++----------------------
 views/warenkorb/overview.phtml | 28 ++++++++++++----------------
 2 files changed, 31 insertions(+), 38 deletions(-)

(limited to 'views/warenkorb')

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 0f2c471..0d79675 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -141,32 +141,29 @@
 
 			<?php $bLine = false; ?>
 			<?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+				
 				<div class="basket_sum_row">
-					<div class="titlegs">
+					<div class="title">
+						<a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
 						<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
 					</div>
-					<div class="wpsg_basket_removelink">
-						<a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
-							<!-- <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" /> -->
-							<span class="glyphicon glyphicon-trash"></span>
-						</a>
-					</div>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+						<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
+					<?php } ?>
+					<div class="value"><?php
+							
+						echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+						
+						if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
+							
+							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
+							
+						}
+					
+					?></div>
+					
 				</div>
-				<div class="basket_sum_row">
-					<div class="delgs">&nbsp;</div>
-					<div class="colgsl">1</div>
-					<div class="colgsl">
-						<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
-						<?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
-						<?php } else { ?>
-						<?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
-						<?php } ?>
-					</div>
-				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-				<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
-				<?php } ?>
-				<div class="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>
-			</div>
+				
 			<?php } ?>
 
 			<div class="basket_sum_row">
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index a691164..4e5453c 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -269,25 +269,21 @@
 			<?php $bLine = false; ?>
 			<?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
 				<div class="overview_sum_row">
-					<div class="titlegs">
+					<div class="title">
 						<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
 					</div>
+					<div class="value"><?php 
+							
+						echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+							
+						if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
+							
+							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
+							
+						}
+							
+					?></div>					
 				</div>
-				<div class="overview_sum_row">
-					<div class="delgs">&nbsp;</div>
-					<div class="colgsl">1</div>
-					<div class="colgsl">
-						<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
-						<?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
-						<?php } else { ?>
-						<?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
-						<?php } ?>
-					</div>
-				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-				<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
-				<?php } ?>
-				<div class="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>
-			</div>
 			<?php } ?>
 
 			<div class="overview_sum_row">
-- 
cgit v1.2.3