fix: order <-> basket reading in order process fixed

bin/frontend/classes/Basket.js

@@ -382,12 +382,9 @@ define('package/quiqqer/order/bin/frontend/classes/Basket', [
 
             return new Promise(function (resolve) {
                 QUIAjax.post('package_quiqqer_order_ajax_frontend_basket_clear', function (result) {
-                    self.$calculations = result;
-                    self.$products     = [];
-
-                    self.fireEvent('refresh', [self]);
-
-                    resolve(result);
+                    self.refresh().then(function () {
+                        resolve(result);
+                    });
                 }, {
                     'package': 'quiqqer/order',
                     basketId : self.$basketId,
@@ -396,6 +393,11 @@ define('package/quiqqer/order/bin/frontend/classes/Basket', [
             });
         },
 
+        /**
+         * Refresh the basket data
+         *
+         * @return {Promise}
+         */
         refresh: function () {
             var self = this;
 

src/QUI/ERP/Order/OrderProcess.php

@@ -112,7 +112,8 @@ public function __construct($attributes = [])
 
             if (!empty($hash)) {
                 try {
-                    $this->Order = Handler::getInstance()->getOrderInProcessByHash($hash);
+                    $this->Order  = Handler::getInstance()->getOrderInProcessByHash($hash);
+                    $this->Basket = new QUI\ERP\Order\Basket\BasketOrder($hash);
                 } catch (QUI\Exception $Exception) {
                 }
             }
@@ -120,22 +121,9 @@ public function __construct($attributes = [])
             $this->Basket = new QUI\ERP\Order\Basket\BasketGuest();
         }
 
-        // insert basket products into the articles
-        $Order = $this->getOrder();
-
-        if ($Order) {
-            $this->Basket->setHash($Order->getHash());
-            $this->Basket->updateOrder();
-            $this->Basket->save();
-
-            if ($Order->isSuccessful()) {
-                $this->setAttribute('orderHash', $Order->getHash());
-            }
-
-            $this->cleanup();
-        }
 
         // current step
+        $Order = $this->getOrder();
         $steps = $this->getSteps();
         $step  = $this->getAttribute('step');