s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #148 from exciler/bugfix-shopexport

Browse Source 
Bugfix: Shopexport Versandpakete distinct, prevent Null-Exception, Sh…
This commit is contained in:
OpenXE-ERP 2024-07-17 10:58:21 +02:00 committed by GitHub
commit d38d3fa736
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2068,7 +2068,7 @@ class Remote
$result = $this->sendlist($i, $id, $data, true); $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; return $result;
} }
@ -2325,7 +2325,7 @@ class Remote
$data->orderStatus = OrderStatus::Imported; $data->orderStatus = OrderStatus::Imported;
$sql = " $sql = "
SELECT SELECT DISTINCT
v.id, v.id,
v.tracking, v.tracking,
v.tracking_link, v.tracking_link,

2
www/pages/shopimporter_shopware6.php
View File

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