Merge branch 'next-2.x' into 'main'

fix: correct transfer of the order process id to the order

See merge request !102

src/QUI/ERP/Order/AbstractOrder.php

@@ -286,6 +286,10 @@ protected function setDataBaseData(array $data): void
             $this->setAttribute('project_name', $data['project_name']);
         }
 
+        if (!empty($data['order_process_id'])) {
+            $this->setAttribute('order_process_id', $data['order_process_id']);
+        }
+
         // user
         $this->customerId = $data['customerId'];
 

src/QUI/ERP/Order/OrderInProcess.php

@@ -44,11 +44,13 @@ public function __construct($orderId)
 
         parent::__construct($data);
 
-        $this->orderId = $data['hash'];
+        $this->orderId = $data['order_id'];
 
         // check if an order for the processing order exists
         try {
-            Handler::getInstance()->get($this->orderId);
+            if ($this->orderId) {
+                Handler::getInstance()->get($this->orderId);
+            }
         } catch (Exception) {
             $this->orderId = null;
         }
@@ -689,6 +691,10 @@ protected function getDataForSaving(): array
      */
     public function clear($PermissionUser = null): void
     {
+        if ($PermissionUser === null) {
+            $PermissionUser = QUI::getUserBySession();
+        }
+
         if ($this->orderId) {
             $Order = Handler::getInstance()->get($this->getOrderId());
             $Order->clear($PermissionUser);