Migrate product component for Orders page

admin-dev/themes/new-theme/js/fos_js_routes.json

@@ -1 +1 @@
-{"base_url":"","routes":{"admin_cart_rules_search":{"tokens":[["text","\/sell\/catalog\/cart-rules\/search"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_search":{"tokens":[["text","\/sell\/customers\/search"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_carts":{"tokens":[["text","\/carts"],["variable","\/","\\d+","customerId"],["text","\/sell\/customers"]],"defaults":[],"requirements":{"customerId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_orders":{"tokens":[["text","\/orders"],["variable","\/","\\d+","customerId"],["text","\/sell\/customers"]],"defaults":[],"requirements":{"customerId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_carts_info":{"tokens":[["text","\/info"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_carts_create":{"tokens":[["text","\/sell\/orders\/carts\/new"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_edit_addresses":{"tokens":[["text","\/addresses"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_edit_carrier":{"tokens":[["text","\/carrier"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_set_free_shipping":{"tokens":[["text","\/rules\/free-shipping"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_add_rule":{"tokens":[["text","\/rules\/add"],["variable","\/","[^\/]++","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_delete_rule":{"tokens":[["text","\/delete"],["variable","\/","[^\/]++","cartRuleId"],["text","\/rules"],["variable","\/","[^\/]++","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_orders_duplicate_cart":{"tokens":[["text","\/duplicate-cart"],["variable","\/","\\d+","orderId"],["text","\/sell\/orders\/orders"]],"defaults":[],"requirements":{"orderId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]}},"prefix":"","host":"localhost","port":"","scheme":"http","locale":[]}
+{"base_url":"","routes":{"admin_products_search":{"tokens":[["text","\/sell\/catalog\/products\/search"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_cart_rules_search":{"tokens":[["text","\/sell\/catalog\/cart-rules\/search"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_view":{"tokens":[["text","\/view"],["variable","\/","\\d+","customerId"],["text","\/sell\/customers"]],"defaults":[],"requirements":{"customerId":"\\d+"},"hosttokens":[],"methods":["GET","POST"],"schemes":[]},"admin_customers_search":{"tokens":[["text","\/sell\/customers\/search"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_carts":{"tokens":[["text","\/carts"],["variable","\/","\\d+","customerId"],["text","\/sell\/customers"]],"defaults":[],"requirements":{"customerId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_customers_orders":{"tokens":[["text","\/orders"],["variable","\/","\\d+","customerId"],["text","\/sell\/customers"]],"defaults":[],"requirements":{"customerId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_carts_view":{"tokens":[["text","\/view"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_carts_info":{"tokens":[["text","\/info"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["GET"],"schemes":[]},"admin_carts_create":{"tokens":[["text","\/sell\/orders\/carts\/new"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_edit_addresses":{"tokens":[["text","\/addresses"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_edit_carrier":{"tokens":[["text","\/carrier"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_set_free_shipping":{"tokens":[["text","\/rules\/free-shipping"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_add_cart_rule":{"tokens":[["text","\/cart-rules"],["variable","\/","[^\/]++","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_delete_cart_rule":{"tokens":[["text","\/delete"],["variable","\/","[^\/]++","cartRuleId"],["text","\/cart-rules"],["variable","\/","[^\/]++","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_add_product":{"tokens":[["text","\/products"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+","productId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_carts_delete_product":{"tokens":[["text","\/delete-product"],["variable","\/","\\d+","cartId"],["text","\/sell\/orders\/carts"]],"defaults":[],"requirements":{"cartId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]},"admin_orders_view":{"tokens":[["text","\/view"],["variable","\/","[^\/]++","orderId"],["text","\/sell\/orders\/orders"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_orders_duplicate_cart":{"tokens":[["text","\/duplicate-cart"],["variable","\/","\\d+","orderId"],["text","\/sell\/orders\/orders"]],"defaults":[],"requirements":{"orderId":"\\d+"},"hosttokens":[],"methods":["POST"],"schemes":[]}},"prefix":"","host":"localhost","port":"","scheme":"http","locale":[]}

admin-dev/themes/new-theme/js/pages/order/create.js

@@ -27,15 +27,5 @@ import CreateOrderPage from './create/create-order-page';
 const $ = window.$;
 
 $(document).ready(() => {
-  const createOrderPage = new CreateOrderPage();
-
-  createOrderPage.listenForCustomerSearch();
-  createOrderPage.listenForCustomerSelect();
-  createOrderPage.listenForCartSelect();
-  createOrderPage.listenForOrderSelect();
-  createOrderPage.listenForCartEdit();
-  createOrderPage.listenForCartLoading();
-  createOrderPage.listenForCartRuleSearch();
-  createOrderPage.listenForCartRuleSelect();
-  createOrderPage.listenForCartRuleRemove();
+  new CreateOrderPage();
 });

admin-dev/themes/new-theme/js/pages/order/create/cart-editor.js

@@ -1,5 +1,3 @@
-import createOrderPageMap from "./create-order-map";
-
 /**
  * 2007-2019 PrestaShop SA and Contributors
  *
@@ -42,6 +40,9 @@ export default class CartEditor {
 
   /**
    * Changes cart addresses
+   *
+   * @param {Number} cartId
+   * @param {Object} addresses
    */
   changeCartAddresses(cartId, addresses) {
     $.post(this.router.generate('admin_carts_edit_addresses', {cartId}), addresses).then((cartInfo) => {
@@ -52,12 +53,12 @@ export default class CartEditor {
   /**
    * Modifies cart delivery option
    *
-   * @param cartId
-   * @param value
+   * @param {Number} cartId
+   * @param {Number} value
    */
   changeDeliveryOption(cartId, value) {
     $.post(this.router.generate('admin_carts_edit_carrier', {cartId}), {
-      carrier_id: value,
+      carrierId: value,
     }).then((cartInfo) => {
       EventEmitter.emit(eventMap.cartDeliveryOptionChanged, cartInfo);
     });
@@ -71,9 +72,79 @@ export default class CartEditor {
    */
   setFreeShipping(cartId, value) {
     $.post(this.router.generate('admin_carts_set_free_shipping', {cartId}), {
-      free_shipping: value,
+      freeShipping: value,
     }).then((cartInfo) => {
       EventEmitter.emit(eventMap.cartFreeShippingSet, cartInfo);
     });
   }
+
+  /**
+   * Adds cart rule to cart
+   *
+   * @param {Number} cartRuleId
+   * @param {Number} cartId
+   */
+  addCartRuleToCart(cartRuleId, cartId) {
+    $.post(this.router.generate('admin_carts_add_cart_rule', {cartId}), {
+      cartRuleId,
+    }).then((cartInfo) => {
+      EventEmitter.emit(eventMap.cartRuleAdded, cartInfo);
+    }).catch((response) => {
+      EventEmitter.emit(eventMap.cartRuleFailedToAdd, response.responseJSON.message);
+    });
+  }
+
+  /**
+   * Removes cart rule from cart
+   *
+   * @param {Number} cartRuleId
+   * @param {Number} cartId
+   */
+  removeCartRuleFromCart(cartRuleId, cartId) {
+    $.post(this.router.generate('admin_carts_delete_cart_rule', {
+      cartId,
+      cartRuleId,
+    })).then((cartInfo) => {
+      EventEmitter.emit(eventMap.cartRuleRemoved, cartInfo);
+    }).catch((response) => {
+      showErrorMessage(response.responseJSON.message);
+    });
+  }
+
+  /**
+   * Adds product to cart
+   *
+   * @param {Number} cartId
+   * @param {FormData} product
+   */
+  addProduct(cartId, product) {
+    $.ajax(this.router.generate('admin_carts_add_product', {cartId}), {
+      method: 'POST',
+      data: product,
+      processData: false,
+      contentType: false,
+    }).then((cartInfo) => {
+      EventEmitter.emit(eventMap.productAddedToCart, cartInfo);
+    }).catch((response) => {
+      showErrorMessage(response.responseJSON.message);
+    });
+  }
+
+  /**
+   * Removes product from cart
+   *
+   * @param {Number} cartId
+   * @param {Object} product
+   */
+  removeProductFromCart(cartId, product) {
+    $.post(this.router.generate('admin_carts_delete_product', {cartId}), {
+      productId: product.productId,
+      attributeId: product.attributeId,
+      customizationId: product.customizationId,
+    }).then((cartInfo) => {
+      EventEmitter.emit(eventMap.productRemovedFromCart, cartInfo);
+    }).catch((response) => {
+      showErrorMessage(response.responseJSON.message);
+    });
+  }
 }

admin-dev/themes/new-theme/js/pages/order/create/cart-rule-manager.js

@@ -23,11 +23,12 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-import Router from '../../../components/router';
-import createOrderMap from './create-order-map';
+import CartEditor from './cart-editor';
 import CartRulesRenderer from './cart-rules-renderer';
+import createOrderMap from './create-order-map';
 import {EventEmitter} from '../../../components/event-emitter';
 import eventMap from './event-map';
+import Router from '../../../components/router';
 
 const $ = window.$;
 
@@ -38,182 +39,91 @@ export default class CartRuleManager {
   constructor() {
     this.router = new Router();
     this.$searchInput = $(createOrderMap.cartRuleSearchInput);
-    this.$searchResultBox = $(createOrderMap.cartRulesSearchResultBox);
     this.cartRulesRenderer = new CartRulesRenderer();
+    this.cartEditor = new CartEditor();
+
+    this._initListeners();
 
     return {
-      onCartRuleSearch: () => {
-        this._search();
-      },
-      onCartRuleSelect: (cartRuleId, cartId) => {
-        this._addCartRuleToCart(cartRuleId, cartId);
-      },
-      onDoneSearchingCartRule: () => {
-        this._hideResultsDropdown();
-      },
-      onCartRuleRemove: (cartRuleId, cartId) => {
-        this._removeCartRuleFromCart(cartRuleId, cartId);
-      },
+      search: () => this._search(),
+      stopSearching: () => this.cartRulesRenderer.hideResultsDropdown(),
+      addCartRuleToCart: (cartRuleId, cartId) => this.cartEditor.addCartRuleToCart(cartRuleId, cartId),
+      removeCartRuleFromCart: (cartRuleId, cartId) => this.cartEditor.removeCartRuleFromCart(cartRuleId, cartId),
     };
   }
 
   /**
-   * Searches for cart rules by search phrase
+   * Initiates event listeners for cart rule actions
    *
    * @private
    */
-  _search() {
-    const searchPhrase = this.$searchInput.val();
-    if (searchPhrase.length < 3) {
-      return;
-    }
-
-    $.get(this.router.generate('admin_cart_rules_search'), {
-      search_phrase: searchPhrase,
-    }).then((cartRules) => {
-      this._renderSearchResults(cartRules);
-    }).catch((e) => {
-      showErrorMessage(e.responseJSON.message);
-    });
+  _initListeners() {
+    this._onCartRuleSearch();
+    this._onAddCartRuleToCart();
+    this._onAddCartRuleToCartFailure();
+    this._onRemoveCartRuleFromCart();
   }
 
   /**
-   * Adds cart rule to cart
-   *
-   * @param cartRuleId
-   * @param cartId
+   * Listens for cart rule search action
    *
    * @private
    */
-  _addCartRuleToCart(cartRuleId, cartId) {
-    $.post(this.router.generate('admin_carts_add_rule', {cartId}), {
-      cart_rule_id: cartRuleId,
-    }).then((cartInfo) => {
-      this.cartRulesRenderer.render(cartInfo.cartRules, cartInfo.products.length === 0);
-    }).catch((e) => {
-      this._displayErrorMessage(e.responseJSON.message);
+  _onCartRuleSearch() {
+    EventEmitter.on(eventMap.cartRuleSearched, (cartRules) => {
+      this.cartRulesRenderer.renderSearchResults(cartRules);
     });
   }
 
   /**
-   * Removes cart rule from cart
-   *
-   * @param cartRuleId
-   * @param cartId
+   * Listens event of add cart rule to cart action
    *
    * @private
    */
-  _removeCartRuleFromCart(cartRuleId, cartId) {
-    $.post(this.router.generate('admin_carts_delete_rule', {
-      cartId,
-      cartRuleId,
-    })).then((cartInfo) => {
-      EventEmitter.emit(eventMap.cartRuleRemoved, cartInfo);
-    }).catch((e) => {
-      showErrorMessage(e.responseJSON.message);
+  _onAddCartRuleToCart() {
+    EventEmitter.on(eventMap.cartRuleAdded, (cartInfo) => {
+      this.cartRulesRenderer.renderCartRulesBlock(cartInfo.cartRules, cartInfo.products.length === 0);
     });
   }
 
   /**
-   * Displays error message
-   *
-   * @param message
+   * Listens event when add cart rule to cart fails
    *
    * @private
    */
-  _displayErrorMessage(message) {
-    $(createOrderMap.cartRuleErrorText).text(message);
-    this._showErrorBlock();
+  _onAddCartRuleToCartFailure() {
+    EventEmitter.on(eventMap.cartRuleFailedToAdd, (message) => {
+      this.cartRulesRenderer.displayErrorMessage(message);
+    });
   }
 
   /**
-   * Shows error block
+   * Listens event for remove cart rule from cart action
    *
    * @private
    */
-  _showErrorBlock() {
-    $(createOrderMap.cartRuleErrorBlock).removeClass('d-none');
+  _onRemoveCartRuleFromCart() {
+    EventEmitter.on(eventMap.cartRuleRemoved, (cartInfo) => {
+      this.cartRulesRenderer.renderCartRulesBlock(cartInfo.cartRules, cartInfo.products.length === 0);
+    });
   }
 
   /**
-   * Responsible for rendering search results dropdown
-   *
-   * @param searchResults
+   * Searches for cart rules by search phrase
    *
    * @private
    */
-  _renderSearchResults(searchResults) {
-    this._clearSearchResults();
-    if (searchResults.cart_rules.length === 0) {
-      this._renderNotFound();
-
+  _search(searchPhrase) {
+    if (searchPhrase.length < 3) {
       return;
     }
-    this._renderFoundCartRules(searchResults.cart_rules);
-  }
-
-  /**
-   * Renders found cart rules after search
-   *
-   * @param cartRules
-   *
-   * @private
-   */
-  _renderFoundCartRules(cartRules) {
-    const $cartRuleTemplate = $($(createOrderMap.foundCartRuleTemplate).html());
-    for (const key in cartRules) {
-      const $template = $cartRuleTemplate.clone();
-      const cartRule = cartRules[key];
 
-      let cartRuleName = cartRule.name;
-      if (cartRule.code !== '') {
-        cartRuleName = `${cartRule.name} - ${cartRule.code}`;
-      }
-
-      $template.text(cartRuleName);
-      $template.data('cart-rule-id', cartRule.cartRuleId);
-      this.$searchResultBox.append($template);
-    }
-
-    this._showResultsDropdown();
-  }
-
-  /**
-   * Renders warning that no cart rule was found
-   *
-   * @private
-   */
-  _renderNotFound() {
-    const $template = $($(createOrderMap.cartRulesNotFoundTemplate).html()).clone();
-    this.$searchResultBox.html($template);
-
-    this._showResultsDropdown();
-  }
-
-  /**
-   * Empties cart rule search results block
-   *
-   * @private
-   */
-  _clearSearchResults() {
-    this.$searchResultBox.empty();
-  }
-
-  /**
-   * Displays cart rules search result dropdown
-   *
-   * @private
-   */
-  _showResultsDropdown() {
-    this.$searchResultBox.removeClass('d-none');
-  }
-
-  /**
-   * Hides cart rules search result dropdown
-   *
-   * @private
-   */
-  _hideResultsDropdown() {
-    this.$searchResultBox.addClass('d-none');
+    $.get(this.router.generate('admin_cart_rules_search'), {
+      search_phrase: searchPhrase,
+    }).then((cartRules) => {
+      EventEmitter.emit(eventMap.cartRuleSearched, cartRules);
+    }).catch((e) => {
+      showErrorMessage(e.responseJSON.message);
+    });
   }
 }