diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2019-12-17 13:24:11 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2019-12-17 13:24:11 +0000 |
| commit | 78a9384647448004395ca6759a0b1716ae02b39a (patch) | |
| tree | 7490c198e66564bf72c5eab05a4b310f7395f937 /views/mods/mod_rechnungen/accounting_pdf.phtml | |
| parent | 24d32462ab3b6baa474580a4d4fc073d5c12cd84 (diff) | |
- Bugfix: Ausweisung von Anteilig bei Versand- und Zahlungskosten in Rechnung/Gutschrift
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7642 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views/mods/mod_rechnungen/accounting_pdf.phtml')
| -rw-r--r-- | views/mods/mod_rechnungen/accounting_pdf.phtml | 65 |
1 files changed, 15 insertions, 50 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'], '%');
}
- */
}
|