orderiom-api-package 0.3.31 → 0.3.33

package/package.json

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

package/src/modules/order.js

@@ -395,9 +395,14 @@ const actions = {
                 // commit('setuserOrder', JSON.parse(res.data.data.order.user_details));
                 // commit('setshippigPriceOrder', res.data.data.order.shipping_price);
 
-                if(!data.$router || !data.routeName){
-                    window.location = res.data.data.paymentLink;
-                }else{
+                if(
+                    (
+                        res.data.data.paymentLink.includes("/paymentstatus/?") ||
+                        res.data.data.paymentLink.includes("/paymentstatus?")
+                    ) &&
+                    data.$router &&
+                    data.routeName
+                ){
                     data.$router.push({
                         name: data.routeName,
                         query: res.data.data.paymentLink
@@ -410,6 +415,8 @@ const actions = {
                                 return result;
                             }, {})
                     });
+                } else {
+                    window.location = res.data.data.paymentLink;
                 }
 
                 var index = data.basket ? basketData.indexOf(basketData.find((item) => item.basketId == data.basket)) :

package/src/modules/product.js

@@ -38,7 +38,10 @@ const getters = {
 
 		ids.forEach(id=>{
 			let filter = state.products.find(i=> i.subcategory_id === id)
-			subCategories.push({name: filter.subcategory_name, id: filter.subcategory_id, imagePath: filter.subcategory_image})
+			subCategories.push({name: filter.subcategory_name, id: filter.subcategory_id, imagePath: filter.subcategory_image, priority: filter.subcategory_priority})
+            subCategories.sort(function(a,b) {
+                return a.priority - b.priority;
+            });
 		})
 
 		return subCategories