fix: products#238, candyman-gmbh/projektplanung#91

ajax/frontend/basket/toOrderInProcess.php

@@ -17,7 +17,7 @@ function ($basketId, $orderHash) {
         $User = QUI::getUserBySession();
 
         if (QUI::getUsers()->isNobodyUser($User)) {
-            return;
+            return false;
         }
 
         $Basket       = new QUI\ERP\Order\Basket\Basket($basketId, $User);
@@ -43,6 +43,8 @@ function ($basketId, $orderHash) {
         if ($Order) {
             $Basket->toOrder($Order);
         }
+
+        return $Order->getHash();
     },
     ['basketId', 'orderHash']
 );

bin/frontend/classes/Basket.js

@@ -431,10 +431,10 @@ define('package/quiqqer/order/bin/frontend/classes/Basket', [
                 return Promise.resolve();
             }
 
-            self.fireEvent('refreshBegin', [this]);
+            this.fireEvent('refreshBegin', [this]);
             this.fireEvent('removeBegin', [this]);
 
-            self.$products.splice(index, 1);
+            this.$products.splice(index, 1);
 
             return self.save().then(function () {
                 self.fireEvent('remove', [self]);

bin/frontend/controls/OrderProcess.js

@@ -174,6 +174,10 @@ define('package/quiqqer/order/bin/frontend/controls/OrderProcess', [
             this.$TimelineContainer = this.getElm().getElement('.quiqqer-order-ordering-timeline-container');
             this.$Form              = this.getElm().getElement('[name="order"]');
 
+            this.$Form.addEvent('submit', function (e) {
+                e.stop();
+            });
+
             if (this.getAttribute('buttons') === false) {
                 this.$Buttons.setStyle('display', 'none');
             }
@@ -215,7 +219,7 @@ define('package/quiqqer/order/bin/frontend/controls/OrderProcess', [
 
                 Done = QUI.parse(Nobody);
             }
-            
+
             // parse basket container - only in qui popup
             if (!Nobody &&
                 this.$StepContainer.getElement('.quiqqer-order-step-basket') &&

bin/frontend/controls/basket/Basket.js

@@ -67,6 +67,8 @@ define('package/quiqqer/order/bin/frontend/controls/basket/Basket', [
         $onImport: function () {
             // user need no import
             if (!this.isGuest()) {
+                this.getElm().style.outline = 0;
+                this.getElm().setAttribute('tabindex', "-1");
                 this.$setEvents();
 
                 this.$Loader.inject(this.getElm());
@@ -143,6 +145,7 @@ define('package/quiqqer/order/bin/frontend/controls/basket/Basket', [
          */
         $render: function (result) {
             this.getElm().set('html', result);
+
             this.$Loader.inject(this.getElm());
             this.$setEvents();
             this.$Loader.hide();
@@ -157,7 +160,9 @@ define('package/quiqqer/order/bin/frontend/controls/basket/Basket', [
                 Order = this.getOrderProcess();
 
             // remove
-            this.getElm().getElements('.fa-trash').getParent('button').addEvent('click', function () {
+            this.getElm().getElements('.fa-trash').getParent('button').addEvent('click', function (event) {
+                event.stop();
+console.log('DELETE');
                 self.$Loader.show();
 
                 var Article = this.getParent('.quiqqer-order-basket-small-articles-article');
@@ -190,6 +195,12 @@ define('package/quiqqer/order/bin/frontend/controls/basket/Basket', [
                 this.focus();
             });
 
+            this.getElm().getElements('[name="quantity"]').addEvent('keyup', function (event) {
+                if (event.key === 'enter') {
+                    self.getElm().focus();
+                }
+            });
+
             this.getElm().getElements('[name="quantity"]').addEvent('focus', function () {
                 this.set('data-quantity', parseInt(this.value));
 

src/QUI/ERP/Order/Controls/Basket/Basket.html

@@ -109,7 +109,7 @@
         </td>
         {if $this->getAttribute('editable')}
         <td class="quiqqer-order-basket-articles-article-remove">
-            <button>
+            <button type="button">
                 <span class="fa fa-trash"></span>
             </button>
         </td>

src/QUI/ERP/Order/Handler.php

@@ -91,6 +91,22 @@ public function getOrderProcessProvider()
         return $result;
     }
 
+    /**
+     * Remove a order instance
+     *
+     * @param $orderId
+     */
+    public function removeFromInstanceCache($orderId)
+    {
+        if (isset($this->orders[$orderId])) {
+            unset($this->orders[$orderId]);
+        }
+
+        if (isset($this->cache[$orderId])) {
+            unset($this->cache[$orderId]);
+        }
+    }
+
     //region Order
 
     /**

src/QUI/ERP/Order/OrderInProcess.php

@@ -59,6 +59,8 @@ public function refresh()
     {
         if ($this->orderId) {
             try {
+                Handler::getInstance()->removeFromInstanceCache($this->orderId);
+
                 $Order = Handler::getInstance()->get($this->orderId);
                 $Order->refresh();
             } catch (QUI\Exception $Exception) {
@@ -638,17 +640,20 @@ public function clear($PermissionUser = null)
 
         $this->delete();
 
-        $hash       = $this->getHash();
+        $hash = $this->getHash();
+
+        $oldOrderId = $this->getId();
         $newOrderId = QUI\ERP\Order\Factory::getInstance()->createOrderInProcessDataBaseEntry();
 
         QUI::getDataBase()->update(
             Handler::getInstance()->tableOrderProcess(),
-            ['hash' => $hash],
+            [
+                'hash' => $hash,
+                'id'   => $oldOrderId
+            ],
             ['id' => $newOrderId]
         );
 
-        $this->id = $newOrderId;
-
         $this->refresh();
 
         QUI::getEvents()->fireEvent('quiqqerOrderClear', [$this]);