wickes-css2 2.103.0-develop.4 → 2.103.0-develop.6

package/build/js/page/basket-v2.js

@@ -31,19 +31,6 @@ import {displayEnergyEfficiency} from "./basket/display-energy-efficiency";
 import {appendLoader, hideLoader, showLoader} from "./utils/loader";
 import { initStickyObserver } from './components/sticky-order-observer';
 import {addClassToSummaryAside} from "./basket/summary-mobile";
-import {handleQuantityChange} from "./basket/quantity-change-handler";
-import {updateQuantityAction} from "./basket/update-quantity";
-import {updateQuantityOperation} from "./basket/update-quantity-operation";
-import {
-    checkProductArrays,
-    getCartEntries,
-    getMessageInfo,
-    isMessageExist,
-    updatePromotion,
-    showNotification
-} from "./basket/basket-utils";
-import {updateCartBase} from "./basket/basket-update-cart";
-import {updateCartActionBase} from "./basket/basket-update-cart-action";
 
 var Wick = window.Wick || {};
 Wick.BasketPage = {
@@ -205,17 +192,36 @@ Wick.BasketPage = {
         }
 
         //for local update quantity value before API Call
-        handleQuantityChange({
-            quantityInput,
-            action,
-            value,
-            context,
-            charity,
-            entryNumber,
-            onQuantityChange: Wick.BasketPage.updateQuantityAction,
-            debounceQuantityChange: Wick.BasketPage.debounceQuantityChange,
-            onRemoveQuantityDisable: Wick.BasketPage.removeQuantityDisable
-        });
+        switch (action) {
+            case 'plus':
+                value = Number.parseInt(value, 10) + 1;
+                if (value) {
+                    Wick.BasketPage.updateQuantity(quantityInput, value);
+                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
+                }
+                break;
+            case 'minus':
+                value = Number.parseInt(value, 10) - 1;
+                if (value > 0) {
+                    Wick.BasketPage.updateQuantity(quantityInput, value);
+                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
+                } else {
+                    Wick.BasketPage.removeQuantityDisable();
+                }
+
+                break;
+            case 'remove':
+                value = 0;
+                charity || Wick.BasketPage.updateQuantity(quantityInput, value);
+                Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
+                break;
+            default:
+                if (+value !== 0) {
+                    Wick.BasketPage.updateQuantity(quantityInput, value);
+                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
+                }
+                break;
+        }
 
         changeWisdomWhenQuantityUpdated(e, context);
         Wick.BasketPage.toggleItemTotal(context, +quantityInput.val())
@@ -225,23 +231,54 @@ Wick.BasketPage = {
         Wick.BasketPage.updateQuantityAction(entryNumber, value, quantityInput, context)
     }, 500),
     updateQuantityAction: function (entryNumber, quantityToUpdate, quantityInput, context) {
-        updateQuantityAction({
-            entryNumber,
-            quantityToUpdate,
-            quantityInput,
-            context,
-            addQuantityDisable: Wick.BasketPage.addQuantityDisable,
-            removeQuantityDisable: Wick.BasketPage.removeQuantityDisable,
-            hideLoader: hideLoader,
-            loaderSelector: Wick.BasketPage.el.loader,
-            updateAction: Wick.BasketPage.updateAction,
-            updateQuantityOperation: Wick.BasketPage.updateQuantityOperation,
-            basketData: Wick.BasketData,
-            isLocalEnv: Wick.checkLocalEnv,
-            callActionFn: callAction,
-            routes: ROUTES,
-            basketSectionSelector: Wick.BasketPage.el.basketMainSection
-        });
+        console.log('case(api) to update quantity', entryNumber, quantityToUpdate);
+        //checkEnv
+        if (!Wick.checkLocalEnv) {
+            // api
+            Wick.BasketPage.addQuantityDisable(context);
+            const payload = {
+                url: `${ROUTES.BASKET_ADD_STOCK}/${entryNumber}`,
+                queries: {
+                    quantity: quantityToUpdate,
+                },
+                type: 'PUT',
+                complete: () => {
+                    Wick.BasketPage.removeQuantityDisable();
+                    hideLoader(Wick.BasketPage.el.loader);
+                },
+            }
+
+            callAction(
+              payload,
+              Wick.BasketPage.updateAction,
+              quantityToUpdate,
+              quantityInput,
+              context,
+              (response) => {
+                  if (response.statusMessage === 'accConfirmedMsgs') {
+                      const basketSection = Wick.BasketPage.el.basketMainSection;
+                      $(document).trigger("EEUpdateCart", {
+                          cartEntryNumber: entryNumber,
+                          initialCartQuantity: response.quantity - response.quantityAdded,
+                          newCartQuantity: response.quantity,
+                          fulfillment: context.hasClass('charity-new') ? 'Delivery' : context.closest(basketSection).attr('data-type'),
+                      });
+                  }
+                  context.find(Wick.BasketPage.el.actionButton).removeClass('disabled');
+              });
+        } else {
+            Wick.BasketPage.updateQuantityOperation(
+              quantityToUpdate,
+              quantityInput,
+              context,
+              Wick.BasketData.updateQuantity
+            );
+            Wick.BasketPage.addQuantityDisable(context);
+            setTimeout(() => {
+                Wick.BasketPage.removeQuantityDisable();
+                hideLoader(Wick.BasketPage.el.loader);
+            }, 500);
+        }
     },
     updateAction: function (response, quantityToUpdate, quantityInput, context, successCallback) {
         Wick.BasketPage.updateQuantityOperation(
@@ -253,17 +290,54 @@ Wick.BasketPage = {
         successCallback(response);
     },
     updateQuantityOperation: function (quantityToUpdate, quantityInput, context, data) {
-        updateQuantityOperation(quantityToUpdate, quantityInput, context, data, {
-            updateCart: Wick.BasketPage.updateCart,
-            showNotification: Wick.BasketPage.showNotification,
-            updateQuantity: Wick.BasketPage.updateQuantity,
-            updateItemTotal: Wick.BasketPage.updateItemTotal,
-            isMessageExist: Wick.BasketPage.isMessageExist,
-            getMessageInfo: Wick.BasketPage.getMessageInfo
-        });
+        const charity = context.hasClass('charity-new'),
+            negativeStatus = data.statusMessage !== 'accConfirmedMsgs',
+            messageInfo = Wick.BasketPage.isMessageExist(data) && Wick.BasketPage.getMessageInfo(data);
+        let maxValue, minValue;
+
+        if (!charity) {
+            maxValue = +quantityInput.attr('max');
+            minValue = +quantityInput.attr('min');
+        }
+
+        console.log('errorStatus:', negativeStatus);
+
+        minValue === 0 ? minValue = 1 : minValue = minValue;
+
+        if (negativeStatus) {
+            Wick.BasketPage.updateCart(messageInfo);
+            Wick.BasketPage.updateQuantity(quantityInput, data.quantity);
+            Wick.BasketPage.showNotification(data);
+        } else {
+            if (charity) {
+                Wick.BasketPage.updateCart();
+            } else {
+                if (maxValue > 1 || minValue > 1) {
+                    if (quantityToUpdate > maxValue || quantityToUpdate < minValue) {
+                        Wick.BasketPage.showNotification(data);
+                    }
+                }
+
+                if (quantityToUpdate === 0) {
+                    Wick.BasketPage.showNotification(data);
+                    Wick.BasketPage.updateCart(messageInfo);
+                } else {
+                    Wick.BasketPage.updateItemTotal(data, context)
+                    Wick.BasketPage.updateCart(null, context)
+                }
+            }
+        }
+
+    },
+    isMessageExist: function (data) {
+        return data.message && data.statusMessage;
+    },
+    getMessageInfo: function (data) {
+        return {
+            message: data.message,
+            status: data.statusMessage,
+        }
     },
-    isMessageExist: isMessageExist,
-    getMessageInfo: getMessageInfo,
     loadIndexing: function () {
         Wick.BasketPage.el.$orderItem.each(function (index) {
             $(this).attr('data-id', index);
@@ -290,92 +364,107 @@ Wick.BasketPage = {
             }
         }
     },
-    toggleItemTotal: function(context, quantity) {
+    toggleItemTotal: function (context, quantity) {
         quantity <= 1
-          ? $(context).find(Wick.BasketPage.el.total).addClass(Wick.BasketPage.el.totalHide)
-          : $(context).find(Wick.BasketPage.el.total).removeClass(Wick.BasketPage.el.totalHide);
+            ? $(context).find(Wick.BasketPage.el.total).addClass(Wick.BasketPage.el.totalHide)
+            : $(context).find(Wick.BasketPage.el.total).removeClass(Wick.BasketPage.el.totalHide);
     },
     updateCart: function (repaintData, context, charity, initial, callback) {
         console.log('case(api) to update cart');
-        updateCartBase({
-            isLocalEnv: Wick.checkLocalEnv,
-            apiUrl: ROUTES.BASKET_GET_CART,
-            apiType: 'GET',
-            hideLoader: () => setTimeout(() => hideLoader(Wick.BasketPage.el.loader), 1000),
-            callActionFn: callAction,
-            actionCallback: callback || Wick.BasketPage.updateCartAction,
-            repaintData,
-            context,
-            charity,
-            initial,
-            localUpdateFn: function(initial, repaintData, context, charity) {
-                if (initial) {
-                    Wick.BasketPage.getCartEntries(Wick.BasketData.initialCartState);
-                    addClassToSummaryAside(Wick.BasketData.initialCartState);
-                    const initialTotalPrice = Wick.BasketData.initialCartState.totalPrice.value;
-                    updateClearpayVisibility(initialTotalPrice);
-                } else {
-                    updateBasketDataQuantity();
-                    updateOrderSummary(
-                      Wick.BasketData.updateCart,
-                      Wick.BasketPage.getEqualMapForUpdateCart(Wick.BasketData.updateCart)
-                    );
-                    !repaintData || Wick.BasketPage.repaintOrderItems(Wick.BasketData.updateCart, repaintData);
-                    !charity || Wick.BasketPage.addCharityEntryNumber(Wick.BasketData.updateCart);
-                    if (context && context.length) {
-                        Wick.BasketPage.updatePromotion(Wick.BasketData.updateCart, context);
-                    }
-                    updateKlarnaPlacements(Wick.BasketData.updateCart.totalPrice.formattedPriceWithoutCurrencySymbol);
-                    updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
-                    updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
-                    Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
-                    addClassToSummaryAside(Wick.BasketData.updateCart);
-                    Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
-                    Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
-                    updateBasketSession();
-                    Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels();
-                    setTimeout(() => hideLoader(Wick.BasketPage.el.loader), 1000);
+        const info = {repaintData, context, charity, initial}
+        const actionCallback = callback || Wick.BasketPage.updateCartAction;
+
+        if (!Wick.checkLocalEnv) {
+            const payload = {
+                url: ROUTES.BASKET_GET_CART,
+                type: 'GET',
+                complete: hideLoader(Wick.BasketPage.el.loader),
+            }
+
+            callAction(payload, actionCallback, info)
+        } else {
+            if (initial) {
+                Wick.BasketPage.getCartEntries(Wick.BasketData.initialCartState);
+                addClassToSummaryAside(Wick.BasketData.initialCartState);
+                const initialTotalPrice = Wick.BasketData.initialCartState.totalPrice.value;
+                updateClearpayVisibility(initialTotalPrice);
+            } else {
+                updateBasketDataQuantity();
+                updateOrderSummary(
+                    Wick.BasketData.updateCart,
+                    Wick.BasketPage.getEqualMapForUpdateCart(Wick.BasketData.updateCart)
+                );
+
+                !repaintData || Wick.BasketPage.repaintOrderItems(Wick.BasketData.updateCart, repaintData);
+                !charity || Wick.BasketPage.addCharityEntryNumber(Wick.BasketData.updateCart);
+
+                //update promotion when update quantity
+                if (context && context.length) {
+                    Wick.BasketPage.updatePromotion(Wick.BasketData.updateCart, context);
                 }
+
+                updateKlarnaPlacements(Wick.BasketData.updateCart.totalPrice.formattedPriceWithoutCurrencySymbol);
+                updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
+                updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
+                Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
+                addClassToSummaryAside(Wick.BasketData.updateCart);
+                Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
+                Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
+                updateBasketSession();
+                Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels();
+                setTimeout(hideLoader, 1000);
             }
-        });
+        }
     },
-    updateCartAction: function (response, {repaintData, charity, initial, context}) {
-        updateClearpayVisibility(response.totalPrice.value);
-        addClassToSummaryAside(response);
-
-        updateCartActionBase({
-            response,
-            repaintData,
-            context,
-            charity,
-            initial,
-            updateOrderSummaryFn: updateOrderSummary,
-            getEqualMapFn: Wick.BasketPage.getEqualMapForUpdateCart,
-            repaintOrderItemsFn: Wick.BasketPage.repaintOrderItems,
-            addCharityEntryNumberFn: Wick.BasketPage.addCharityEntryNumber,
-            updatePromotionFn: Wick.BasketPage.updatePromotion,
-            addPotentialPromoFn: Wick.BasketPage.addPotentialPromo,
-            cartEntries: Wick.BasketPage.cartEntries,
-            getCartEntriesFn: () => Wick.BasketPage.getCartEntries(response),
-            checkProductArraysFn: Wick.BasketPage.checkProductArrays,
-            removeOrderItemFn: Wick.BasketPage.removeOrderItem,
-            elOrderItem: Wick.BasketPage.el.orderItem,
-            updateKlarnaPlacementsFn: updateKlarnaPlacements,
-            updateClearpayPlacementsFn: updateClearpayPlacements,
-            updateClearpayVisibilityFn: updateClearpayVisibility,
-            addClassToSummaryAsideFn: addClassToSummaryAside,
-            updateBasketSessionFn: updateBasketSession,
-            drawEnergyLabelsFn: Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels,
-            extraActions: (response) => {
-                updateEeaProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
-                updateEeaCheckoutProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
-                syncEeaProducts();
+    updateCartAction: function (response, info) {
+        updateClearpayVisibility(response.totalPrice.value)
+        addClassToSummaryAside(response)
+        if (info.initial) {
+            Wick.BasketPage.getCartEntries(response);
+        } else {
+            updateOrderSummary(response, Wick.BasketPage.getEqualMapForUpdateCart(response));
+            if (info.repaintData) {
+                if (info.repaintData.isChangeDelivery) {
+                    info.repaintData.cartEntry = Wick.BasketPage.cartEntries
+                        .filter(entry => entry.entryNumber === info.repaintData.cartEntryNumber)[0];
+                    $(document).trigger("EEUpdateDeliveryMode", info.repaintData);
+                }
+
+                Wick.BasketPage.checkProductArrays(response) ?
+                    Wick.BasketPage.repaintOrderItems(response, info.repaintData) :
+                    (() => {
+                        $(Wick.BasketPage.el.orderItem).remove();
+                        Wick.BasketPage.removeOrderItem(info.repaintData);
+                    })();
             }
-        });
+
+            !info.charity || Wick.BasketPage.addCharityEntryNumber(response);
+
+            //update promotion when update quantity
+            if (info.context && info.context.length) {
+                Wick.BasketPage.updatePromotion(response, info.context);
+            }
+
+            Wick.BasketPage.addPotentialPromo(response);
+            updateEeaProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
+            updateEeaCheckoutProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
+            syncEeaProducts();
+            $(document).trigger("cartUpdate");
+            Wick.BasketPage.getCartEntries(response);
+            updateKlarnaPlacements(response.totalPrice.formattedPriceWithoutCurrencySymbol);
+            updateClearpayPlacements(response.totalPrice.value);
+            updateClearpayVisibility(response.totalPrice.value);
+            updateBasketSession();
+            Wick.EnergyEfficiency.drawEnergyLabels()
+        }
+    },
+    checkProductArrays(cart) {
+        return cart.pickupUniqueItemsNumber || cart.deliveryUniqueItemsNumber;
     },
-    checkProductArrays: checkProductArrays,
-    getCartEntries: function(data) {
-        Wick.BasketPage.cartEntries = getCartEntries(data);
+    getCartEntries(data) {
+        Wick.BasketPage.cartEntries = data.deliveryOrderGroups.concat(data.pickupOrderGroups)
+            .map(orderGroup => orderGroup.entries)
+            .flatMap(entries => entries);
     },
     addCharityEntryNumber: function (data) {
         let entryNumber;
@@ -392,17 +481,34 @@ Wick.BasketPage = {
             )
         }
     },
-    updatePromotion: function(data, context) {
-        updatePromotion(
-          data,
-          Wick.BasketPage.el.orderItem,
-          Wick.BasketPage.el.orderItemOffers,
-          Wick.BasketPage.el.orderItemInfo,
-          Wick.BasketPage.addPromotions
-        );
+    updatePromotion: function (data) {
+        $(Wick.BasketPage.el.orderItem).each(function () {
+            let itemNumber = {entryNumber: +$(this).attr('data-id')}
+            $(this).find(Wick.BasketPage.el.orderItemOffers).remove()
+            $(this).find(Wick.BasketPage.el.orderItemInfo).append(Wick.BasketPage.addPromotions(itemNumber, data));
+        })
     },
-    showNotification: function(data) {
-        showNotification(data, '.notification-area');
+    showNotification: function (data) {
+        let notificationType;
+        switch (data.statusMessage) {
+            case 'accConfirmedMsgs':
+                notificationType = 'success'
+                break;
+            case 'accWarnMsgs':
+                notificationType = 'warning'
+                break;
+            case 'accErrorMsgs':
+                notificationType = 'error'
+                break;
+        }
+
+        Wick.Notification.show({
+            text: data.message,
+            container: '.notification-area',
+            type: notificationType,
+            closeBtn: true
+        });
+
     },
     hideUnusedDeliveryTypeCost: function (data, isVoucher) {
         $(Wick.BasketPage.el.delivery).show()

package/build/js/page/components/discounts.js

@@ -1,22 +1,22 @@
 const osEl = {
-  $discountList: () => $('.checkout-widget__details-discount').find('ul'),
+  $discountList: $('.checkout-widget__details-discount ul'),
   discountItem: '.checkout-widget__details-discount',
 }
 
 export function updateDiscount(data, isVoucher) {
   if ((Array.isArray(data.promotionsInfo) && data.promotionsInfo.length)) {
     $(osEl.discountItem).show();
-    osEl.$discountList().empty();
+    osEl.$discountList.empty();
 
     !data.promotionsInfo || data.promotionsInfo.forEach(function (discountObj) {
       appendOrderPromotions(discountObj);
     });
   } else if (isVoucher && (Array.isArray(data.promotionsInfo) && data.promotionsInfo.length)) {
     $(osEl.discountItem).show();
-    osEl.$discountList().empty();
+    osEl.$discountList.empty();
 
     data.promotionsInfo.forEach(function (discountItem) {
-      osEl.$discountList().append(function () {
+      osEl.$discountList.append(function () {
         if (discountItem.usedCouponCode && discountItem.description) {
           return `
             <li data-coupon-code="${discountItem.usedCouponCode}">
@@ -44,9 +44,9 @@ export function updateDiscount(data, isVoucher) {
 function appendOrderPromotions(discountObj) {
   if (!_.isEmpty(discountObj)) {
     if (discountObj.usedCouponCode && discountObj.description) {
-      osEl.$discountList().append(createRemoveCouponItem(discountObj));
+      osEl.$discountList.append(createRemoveCouponItem(discountObj));
     } else if (discountObj.description) {
-      osEl.$discountList().append(function () {
+      osEl.$discountList.append(function () {
         return `<li>${discountObj.description}</li>`
       });
     }