From 30906ba4082a9e293066f7e0c45b03fb35837bc7 Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Thu, 6 Feb 2025 07:38:15 +0100
Subject: [PATCH] fix(Basket): improve basket id handling and user check in
Basket.php
Added a conditional check in src/QUI/ERP/Order/Basket/Basket.php to convert basketId to actual id
from user's session if it is a boolean value. This fixes potential issues that may arise with
non-integer basketIds.
Also, introduced a safeguard check before saving to ensure there is a valid User. If not, the save
function is exited early to prevent potential errors or undesired actions.
---
src/QUI/ERP/Order/Basket/Basket.php | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/QUI/ERP/Order/Basket/Basket.php b/src/QUI/ERP/Order/Basket/Basket.php
index 8a50fad7..cf1adc3f 100644
--- a/src/QUI/ERP/Order/Basket/Basket.php
+++ b/src/QUI/ERP/Order/Basket/Basket.php
@@ -78,6 +78,14 @@ public function __construct(bool|int $basketId, QUI\Interfaces\Users\User $User
$this->List->setUser($User);
$this->FrontendMessages = new QUI\ERP\Comments();
+ if (is_bool($basketId)) {
+ try {
+ $Basket = Handler::getInstance()->getBasketFromUser(QUI::getUserBySession());
+ $basketId = $Basket->getId();
+ } catch (QUI\Exception) {
+ }
+ }
+
try {
$data = Handler::getInstance()->getBasketData($basketId, $User);
} catch (QUI\Exception $Exception) {
@@ -220,6 +228,10 @@ public function save(): void
return;
}
+ if (!$this->User) {
+ return;
+ }
+
// save only product ids with custom fields, we need not more
$result = [];
$products = $this->List->getProducts();
--
GitLab