Merge branch 'WarehouseEShop/add-new-fields' into 'master'
fixed getting wrong order results See merge request fronk/thetool!1318
This commit is contained in:
@@ -295,7 +295,7 @@ class WarehouseEShopOrderController extends TTCrud {
|
||||
}
|
||||
|
||||
protected function getAllOrderItemsPerOrder(): array {
|
||||
if (isset($_GET['orderId'])) return WarehouseEShopOrderItemModel::getAll(['orderId' => $_GET['orderId']]);
|
||||
if (isset($_GET['orderId'])) return WarehouseEShopOrderItemModel::getAll(['orderId' => intval($_GET['orderId'])]);
|
||||
else $items = WarehouseEShopOrderItemModel::getAll();
|
||||
$articles = WarehouseArticleModel::getAll();
|
||||
$articleDistributor = WarehouseArticleDistributorModel::getAll(['distributorId' => 1]);
|
||||
|
||||
Reference in New Issue
Block a user