From 7225e6695a39aac697bbbfe889a5a3bd912f1b5f Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 5 Mar 2021 06:32:24 +0000
Subject: - Feature: Gutscheine/Coupons werden optional nur noch auf
 ausgewählte Produkte/Produktgruppen angerechnet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7865 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/frontend.css                               |  6 +++++-
 views/mods/mod_gutschein/add.phtml                   |  2 +-
 views/mods/mod_gutschein/basket_row_end_coupon.phtml | 15 ++++++++++++---
 views/warenkorb/basket.phtml                         | 15 ++++++++++++---
 4 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/css/frontend.css b/views/css/frontend.css
index 9162dc4..db6debf 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -52,8 +52,12 @@ input.wpsg_error { border-color:red !important; }
 .basket_product_wrap .basket_product_row .product_info .dummy { flex-grow:1; width:90px; }
 .basket_product_wrap .basket_product_row .product_info .dummyp { flex-grow:1; width:110px; }
 .basket_sum_wrap .basket_sum_row { display:flex; width:100%; justify-content:space-between; align-items:center; }
-.basket_sum_wrap .basket_sum_row .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_sum_wrap .basket_sum_row .title { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
 .basket_sum_wrap .basket_sum_row .title2 { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_sum_wrap .basket_sum_voucher .title,
+.basket_sum_wrap .basket_sum_coupon .title { display:flex; justify-content:flex-start; align-items:center; }
+.basket_sum_wrap .basket_sum_voucher .title a,
+.basket_sum_wrap .basket_sum_coupon .title a { margin-right:0.5rem; }
 .basket_sum_wrap .basket_sum_row .value { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
 .basket_sum_wrap .basket_sum_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; }
 .basket_sum_wrap .basket_sum_row .sum { width: 20%; display:inline-block; font-weight:bold; text-align:right; }
diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml
index cc0752a..af992f7 100644
--- a/views/mods/mod_gutschein/add.phtml
+++ b/views/mods/mod_gutschein/add.phtml
@@ -64,7 +64,7 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_multi', __('Mehrfach verwendbar', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['multi'], '0')); ?>
 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_gutschein_comment', __('Kommentar', 'wpsg'), @$this->view['mod_gutschein']['comment']); ?>
 			<?php if ($this->hasMod('wpsg_mod_productgroups') && wpsg_isSizedArray($this->view['wpsg_mod_gutschein']['arProductGroups'])) { ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_productgroups', __('Beschränkung auf Produktgruppen', 'wpsg'), $this->view['wpsg_mod_gutschein']['arProductGroups'], $this->view['mod_gutschein']['productgroups'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_productgroups', __('Beschränkung auf Produktgruppen', 'wpsg'), $this->view['wpsg_mod_gutschein']['arProductGroups'], wpsg_getArray($this->view['mod_gutschein']['productgroups']), array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?>
 			<?php } ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_products', __('Beschränkung auf Produkte', 'wpsg'), @$this->view['wpsg_mod_gutschein']['arProducts'], @$this->view['mod_gutschein']['products'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProducts']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProducts'])), 'help' => 'wpsg_mod_gutschein_products')); ?>
 		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/mods/mod_gutschein/basket_row_end_coupon.phtml b/views/mods/mod_gutschein/basket_row_end_coupon.phtml
index f418f3c..53d8483 100644
--- a/views/mods/mod_gutschein/basket_row_end_coupon.phtml
+++ b/views/mods/mod_gutschein/basket_row_end_coupon.phtml
@@ -15,10 +15,19 @@
 
 <?php foreach ($arCalculation['coupon'] as $gs) { ?>
 	
-	<div class="basket_sum_row">
+	<div class="basket_sum_row basket_sum_coupon">
 		<div class="title">
 			<a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('voucher_'.$gs['id'])); ?>" title="<?php echo __('Wertgutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Wertgutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" /></a>
-			<?php echo __('Wertgutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>
+			<?php echo __('Wertgutschein', 'wpsg'); ?> <?php
+
+                $arInfo = [];
+
+                if (wpsg_isSizedString($gs['code'])) $arInfo[] = $gs['code'];
+                if (wpsg_isTrue($gs['partial'])) $arInfo[] = __('teilweise angerechnet', 'wpsg');
+
+                if (wpsg_isSizedArray($arInfo)) echo '('.implode(' / ', $arInfo).')';
+
+            ?>
 		</div>
 		<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 			<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
@@ -28,7 +37,7 @@
 				echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
 				
 				if (strpos($gs['set'], '%') !== false) {
-					
+
 					echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
 					
 				}
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index aadaa2c..20b15ab 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -152,10 +152,19 @@
 				
 				<?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
 				
-					<div class="basket_sum_row">
+					<div class="basket_sum_row basket_sum_voucher">
 						<div class="title">
-							<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>
-							<a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('voucher_'.$gs['id'])); ?>" 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'); ?>" /></a>
+                            <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('voucher_'.$gs['id'])); ?>" 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'); ?>" /></a>
+							<?php echo __('Gutschein', 'wpsg'); ?> <?php
+
+                                $arInfo = [];
+
+                                if (wpsg_isSizedString($gs['code'])) $arInfo[] = $gs['code'];
+                                if (wpsg_isTrue($gs['partial'])) $arInfo[] = __('teilweise angerechnet', 'wpsg');
+
+                                if (wpsg_isSizedArray($arInfo)) echo '('.implode(' / ', $arInfo).')';
+
+                            ?>
 						</div>
 						<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 							<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
-- 
cgit v1.2.3