diff options
Diffstat (limited to 'views/warenkorb')
| -rw-r--r-- | views/warenkorb/basket.phtml | 73 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 77 |
2 files changed, 96 insertions, 54 deletions
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 } ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 1456ad4..a691164 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -337,24 +337,36 @@ </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)
- {
-
+
+ $shipping_tax_key = $this->view['basket']['arCalculation']['shipping'][0]['tax_key'];
+
+ if ($shipping_tax_key === '0') {
+
echo __('anteilig', 'wpsg');
-
+
+ } else {
+
+ echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$shipping_tax_key]['tax_value'], '%');
+
}
- else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))
- {
-
- echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_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>
<?php } ?>
@@ -366,25 +378,36 @@ <?php echo wpsg_translate(__('Zahlungsart (#1#)', 'wpsg'), $this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>:
</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 } ?>
|