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

fix: mobile flex removed

See merge request !116

bin/frontend/Basket.js

@@ -122,7 +122,7 @@ define('package/quiqqer/order/bin/frontend/Basket', [
             const products = basket.products;
 
             // if there are no products yet, merge without query
-            if (!products.length) {
+            if (typeof products === 'undefined' || !products.length) {
                 GlobalBasket.setAttribute('mergeLocalStorage', 1);
                 GlobalBasket.load().then(function () {
                     if (QUIQQER_SITE.type !== 'quiqqer/order:types/orderingProcess') {

src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html

 <div name="order">
-    <div class="quiqqer-order-ordering-timeline">
+    <div class="quiqqer-order-ordering-timeline" style="display: none">
         <div class="quiqqer-order-ordering-timeline-container">
             <ul></ul>
         </div>

src/QUI/ERP/Order/Controls/OrderProcess.css

@@ -43,6 +43,7 @@
 
 /** processing / time line
  ============================================*/
+
 .quiqqer-order-ordering-timeline {
     margin-bottom: 2rem;
 }
@@ -389,7 +390,7 @@
     }
 
     .quiqqer-order-ordering-nobody-tabNav {
-        display: flex;
+        /*display: flex;*/
         padding-block: 1rem;
         overflow: auto;
         white-space: nowrap;

src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.css

@@ -86,6 +86,10 @@
     .quiqqer-order-customerData .qui-select {
         width: 100%;
     }
+
+    .quiqqer-order-customerData-edit-street_no {
+        flex-flow: wrap !important;
+    }
 }
 
 .quiqqer-order-customerData label [name="street"] {

src/QUI/ERP/Order/OrderInProcess.php

@@ -464,6 +464,9 @@ public function createOrder(QUI\Interfaces\Users\User $PermissionUser = null): O
             ['hash' => $Order->getUUID()]
         );
 
+        // get complete new instance
+        $Order = new Order($Order->getUUID());
+
         $Order->setAttribute('inOrderCreation', true);
         $this->setAttribute('inOrderCreation', true);
 

src/QUI/ERP/Order/OrderProcess.php

@@ -121,10 +121,10 @@ public function __construct(array $attributes = [])
         $step = $this->getAttribute('step');
         $Order = $this->getOrder();
 
-        if (
-            $Order->getCustomer()->getUUID() !== $User->getUUID()
-            && !QUI::getUsers()->isSystemUser($User)
-        ) {
+        $customerUUID = $Order->getCustomer()->getUUID();
+        $userUUID = $User->getUUID();
+
+        if ($customerUUID !== $userUUID && !QUI::getUsers()->isSystemUser($User)) {
             throw new QUI\Permissions\Exception([
                 'quiqqer/order',
                 'exception.no.permission.for.this.order'