From f1400c48926887a07156fac9211d19bbaecb6417 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Fri, 19 Jul 2024 12:17:24 +0200 Subject: [PATCH] mirakl bugfix protokoll, taxes --- www/lib/class.remote.php | 1 + www/pages/shopimporter_mirakl.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/lib/class.remote.php b/www/lib/class.remote.php index 1c0a2f34..ea75cab4 100644 --- a/www/lib/class.remote.php +++ b/www/lib/class.remote.php @@ -2159,6 +2159,7 @@ class Remote { } public function getDataToSendForUpdateOrder(int $shopId, int $orderId): ?OrderStatusUpdateRequest + { $orderArr = $this->app->DB->SelectRow("SELECT `zahlungsweise`, `shopextid` FROM `auftrag` WHERE `id` = $orderId LIMIT 1"); if (empty($orderArr)) return null; diff --git a/www/pages/shopimporter_mirakl.php b/www/pages/shopimporter_mirakl.php index c039e745..3822fb3c 100644 --- a/www/pages/shopimporter_mirakl.php +++ b/www/pages/shopimporter_mirakl.php @@ -175,7 +175,6 @@ class Shopimporter_Mirakl extends ShopimporterBase { if (!empty($importerSettings['einstellungen_json'])) { $einstellungen = json_decode($importerSettings['einstellungen_json'], true); } - $this->protocol = $einstellungen['felder']['protokoll']; $this->apiKey = $einstellungen['felder']['apikey']; $this->shopUrl = rtrim($einstellungen['felder']['shopurl'], '/') . '/'; $this->mirakl_shopid = $einstellungen['felder']['mirakl_shopid']; @@ -545,7 +544,7 @@ class Shopimporter_Mirakl extends ShopimporterBase { if($tax->rate > $steuersatz) { $steuersatz = $tax->rate; } - switch ($order->row->taxes[0]->code) { + switch ($tax->code) { case $this->reducedTaxId: $umsatzsteuer_typ = 'ermaessigt'; break;