orderiom-api-package 0.4.10 → 0.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "types": "index.d.ts",

package/src/common.js

@@ -37,7 +37,7 @@ export function calculateBasketIdParameter(isLogin, restaurantId) {
 		console.error(e);
 		throw new Error('Basket not found');
 	}
-	const foundBasket = baskets.find(basket => Number(basket.restaurantId) === (Number(restaurantId) || restaurantIdEnv));
+	const foundBasket = baskets.findLast(basket => Number(basket.restaurantId) === (Number(restaurantId) || restaurantIdEnv));
 	if(!foundBasket){
 		throw new Error('Basket not found');
 	}

package/src/modules/order.js

@@ -593,6 +593,22 @@ const actions = {
           // commit('setorder', res.data.data.order)
           // commit('setuserOrder', JSON.parse(res.data.data.order.user_details));
           // commit('setshippigPriceOrder', res.data.data.order.shipping_price);
+          const basketData = JSON.parse(localStorage.getItem("basket"));
+          if (basketData) {
+              const index = basketId
+                  ? basketData.findIndex(item => Number(item.basketId) === Number(basketId))
+                  : basketData.findIndex(item => Number(item.restaurantId) === Number(data.restaurantId || restaurantIdEnv))
+              if (index > -1) {
+                  basketData.splice(index, 1);
+                  localStorage.setItem("basket", JSON.stringify(basketData));
+              }
+          }
+
+          commit("product/SetSubtotalPrice", "0.00", {root: true});
+          commit("product/SetShoppingCart", [], {root: true});
+          commit("product/setBasketInfo", {}, {root: true});
+          commit("product/setDeliveryTime", "", {root: true});
+          commit("product/SetTotalPrice", "0.00", { root: true });
 
           if (
               (
@@ -618,23 +634,6 @@ const actions = {
               window.location = res.data.data.paymentLink;
           }
 
-          const basketData = JSON.parse(localStorage.getItem("basket"));
-          if (basketData) {
-              const index = basketId
-                  ? basketData.findIndex(item => Number(item.basketId) === Number(basketId))
-                  : basketData.findIndex(item => Number(item.restaurantId) === Number(data.restaurantId || restaurantIdEnv))
-              if (index > -1) {
-                  basketData.splice(index, 1);
-                  localStorage.setItem("basket", JSON.stringify(basketData));
-              }
-          }
-
-          commit("product/SetSubtotalPrice", "0.00", {root: true});
-          commit("product/SetShoppingCart", [], {root: true});
-          commit("product/setBasketInfo", {}, {root: true});
-          commit("product/setDeliveryTime", "", {root: true});
-          commit("product/SetTotalPrice", "0.00", { root: true });
-
           return {
               type: "success",
               msg: "ok",

package/src/modules/product.js

@@ -390,7 +390,9 @@ const actions = {
             }
 
             const selectedCategory = rootState.orderiomApiPackage.product.selectedCategory
-            if (selectedCategory) {
+            if (rootState.orderiomApiPackage.product.showPinnedProducts) {
+                dispatch("getPinnedProducts", restaurantId);
+            } else if (selectedCategory) {
                 dispatch("getProducts", {
                     category: selectedCategory,
                     restaurantId: restaurantId,
@@ -403,10 +405,6 @@ const actions = {
                 dispatch('getCategories', (restaurantId || restaurantIdEnv));
             }
 
-            if (rootState.orderiomApiPackage.product.showPinnedProducts) {
-                dispatch("getPinnedProducts", restaurantId);
-            }
-
             const result = await dispatch("getBasket", (restaurantId || restaurantIdEnv));
 
             return {