From 85c699f5ee2fe6a46ff10a0eeb8a1d4226ef6656 Mon Sep 17 00:00:00 2001 From: Andreas Palm Date: Sat, 7 Oct 2023 23:34:18 +0200 Subject: [PATCH] Shopware6: pass through "umsatzsteuer" for variants, fix "ermaessigt" --- www/lib/class.remote.php | 2 +- www/pages/shopimporter_shopware6.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/lib/class.remote.php b/www/lib/class.remote.php index 18000c0f..b542d48b 100644 --- a/www/lib/class.remote.php +++ b/www/lib/class.remote.php @@ -1892,7 +1892,7 @@ class Remote 'altersfreigabe' => $eigenschaft['altersfreigabe'], 'ean' => $eigenschaft['ean'], 'lag' => $matrixStock, 'pseudolager' => $matrixPseudoStorage, 'pseudopreis' => $eigenschaft['pseudopreis'], - 'restmenge' => $eigenschaft['restmenge'], 'steuersatz' => ($steuer - 1) * 100, + 'restmenge' => $eigenschaft['restmenge'], 'steuersatz' => ($steuer - 1) * 100, 'umsatzsteuer' => $eigenschaft['umsatzsteuer'], 'bruttopreis' => $eigenschaft['preis'] * $steuer, 'inaktiv' => $eigenschaft['inaktiv'], 'name_de' => $eigenschaft['name_de'], 'name_en' => $eigenschaft['name_en'], 'uebersicht_de' => $eigenschaft['uebersicht_de'], 'uebersicht_en' => $eigenschaft['uebersicht_en']); diff --git a/www/pages/shopimporter_shopware6.php b/www/pages/shopimporter_shopware6.php index d69101bc..57680394 100644 --- a/www/pages/shopimporter_shopware6.php +++ b/www/pages/shopimporter_shopware6.php @@ -944,7 +944,7 @@ class Shopimporter_Shopware6 extends ShopimporterBase if (!empty($this->normalTaxId) && $article['umsatzsteuer'] == 'normal') $taxId = $this->normalTaxId; - else if (!empty($this->reducedTaxId) && $article['umsatzsteuer'] == 'ermäßigt') + else if (!empty($this->reducedTaxId) && $article['umsatzsteuer'] == 'ermaessigt') $taxId = $this->reducedTaxId; else $taxId = $this->getTaxIdByRate($taxRate); @@ -2800,7 +2800,7 @@ class Shopimporter_Shopware6 extends ShopimporterBase if ($variant['umsatzsteuer'] == 'normal' && !empty($this->normalTaxId)) $taxId = $this->normalTaxId; - else if ($variant['umsatzsteuer'] == 'ermäßigt' && !empty($this->reducedTaxId)) + else if ($variant['umsatzsteuer'] == 'ermaessigt' && !empty($this->reducedTaxId)) $taxId = $this->reducedTaxId; else $taxId = $this->getTaxIdByRate($variant['steuersatz']);