wickes-css2 2.103.0-0.3.0-legends.4 → 2.103.0-0.3.0-legends.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.103.0-0.3.0-legends.4",
+  "version": "2.103.0-0.3.0-legends.6",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {

package/src/js/components/general/cart-slider.js

@@ -11,6 +11,7 @@ createPopupSlider({
     const htmlContent = event.detail.html;
     $(el.slider).append(htmlContent);
     showSlider();
+    Wick.MiniBasketSliderFE.isMiniBasketLoaded = false;
     $(el.sliderWrap).on('scroll', _.debounce(() => handleScroll(el.sliderWrap), 100));
   },
   onClose: function () {

package/src/js/page/components/mini-basket-slider.js

@@ -144,6 +144,7 @@ Wick.MiniBasketSliderFE = {
   isInitial: true,
   isMiniBasketOpened: false,
   actionEventType: null,
+  isMiniBasketLoaded: false,
   miniBasketUpdateItemQuantity(e) {
     const $item = $(e.currentTarget).closest(Wick.MiniBasketSliderFE.el.productCardPreview);
     const quantityElement = $item.find(Wick.MiniBasketSliderFE.el.quantityValue)
@@ -312,21 +313,21 @@ Wick.MiniBasketSliderFE = {
 
     $(Wick.MiniBasketSliderFE.el.orderItem).remove();
 
-    if (ccGroup.length) {
-      ccGroup.forEach((obj) => {
+    if (deliveryGroup.length) {
+      deliveryGroup.forEach((obj) => {
         obj.entries.forEach(item => {
-          itemDetails = { item, type: 'cc', data, position };
+          if (item.charity) return;
+          itemDetails = { item, type: 'delivery', data, position };
           $(Wick.MiniBasketSliderFE.el.products).append(Wick.MiniBasketSliderFE.createOrderItem(itemDetails));
           position++;
         });
       })
     }
 
-    if (deliveryGroup.length) {
-      deliveryGroup.forEach((obj) => {
+    if (ccGroup.length) {
+      ccGroup.forEach((obj) => {
         obj.entries.forEach(item => {
-          if (item.charity) return;
-          itemDetails = { item, type: 'delivery', data, position };
+          itemDetails = { item, type: 'cc', data, position };
           $(Wick.MiniBasketSliderFE.el.products).append(Wick.MiniBasketSliderFE.createOrderItem(itemDetails));
           position++;
         });
@@ -494,24 +495,18 @@ Wick.MiniBasketSliderFE = {
       setTimeout(() => {
         Wick.MiniBasketSliderFE.isInitial = false;
       }, 100);
-    } else {
-      if (!Wick.MiniBasketSliderFE.cartEntries.length) {
-        Wick.MiniBasketSliderFE.updateCart(
-          true,
-          undefined,
-          undefined,
-          false,
-          function (response, params) {
-            Wick.MiniBasketSliderFE.updateCartAction(response, params);
-            if (!Wick.MiniBasketSliderFE.isMiniBasketOpened) {
-              Wick.MiniBasketSliderFE.showMiniBasketEvent();
-              Wick.MiniBasketSliderFE.isMiniBasketOpened = true;
-            }
-          }
-        );
-      } else {
+      return;
+    }
+
+    if (!Wick.MiniBasketSliderFE.isMiniBasketLoaded) {
+      Wick.MiniBasketSliderFE.updateCart(true, undefined, undefined, false, function (response, params) {
+        Wick.MiniBasketSliderFE.updateCartAction(response, params);
+        Wick.MiniBasketSliderFE.isMiniBasketLoaded = true;
+        Wick.MiniBasketSliderFE.isMiniBasketOpened = true;
         Wick.MiniBasketSliderFE.showMiniBasketEvent();
-      }
+      });
+    } else {
+      Wick.MiniBasketSliderFE.showMiniBasketEvent();
     }
   },
   showMiniBasketEvent() {