orderiom-api-package 0.3.18 → 0.3.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "scripts": {

package/src/modules/order.js

@@ -395,7 +395,24 @@ 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);
-                window.location = res.data.data.paymentLink;
+
+                if(!data.$router || !data.routeName){
+                    window.location = res.data.data.paymentLink;
+                }else{
+                    data.$router.push({
+                        name: data.routeName,
+                        query: res.data.data.paymentLink
+                            .split('?')[1]
+                            .split('&')
+                            .map(query => query.split('='))
+                            .reduce((result, element) => {
+                                if(!element) return result;
+                                result[element[0]] = element[1];
+                                return result;
+                            }, {})
+                    });
+                }
+
                 var index = data.basket ? basketData.indexOf(basketData.find((item) => item.basketId == data.basket)) :
                     basketData.indexOf(basketData.find((item) => item.restaurantId == data.restaurantId));
                 if (index > -1) {

package/src/modules/product.js

@@ -6,6 +6,7 @@ const state = () => ({
     selectedTime: null,
     selectedDate: null,
     categories: [],
+	subCategoris: [],
     selectedCategory: null,
     products: null,
     selectedProduct: null,
@@ -118,7 +119,10 @@ const mutations = {
     },
     basketLoadedOnce(state){
         state.basketLoadedOnce = true;
-    }
+    },
+    setSubCategories(state , subCategoris){
+		state.subCategoris = subCategoris;
+	}
 };
 const actions = {
     // TODO: note the axios in loop
@@ -215,6 +219,7 @@ const actions = {
         commit("setSelectedCategory", data.category);
 
         let basketId = undefined;
+        const subCategoris =[];
         try{
             basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
         } catch(e) {
@@ -228,11 +233,15 @@ const actions = {
             basketId
         }}).then(res => {
             res.data.data.forEach(productInCategory => {
+                if(productInCategory.subcategory_name && !state.subCategoris.includes(productInCategory.subcategory_name)){
+					subCategoris.push(productInCategory.subcategory_name)
+				}
                 productInCategory.quantity = state.ShoppingCart
                     .filter(itemInCart => Number(itemInCart.RestaurantProductId) === Number(productInCategory.id))
                     .reduce((a, b) => a.quantity + b.quantity, 0)
             });
 
+			commit('setSubCategories' , subCategoris)
             commit("setProduct", res.data.data);
             return { type: 'success', data: res.data.data }
         }).catch(