Compare commits

...

2 Commits

Author SHA1 Message Date
OpenXE-ERP
d38d3fa736
Merge pull request #148 from exciler/bugfix-shopexport
Bugfix: Shopexport Versandpakete distinct, prevent Null-Exception, Sh…
2024-07-17 10:58:21 +02:00
Andreas Palm
2a9284c289 Bugfix: Shopexport Versandpakete distinct, prevent Null-Exception, Shopware Trackingcodes 2024-07-17 10:05:50 +02:00
2 changed files with 3 additions and 3 deletions

View File

@ -2068,7 +2068,7 @@ class Remote
$result = $this->sendlist($i, $id, $data, true);
}
} while (count($data[$i]['matrix_varianten']['artikel'])>=5000);
} while (count($data[$i]['matrix_varianten']['artikel'] ?? [])>=5000);
return $result;
}
@ -2325,7 +2325,7 @@ class Remote
$data->orderStatus = OrderStatus::Imported;
$sql = "
SELECT
SELECT DISTINCT
v.id,
v.tracking,
v.tracking_link,

View File

@ -3432,7 +3432,7 @@ class Shopimporter_Shopware6 extends ShopimporterBase
$this->shopwareRequest('POST', '_action/order_delivery/'.$deliveryId.'/state/ship');
$deliveryData = [
'trackingCodes' => [$data->getTrackingNumberList()]
'trackingCodes' => $data->getTrackingNumberList()
];
$this->shopwareRequest('PATCH', 'order-delivery/'.$deliveryId,$deliveryData);
}