diff options
| author | Roger Rehnelt <noreply@maennchen1.de> | 2026-09-27 00:26:37 +0200 |
|---|---|---|
| committer | Roger Rehnelt <noreply@maennchen1.de> | 2026-09-27 00:26:37 +0200 |
| commit | 02d9559a7d34ab7293635117a71822f4499ac78a (patch) | |
| tree | 0a0f0ccfcf728bd3229803e4acd1de83cf39a8f7 | |
| parent | 015dfb28fb3a528e5e4d5fe63fd89c070adfd0eb (diff) | |
Versandgebühr je Versandart im Checkout, Rabattzeile unter der Summe
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
| -rw-r--r-- | views/warenkorb/basket.phtml | 32 | ||||
| -rw-r--r-- | views/warenkorb/checkout2.phtml | 7 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 32 |
3 files changed, 36 insertions, 35 deletions
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index d05e574..9edd66b 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -182,22 +182,6 @@ <?php } ?>
- <div class="basket_sum_row">
- <?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
- <div class="title">
- <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
- </div>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <div class="value">
- <?php echo __('anteilig', 'wpsg'); ?>
- </div>
- <?php } ?>
- <div class="value">
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
- </div>
- <?php } ?>
- </div>
-
<?php if ($bLine == true) { ?>
<div class="wpsg_spacer"></div>
<?php } ?>
@@ -220,6 +204,22 @@ </div>
<div class="basket_sum_row">
+ <?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+ <div class="title">
+ <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
+ </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="value">
+ <?php echo __('anteilig', 'wpsg'); ?>
+ </div>
+ <?php } ?>
+ <div class="value">
+ <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ <?php } ?>
+ </div>
+
+ <div class="basket_sum_row">
<div class="wpsg-flex wpsg-align-center wpsg-gap-2">
<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a>:', 'wpsg'), $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
<?php if (sizeof($this->arShipping) > 1) { ?>
diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml index 31392d0..5137a4b 100644 --- a/views/warenkorb/checkout2.phtml +++ b/views/warenkorb/checkout2.phtml @@ -33,10 +33,11 @@ <?php } else { ?>
<div class="wpsg_payship_name"><?php echo __($s['name'], 'wpsg'); ?></div>
<?php } ?>
- <?php if ((isset($s['hint']) && trim($s['hint']) != '') || wpsg_getFloat($s['price']) > 0) { ?>
+ <?php $shipping_price = $this->getShippingPriceFrontend(strval($s['id'])); ?>
+ <?php if ((isset($s['hint']) && trim($s['hint']) != '') || $shipping_price > 0) { ?>
<div id="shipping_<?php echo $s['id']; ?>_hint" class="shippay_hint">
- <?php if ($s['price'] > 0) { ?>
- <?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?><br />
+ <?php if ($shipping_price > 0) { ?>
+ <?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($shipping_price, $this->get_option('wpsg_currency')); ?><br />
<?php } ?>
<?php echo $this->replaceUniversalPlatzhalter(__($s['hint'], 'wpsg')); ?>
</div>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 689e5e0..a128dd2 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -296,22 +296,6 @@ <?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">
- <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
- </div>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <div class="value">
- <?php echo __('anteilig', 'wpsg'); ?>
- </div>
- <?php } ?>
- <div class="value">
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
- </div>
- <?php } ?>
- </div>
-
<?php if ($bLine == true) { ?>
<div class="wpsg_spacer"></div>
<?php } ?>
@@ -333,6 +317,22 @@ </div>
</div>
+ <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">
+ <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
+ </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="value">
+ <?php echo __('anteilig', 'wpsg'); ?>
+ </div>
+ <?php } ?>
+ <div class="value">
+ <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ <?php } ?>
+ </div>
+
<?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
<div class="overview_sum_row">
<div class="title">
|