diff options
| -rw-r--r-- | views/mods/mod_rechnungen/accounting_pdf.phtml | 65 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/invoice_pdf.phtml | 57 |
2 files changed, 26 insertions, 96 deletions
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml index f21d95e..735c239 100644 --- a/views/mods/mod_rechnungen/accounting_pdf.phtml +++ b/views/mods/mod_rechnungen/accounting_pdf.phtml @@ -532,36 +532,18 @@ }
else
{
-
- if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
- {
-
- $mwst = __('anteilig', 'wpsg');
-
- }
- else
- {
+
+ if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
- $mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
- $mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
+ $mwst = _('anteilig');
- }
-
- /*
- if ($this->arShipping[$this->view['data']['type_shipping']]['mwst'] == '0')
- {
-
- $mwst = __('anteilig', 'wpsg');
+ } else {
- }
- else
- {
-
- $mwst = wpsg_ff($this->arShipping[$this->view['data']['type_shipping']]['mwst_value'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['shipping'][0]['tax'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['shipping'][0]['tax_key']]['tax_value'], '%');
}
- */
-
+
}
$pdf->setXY($prod_left + 97, $prod_top + $offset);
@@ -642,35 +624,18 @@ $mwst = 0;
}
else
- {
-
- if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
- {
-
- $mwst = __('anteilig', 'wpsg');
-
- }
- else
- {
-
- $mwst = wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
-
- }
+ {
- /*
- if ($this->arPayment[$this->view['data']['type_payment']]['mwst'] == '0')
- {
-
- $mwst = __('anteilig', 'wpsg');
+ if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
- }
- else
- {
-
- $mwst = wpsg_ff($this->arPayment[$this->view['data']['type_payment']]['mwst_value'], '%');
+ $mwst = _('anteilig');
+
+ } else {
+
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['payment'][0]['tax'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['payment'][0]['tax_key']]['tax_value'], '%');
}
- */
}
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index dc494b5..cacbdb0 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -547,34 +547,16 @@ else
{
- if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
- {
-
- $mwst = __('anteilig', 'wpsg');
-
- }
- else
- {
-
- $mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
- $mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
-
- }
+ if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
- /*
- if ($this->arShipping[$this->view['data']['type_shipping']]['mwst'] == '0')
- {
-
- $mwst = __('anteilig', 'wpsg');
+ $mwst = _('anteilig');
- }
- else
- {
-
- $mwst = wpsg_ff($this->arShipping[$this->view['data']['type_shipping']]['mwst_value'], '%');
+ } else {
+
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['shipping'][0]['tax'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['shipping'][0]['tax_key']]['tax_value'], '%');
}
- */
}
@@ -658,33 +640,16 @@ else
{
- if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
- {
-
- $mwst = __('anteilig', 'wpsg');
-
- }
- else
- {
+ if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
- $mwst = wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
+ $mwst = _('anteilig');
- }
-
- /*
- if ($this->arPayment[$this->view['data']['type_payment']]['mwst'] == '0')
- {
-
- $mwst = __('anteilig', 'wpsg');
+ } else {
- }
- else
- {
-
- $mwst = wpsg_ff($this->arPayment[$this->view['data']['type_payment']]['mwst_value'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['payment'][0]['tax'], '%');
+ $mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['payment'][0]['tax_key']]['tax_value'], '%');
}
- */
}
|