s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-01-12 06:41:14 +01:00
Code Issues Projects Releases Wiki Activity

mirakl bugfix protokoll, taxes

Browse Source
This commit is contained in:
OpenXE 2024-07-19 12:17:24 +02:00
parent 22620698a1
commit f1400c4892
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/lib/class.remote.php
View File

@ -2159,6 +2159,7 @@ class Remote {
} }
public function getDataToSendForUpdateOrder(int $shopId, int $orderId): ?OrderStatusUpdateRequest public function getDataToSendForUpdateOrder(int $shopId, int $orderId): ?OrderStatusUpdateRequest
{
$orderArr = $this->app->DB->SelectRow("SELECT `zahlungsweise`, `shopextid` FROM `auftrag` WHERE `id` = $orderId LIMIT 1"); $orderArr = $this->app->DB->SelectRow("SELECT `zahlungsweise`, `shopextid` FROM `auftrag` WHERE `id` = $orderId LIMIT 1");
if (empty($orderArr)) if (empty($orderArr))
return null; return null;

3
www/pages/shopimporter_mirakl.php
View File

@ -175,7 +175,6 @@ class Shopimporter_Mirakl extends ShopimporterBase {
if (!empty($importerSettings['einstellungen_json'])) { if (!empty($importerSettings['einstellungen_json'])) {
$einstellungen = json_decode($importerSettings['einstellungen_json'], true); $einstellungen = json_decode($importerSettings['einstellungen_json'], true);
} }
$this->protocol = $einstellungen['felder']['protokoll'];
$this->apiKey = $einstellungen['felder']['apikey']; $this->apiKey = $einstellungen['felder']['apikey'];
$this->shopUrl = rtrim($einstellungen['felder']['shopurl'], '/') . '/'; $this->shopUrl = rtrim($einstellungen['felder']['shopurl'], '/') . '/';
$this->mirakl_shopid = $einstellungen['felder']['mirakl_shopid']; $this->mirakl_shopid = $einstellungen['felder']['mirakl_shopid'];
@ -545,7 +544,7 @@ class Shopimporter_Mirakl extends ShopimporterBase {
if($tax->rate > $steuersatz) { if($tax->rate > $steuersatz) {
$steuersatz = $tax->rate; $steuersatz = $tax->rate;
} }
switch ($order->row->taxes[0]->code) { switch ($tax->code) {
case $this->reducedTaxId: case $this->reducedTaxId:
$umsatzsteuer_typ = 'ermaessigt'; $umsatzsteuer_typ = 'ermaessigt';
break; break;