orderiom-api-package 0.4.45 → 0.4.46

package/package.json

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

package/src/modules/auth.js

@@ -79,10 +79,7 @@ const actions = {
                 if (authData.manager) {
                     window.localStorage.setItem("managerToken", res.data.data.access_token);
                     window.localStorage.setItem("expires_at", res.data.data.expires_at);
-                    return {
-                        type: 'success',
-                        msg: 'ok'
-                    };
+                    return res;
                 }
                 window.localStorage.setItem("privateToken", res.data.data.access_token);
                 window.localStorage.setItem("expires_at", res.data.data.expires_at);
@@ -103,10 +100,7 @@ const actions = {
                     }
                 }
 
-                return {
-                    type: 'success',
-                    msg: 'ok'
-                }
+                return res
             })
             .catch(
                 commonErrorCallback()
@@ -134,7 +128,7 @@ const actions = {
                     ...ordermood
                 });
                 return {
-                    type: 'success',
+                    ...res,
                     msg: res.data.message.body
                 }
             })
@@ -225,12 +219,7 @@ const actions = {
             for (let i = 0; i < baskets.length; i++) {
                 $http
                     .post(`api/basket/unassigned-basket`, { basketId: baskets[i] })
-                    .then(() => {
-                        return {
-                            type: 'success',
-                            msg: 'ok'
-                        };
-                    })
+                    .then(res => res)
                     .catch(
                         commonErrorCallback()
                     );
@@ -275,7 +264,7 @@ const actions = {
             .then((res) => {
                 dispatch("fetchUser");
                 return {
-                    type: 'success',
+                    ...res,
                     msg: res.data.message.body
                 }
             })
@@ -288,10 +277,7 @@ const actions = {
             .get(`api/auth/password/reset`, { params: { token: token } })
             .then((res) => {
                 commit('setEmail', res.data.data.email);
-                return {
-                    type: "success",
-                    msg: 'ok'
-                }
+                return res
             })
             .catch(
                 commonErrorCallback()
@@ -308,7 +294,7 @@ const actions = {
             .then((res) => {
                 // dispatch("fetchUser");
                 return {
-                    type: 'success',
+                    ...res,
                     msg: 'your password has successfully changed'
                 }
 
@@ -321,13 +307,13 @@ const actions = {
     update({ commit }, userData) {
         return $http.post('api/auth/user/update', null, {
             params: userData
-        }).then(result => {
+        }).then(res => {
             commit('updateUser', {
                 ...userData,
                 updated_at: new Date().toISOString() // has a little difference with server
             });
             return {
-                type: 'success',
+                ...res,
                 msg: result.data.message.body
             }
         }).catch(
@@ -337,10 +323,7 @@ const actions = {
     getUserAddress({ commit }) {
         return $http.get('api/auth/user/address').then((res) => {
             commit('setUserAddress', res.data.data);
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+            return res
         }).catch(
             commonErrorCallback()
         );
@@ -349,7 +332,7 @@ const actions = {
         return $http.post('api/auth/user/address/add', data).then((res) => {
             dispatch('getUserAddress')
             return {
-                type: 'success',
+                ...res,
                 msg: res.data.message.body
             }
         }).catch(
@@ -360,7 +343,7 @@ const actions = {
         return $http.put('api/auth/user/address/remove', { id }).then((res) => {
             dispatch('getUserAddress')
             return {
-                type: 'success',
+                ...res,
                 msg: res.data.message.body
             }
         }).catch(
@@ -371,7 +354,7 @@ const actions = {
         return $http.post('api/auth/user/address/edit', data).then((res) => {
             dispatch('getUserAddress')
             return {
-                type: 'success',
+                ...res,
                 msg: res.data.message.body
             }
         }).catch(
@@ -385,4 +368,4 @@ export default {
     state,
     mutations,
     actions
-};
+};

package/src/modules/order.js

@@ -165,12 +165,7 @@ const actions = {
         ...table,
         qrcode: data.qrcode,
       })
-      .then((res) => {
-        return {
-          type: "success",
-          msg: "ok",
-        };
-      })
+      .then(res => res)
       .catch(commonErrorCallback());
   },
   addToBasket({ dispatch, rootState }, data) {
@@ -552,12 +547,7 @@ const actions = {
           date: rootState.orderiomApiPackage.product.deliveryTime,
         },
       })
-      .then((res) => {
-        return {
-          type: "success",
-          msg: "ok",
-        };
-      })
+      .then(res => res)
       .catch(commonErrorCallback());
   },
   removeElement({}, data) {
@@ -636,10 +626,7 @@ const actions = {
 				window.location = res.data.data.paymentLink;
 			}
 
-			return {
-				type: "success",
-				msg: "ok",
-			};
+			return res;
 		}).catch(error => {
 			const status = error.response ? error.response.status : null;
 			if (status === 422) {
@@ -686,10 +673,7 @@ const actions = {
         commit("product/SetShoppingCart", [], { root: true });
         commit("product/setDeliveryTime", "", { root: true });
         commit("product/SetTotalPrice", "0.00", { root: true });
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },
@@ -702,7 +686,7 @@ const actions = {
       })
       .then((res) => {
         return {
-          type: "success",
+          ...res,
           msg: res.data.message.body,
         };
       })
@@ -745,10 +729,7 @@ const actions = {
         commit("setpaymentStatus", status);
         // if (status == "paid") {
         // dispatch('createOrder', data.basketId)
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
         // }
         // return {
         //     type: 'error',
@@ -799,10 +780,7 @@ const actions = {
           commit("product/setTotalWithDiscount", value, { root: true });
         }
 
-        return {
-          type: "success",
-          msg: "",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },
@@ -833,10 +811,7 @@ const actions = {
       })
       .then((res) => {
         commit("setTotalPrice", res.data.data.totalPrice);
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },
@@ -869,10 +844,9 @@ const actions = {
 			deliveryType: data.deliveryType,
 			duration: data.duration || undefined,
 			restaurantId: data.restaurantId,
-		}).then(() => {
+		}).then(res => {
 			dispatch("product/getBasket", data.restaurantId, {root: true});
-
-			return {type: "success", msg: ""};
+			return res;
 		}).catch(error => {
 			const status = error.response ? error.response.status : null;
 			if (status === 422) {
@@ -946,11 +920,11 @@ const actions = {
           basketId,
         },
       })
-      .then((result) => {
+      .then((res) => {
         dispatch("product/getBasket", data.restaurantId, { root: true });
         return {
-          type: "success",
-          msg: result.message,
+          ...res,
+          msg: res.message,
         };
       })
       .catch(commonErrorCallback());
@@ -974,10 +948,10 @@ const actions = {
           restaurantId: restaurantId,
         },
       })
-      .then((result) => {
+      .then((res) => {
         dispatch("product/getBasket", restaurantId, { root: true });
         return {
-          type: "success",
+          ...res,
           msg: "removed",
         };
       })
@@ -1001,10 +975,10 @@ const actions = {
         restaurantId: data.restaurantId,
         tip_price: data.tip_price,
       })
-      .then((result) => {
+      .then((res) => {
         dispatch("product/getBasket", data.restaurantId, { root: true });
         return {
-          type: "success",
+          ...res,
           msg: "removed",
         };
       })
@@ -1027,10 +1001,10 @@ const actions = {
         basketId,
         restaurantId: restaurantId,
       })
-      .then((result) => {
+      .then((res) => {
         dispatch("product/getBasket", restaurantId, { root: true });
         return {
-          type: "success",
+          ...res,
           msg: "removed",
         };
       })
@@ -1055,12 +1029,7 @@ const actions = {
           basketId,
         },
       })
-      .then((result) => {
-        return {
-          type: "success",
-          msg: "ok",
-        };
-      })
+      .then(res => res)
       .catch(commonErrorCallback());
   },
   editCartProductExtraInfo({ rootState, commit }, data) {
@@ -1149,10 +1118,7 @@ const actions = {
       })
       .then((res) => {
         window.location = res.data.data.paymentLink;
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },
@@ -1164,10 +1130,7 @@ const actions = {
       .then((res) => {
         const status = res.data.data.status;
         commit("setTablePaymentStatus", status);
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },
@@ -1176,10 +1139,7 @@ const actions = {
       .get(`/api/table-payments`, { params: { tablePaymentId } })
       .then((res) => {
         commit("setExternalTableOrdersFromPayment", res.data.data);
-        return {
-          type: "success",
-          msg: "ok",
-        };
+        return res;
       })
       .catch(commonErrorCallback());
   },

package/src/modules/product.js

@@ -306,10 +306,7 @@ const actions = {
                             });
                         }
                     });
-                return {
-                    type: 'success',
-                    msg: 'ok'
-                }
+                return res
             })
             .catch(
                 commonErrorCallback()
@@ -342,7 +339,7 @@ const actions = {
                 productInCategory.quantity = quantity;
             });
             commit("setProduct", res.data.data);
-            return { type: 'success', data: res.data.data }
+            return { ...res, data: res.data.data }
         }).catch(
             commonErrorCallback()
         );
@@ -382,7 +379,7 @@ const actions = {
             } else {
                 commit("setShowPinnedProducts", false);
             }
-            return { type: 'success', data: res.data.data }
+            return { ...res, data: res.data.data }
         }).catch(
             commonErrorCallback()
         );
@@ -454,12 +451,11 @@ const actions = {
                 restaurantId: data.restaurantId,
                 basketId: basketId
             }
-        }).then((result) => {
-            commit('setProductPackage', result.data.data)
+        }).then((res) => {
+            commit('setProductPackage', res.data.data)
             return {
-                type: 'success',
-                msg: '',
-                data: result.data.data
+                ...res,
+                data: res.data.data
             }
         }).catch(
             commonErrorCallback()
@@ -581,18 +577,10 @@ const actions = {
             }
         })
     },
-    fetchMostSelling({ commit }, data) {
-        return $http.get('api/restaurant/most-selling', {
-            params: data
-        }).then((res) => {
-            return {
-                type: 'success',
-                message: '',
-                data: res.data
-            }
-        }).catch(
-            commonErrorCallback()
-        );
+    fetchMostSelling({ commit }, params) {
+        return $http.get('api/restaurant/most-selling', { params })
+			.then(res => res)
+			.catch(commonErrorCallback());
     },
 };
 

package/src/modules/restaurant.js

@@ -71,10 +71,7 @@ const actions = {
             }
         }).then(res => {
             commit('setRestaurants', res.data.data)
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+            return res
         }).catch(error => {
             commit('setRestaurants', [])
             return commonErrorCallback()(error);
@@ -102,9 +99,9 @@ const actions = {
         );
     },
     contact({ }, data) {
-        return $http.post('api/contact', data).then((result) => {
+        return $http.post('api/contact', data).then((res) => {
             return {
-                type: 'success',
+                ...res,
                 msg: 'your message has been delivered successfully!'
             }
         }).catch(
@@ -123,7 +120,7 @@ const actions = {
             params: data
         }).then((res) => {
             return {
-                type: 'success',
+                ...res,
                 msg: res.data.message.body
             }
         }).catch(
@@ -135,18 +132,15 @@ const actions = {
             params: {
                 restaurantId: restaurantId
             }
-        }).then((result) => {
-            commit('setTables', result.data.data);
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+        }).then((res) => {
+            commit('setTables', res.data.data);
+            return res
         }).catch(
             commonErrorCallback()
         );
     },
     addReservedTables({ commit }, data) {
-        return $http  
+        return $http
         .post("api/restaurant/reserve-table", {
             restaurantId: data.restaurantId,
             people: data.people,
@@ -155,12 +149,9 @@ const actions = {
             email: data.email,
             name: data.name,
             phone: data.phone,
-        }).then((result) => {
-            commit('setReservedTables', result.data.data);
-            return {
-                type: 'success',
-                msg: ''
-            }
+        }).then((res) => {
+            commit('setReservedTables', res.data.data);
+            return res
         }).catch(
             commonErrorCallback('There was an error in adding reserved tables')
         );
@@ -170,10 +161,7 @@ const actions = {
             params: restaurantId
         }).then(res => {
             commit('setBlogs', res.data.data)
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+            return res
         }).catch(error => {
             commit('setBlogs', [])
             return commonErrorCallback()(error);
@@ -189,8 +177,7 @@ const actions = {
         }).then(res => {
             commit('setBlogs', res.data.data)
             return {
-                type: 'success',
-                msg: '',
+                ...res,
                 tagName: res.data.meta.searched_tag.name
             }
         }).catch(error => {
@@ -216,10 +203,7 @@ const actions = {
             params: blogId
         }).then(res => {
             commit('setBlog', res.data.data)
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+            return res
         }).catch(error => {
             commit('setBlog', [])
             return commonErrorCallback()(error);
@@ -233,7 +217,7 @@ const actions = {
             }
         }).then(res => {
             commit('setBlog', res.data.data);
-            return { type: 'success', msg: 'ok' }
+            return res
         }).catch(error => {
             commit('setBlog', []);
             return commonErrorCallback()(error);
@@ -244,10 +228,7 @@ const actions = {
             params: data
         }).then(res => {
             commit('setTestimonials', res.data.data)
-            return {
-                type: 'success',
-                msg: 'ok'
-            }
+            return res
         }).catch(error => {
             commit('setTestimonials', []);
             return commonErrorCallback()(error);
@@ -262,17 +243,9 @@ const actions = {
         })
 	},
     getPostalCodes({commit}, restaurantId){
-        return $http.get('api/restaurant/postalCodes',{
-            params:{
-                restaurantId
-            }
-        }).then(res=>{
-            return {
-                type: 'success',
-                msg: '',
-                data: res.data
-            };
-        }).catch(commonErrorCallback())
+        return $http.get('api/restaurant/postalCodes',{params:{restaurantId}})
+			.then(res => res)
+			.catch(commonErrorCallback())
     }
 }
 export default {
@@ -280,4 +253,4 @@ export default {
     state,
     mutations,
     actions
-};
+};