refactor: coupons#7

README.md

@@ -75,6 +75,8 @@ Developers
 - quiqqerOrderCustomerDataSave [QUI\ERP\Order\Controls\OrderProcess\CustomerData]
 - quiqqerOrderCustomerDataSaveEnd [QUI\ERP\Order\Controls\OrderProcess\CustomerData]
 
+- quiqqerOrderBasketRemovePos [QUI\ERP\Order\Basket\Basket, pos]
+
 ### Order Events
 
 - onOrderStart [\QUI\ERP\Order\OrderProcess]

ajax/frontend/basket/removePos.php

+<?php
+
+/**
+ * This file contains package_quiqqer_order_ajax_frontend_basket_removePos
+ */
+
+/**
+ *
+ * @param integer $basketId
+ * @param integer $productId
+ * @return array
+ */
+QUI::$Ajax->registerFunction(
+    'package_quiqqer_order_ajax_frontend_basket_removePos',
+    function ($basketId, $pos) {
+        $User   = QUI::getUserBySession();
+        $Basket = new QUI\ERP\Order\Basket\Basket($basketId, $User);
+
+        QUI::getEvents()->fireEvent(
+            'quiqqerOrderBasketRemovePos',
+            [$Basket, $pos]
+        );
+    },
+    ['basketId', 'pos']
+);

ajax/frontend/basket/save.php

@@ -19,8 +19,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_frontend_basket_save',
     function ($basketId, $products) {
-        $User = QUI::getUserBySession();
-
+        $User   = QUI::getUserBySession();
         $Basket = new QUI\ERP\Order\Basket\Basket($basketId, $User);
 
         if (!QUI::getUsers()->isNobodyUser($User)) {

bin/frontend/classes/Basket.js

@@ -13,7 +13,7 @@
  * @event onClear [self]
  *
  * @event onRefreshBegin [self]
- * @event onRefresh [self]
+ * @event onRefresh [self]f
  */
 define('package/quiqqer/order/bin/frontend/classes/Basket', [
 
@@ -426,16 +426,23 @@ define('package/quiqqer/order/bin/frontend/classes/Basket', [
             var self  = this,
                 index = pos - 1;
 
-            if (typeof this.$products[index] === 'undefined') {
-                return Promise.resolve();
-            }
-
-            this.fireEvent('refreshBegin', [this]);
-            this.fireEvent('removeBegin', [this]);
+            return new Promise(function (resolve) {
+                QUIAjax.post('package_quiqqer_order_ajax_frontend_basket_removePos', function () {
+                    if (typeof self.$products[index] === 'undefined') {
+                        return resolve();
+                    }
 
-            this.$products.splice(index, 1);
+                    self.fireEvent('refreshBegin', [self]);
+                    self.fireEvent('removeBegin', [self]);
 
-            return self.save().then(function () {
+                    self.$products.splice(index, 1);
+                    self.save().then(resolve);
+                }, {
+                    'package': 'quiqqer/order',
+                    basketId : self.$basketId,
+                    pos      : index
+                });
+            }).then(function () {
                 self.fireEvent('remove', [self]);
                 self.fireEvent('refresh', [self]);
             });

bin/frontend/controls/OrderProcess.js

@@ -334,7 +334,7 @@ define('package/quiqqer/order/bin/frontend/controls/OrderProcess', [
             if (this.getElm().getElement('[data-qui="package/quiqqer/frontend-users/bin/frontend/controls/login/Login"]')) {
                 return;
             }
-
+return;
             QUIAjax.get('package_quiqqer_order_ajax_frontend_order_isLoggedIn', function (isLoggedIn) {
                 if (!isLoggedIn) {
                     // show login

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

@@ -369,7 +369,7 @@ public function hasOrder()
      */
     public function getOrder()
     {
-        if ($this->hash === null) {
+        if ($this->hash === null || empty($this->hash)) {
             throw new Exception(
                 QUI::getLocale()->get('quiqqer/order', 'exception.order.not.found'),
                 QUI\ERP\Order\Handler::ERROR_ORDER_NOT_FOUND