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

Merge pull request #152 from exciler/bugfix_shopimport

Browse Source 
FIX Shopimport: Update shop orders without shipments
This commit is contained in:
OpenXE-ERP 2024-08-28 16:02:42 +02:00 committed by GitHub
commit ec68922e7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Modules/Onlineshop/Data/Shipment.php
View File

@ -14,17 +14,17 @@ class Shipment
public int $id; public int $id;
/** /**
* @var string plain tracking number * @var ?string plain tracking number
*/ */
public string $trackingNumber; public ?string $trackingNumber;
/** /**
* @var string URL to view tracking details * @var ?string URL to view tracking details
*/ */
public string $trackingUrl; public ?string $trackingUrl;
/** /**
* @var string shipping method (after mapping to Shop domain) * @var ?string shipping method (after mapping to Shop domain)
*/ */
public string $shippingMethod; public ?string $shippingMethod;
} }

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

@ -2342,7 +2342,7 @@ class Remote
vlp.versandpaket = v.id OR v.lieferschein_ohne_pos = l.id vlp.versandpaket = v.id OR v.lieferschein_ohne_pos = l.id
LEFT JOIN shopexport_versandarten sv ON LEFT JOIN shopexport_versandarten sv ON
sv.versandart_wawision = v.versandart AND sv.shop = $shopId sv.versandart_wawision = v.versandart AND sv.shop = $shopId
WHERE a.id = $orderId OR a.teillieferungvon = $orderId WHERE (a.id = $orderId OR a.teillieferungvon = $orderId) AND v.id IS NOT NULL
ORDER BY v.id"; ORDER BY v.id";
$shipments = $this->app->DB->SelectArr($sql); $shipments = $this->app->DB->SelectArr($sql);