diff options
Diffstat (limited to 'views/warenkorb')
| -rw-r--r-- | views/warenkorb/basket.phtml | 53 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 44 |
2 files changed, 61 insertions, 36 deletions
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 0345a85..d3641f1 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -5,11 +5,15 @@ */
//wpsg_debug($this->view['basket']);
+ //wpsg_debug($this->view['basket']['arCalculation']);
//wpsg_debug($_SESSION);
//wpsg_debug($this->arShipping);
//wpsg_debug(__('Deutschland', 'wpsg'));
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
+
?>
<div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
@@ -140,29 +144,36 @@ <?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>
<?php $bLine = false; ?>
- <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+
+
+
+ <?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>
- <div class="basket_sum_row">
- <div class="title">
- <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $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>
- <?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
+ <?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
+
+ <div class="basket_sum_row">
+ <div class="title">
+ <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $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'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>
+ </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($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
- echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+ if (strpos($gs['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
+
+ }
+
+ ?></div>
- 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>
+ <?php } ?>
<?php } ?>
@@ -373,7 +384,9 @@ </div>
<div class="wpsg_spacer"></div>
<?php } ?>
-
+
+ <?php $this->callMod('wpsg_mod_gutschein', 'basket_row_end_coupon'); ?>
+
<?php $this->callMods('basket_row_end', array(&$this->view)); ?>
<br />
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 4e5453c..b860b89 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -6,6 +6,9 @@ */
//wpsg_debug($this->view['basket']);
+
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
?>
<div class="wpsg wpsg_overview">
@@ -267,25 +270,31 @@ <div class="overview_sum_wrap">
<?php $bLine = false; ?>
- <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
- <div class="overview_sum_row">
- <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>';
+ <?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>
+
+ <?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
+
+ <div class="overview_sum_row">
+ <div class="title">
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($gs['code'] != '')? '('.$gs['code'].')':'' ?>
+ </div>
+ <div class="value"><?php
+
+ 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>';
+
+ }
- ?></div>
- </div>
+ ?></div>
+ </div>
+
+ <?php } ?>
+
<?php } ?>
-
+
<div class="overview_sum_row">
<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
<div class="title">
@@ -460,7 +469,10 @@ <div class="wpsg_spacer"></div>
<?php } ?>
+ <?php echo $this->callMod('wpsg_mod_gutschein', 'overview_row_end_coupon'); ?>
+
<?php $this->callMods('overview_row_end', array(&$this->view)); ?>
+
<div class="wpsg_spacer"></div>
<br />
|