fix: candyman-gmbh/projektplanung#78

ajax/frontend/basket/controls/basket.php

@@ -12,7 +12,7 @@
  */
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_frontend_basket_controls_basket',
-    function ($basketId, $editable) {
+    function ($basketId, $editable, $orderHash) {
         if (!isset($editable)) {
             $editable = true;
         }
@@ -21,8 +21,14 @@ function ($basketId, $editable) {
             $editable = true;
         }
 
-        $User    = QUI::getUserBySession();
-        $Basket  = new QUI\ERP\Order\Basket\Basket($basketId, $User);
+        $User = QUI::getUserBySession();
+
+        if (!empty($orderHash)) {
+            $Basket = new QUI\ERP\Order\Basket\BasketOrder($orderHash, $User);
+        } else {
+            $Basket = new QUI\ERP\Order\Basket\Basket($basketId, $User);
+        }
+
         $Control = new QUI\ERP\Order\Controls\Basket\Basket([
             'editable' => \boolval($editable)
         ]);
@@ -31,5 +37,5 @@ function ($basketId, $editable) {
 
         return $Control->create();
     },
-    ['basketId', 'editable']
+    ['basketId', 'editable', 'orderHash']
 );

bin/frontend/controls/basket/Basket.js

@@ -133,7 +133,8 @@ define('package/quiqqer/order/bin/frontend/controls/basket/Basket', [
             QUIAjax.get('package_quiqqer_order_ajax_frontend_basket_controls_basket', this.$render, {
                 'package': 'quiqqer/order',
                 basketId : basketId,
-                editable : editable ? 1 : 0
+                editable : editable ? 1 : 0,
+                orderHash: this.getOrderHash()
             });
         },
 

src/QUI/ERP/Order/Basket/Basket.php

@@ -419,6 +419,8 @@ public function toOrder($Order)
             }
         }
 
+        $Order->save();
+
         QUI::getEvents()->fireEvent(
             'quiqqerOrderBasketToOrder',
             [$this, $Order, $Products]

src/QUI/ERP/Order/Basket/BasketOrder.php

@@ -227,6 +227,9 @@ public function import($products = [])
         );
 
         try {
+            $this->List->calc();
+            $this->save();
+
             QUI::getEvents()->fireEvent(
                 'quiqqerOrderBasketToOrder',
                 [$this, $this->Order, $this->List]