orderiom-api-package 0.3.29 → 0.3.31

package/index.js

@@ -1,6 +1,8 @@
 import apiStore from './src';
 import enMsg from "./src/messages/en-api.json";
-import deMsg from "./src/messages/de-api.json"
+import deMsg from "./src/messages/de-api.json";
+import {$http} from './src/common';
+
 function install(Vue, options = {}, config = {}) {
     if (!options.store) console.log('Please provide a store!!');
     options.store.registerModule('orderiomApiPackage', apiStore, { preserveState: config.preserveState })
@@ -9,5 +11,6 @@ export default {
     install,
     enMsg,
     deMsg,
-    modules: apiStore.modules
+    modules: apiStore.modules,
+    $http
 }

package/package.json

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

package/src/common.js

@@ -1,3 +1,5 @@
+import axios from "axios";
+
 export const restaurantIdEnv = process.env.VUE_APP_RESTAURANT_ID ? parseInt(process.env.VUE_APP_RESTAURANT_ID) : null;
 
 export function commonErrorCallback(unknownErrorMessage = 'Something went wrong'){
@@ -71,3 +73,52 @@ export function updateBasket({commit, basketId, res, restaurantId}){
 	commit(`product/basketLoadedOnce`, null, { root: true });
 	return true;
 }
+
+axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL;
+axios.interceptors.request.use(config => {
+	const token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
+	if (token) config.headers["Authorization"] = `Bearer ${token}`;
+	return config;
+}, error => {
+	return Promise.reject(error);
+});
+axios.interceptors.response.use(response => {
+	return response;
+}, error => {
+	if (
+		error.response &&
+		error.response.data &&
+		error.response.data.error &&
+		error.response.data.error.validation
+	) {
+		const validation = error.response.data.error.validation;
+
+		if (
+			(
+				Object.keys(validation).includes("basketId") &&
+				validation["basketId"][0] === "basket_does_not_exists"
+			) ||
+			(
+				Object.keys(validation).includes("restaurantId") &&
+				validation["restaurantId"][0] === "basket_does_not_exists"
+			)
+		) {
+			localStorage.removeItem("basket");
+		}
+	}
+
+	if (
+		error.response &&
+		error.response.data &&
+		error.response.data.message &&
+		error.response.data.message.body === "unauthenticated" &&
+		localStorage.getItem("privateToken")
+	) {
+		localStorage.clear();
+		window.location.reload();
+	}
+
+	return Promise.reject(error);
+});
+
+export const $http = axios;

package/src/modules/auth.js

@@ -1,5 +1,4 @@
-import axios from "axios";
-import { commonErrorCallback } from '../common';
+import { commonErrorCallback, $http } from '../common';
 
 const state = {
     publicToken: null,
@@ -54,7 +53,7 @@ const mutations = {
 };
 const actions = {
     auth({ commit }) {
-        return axios
+        return $http
             .post("api/oauth/token", {
                 grant_type: process.env.VUE_APP_GRANT_TYPE,
                 client_id: process.env.VUE_APP_CLIENT_ID,
@@ -74,7 +73,7 @@ const actions = {
             delete data.restaurantId;
             delete data.ordermood
         }
-        return axios
+        return $http
             .post(`api/auth/login`, null, { params: data })
             .then(res => {
                 if (authData.manager) {
@@ -120,7 +119,7 @@ const actions = {
             delete data.restaurantId;
             delete authData.ordermood
         }
-        return axios
+        return $http
             .post(
                 `api/auth/signup`, null, {
                 params: data
@@ -167,7 +166,7 @@ const actions = {
         if (!state.privateToken) {
             return;
         }
-        return axios
+        return $http
             .get("api/auth/logout", {
                 params: {
                     ...restaurantId
@@ -189,7 +188,7 @@ const actions = {
         if (!state.privateToken) {
             return;
         }
-        return axios
+        return $http
             .get("api/auth/user")
             .then(res => {
                 const user = res.data.data;
@@ -206,7 +205,7 @@ const actions = {
             basket.find((basket) => basket.restaurantId == restaurantId).basketId
             : ''
         if (basketId)
-            axios
+            $http
                 .post(`api/basket/assign-basket`, null, { params: { basketId: basketId, restaurantId: restaurantId } })
                 .then(() => {
                     dispatch('product/getBasket', restaurantId, { root: true })
@@ -222,7 +221,7 @@ const actions = {
                 basket.find((basket) => basket.restaurantId == restaurantId).basketId
                 : ''
             if (basketId)
-                axios
+                $http
                     .post(`api/basket/unassigned-basket`, null, { params: { basketId: basketId } })
                     .then(() => {
                         return {
@@ -239,7 +238,7 @@ const actions = {
             if (!basket.length) return
             let baskets = basket.map(m => m.basketId)
             for (let i = 0; i < baskets.length; i++) {
-                axios
+                $http
                     .post(`api/basket/unassigned-basket`, null, { params: { basketId: baskets[i] } })
                     .then(() => {
                         return {
@@ -254,7 +253,7 @@ const actions = {
         }
     },
     restaurantInfo({ commit }, restaurantId) {
-        return axios
+        return $http
             .get("api/restaurant/restaurant-by-id", {
                 params: {
                     restaurantId: restaurantId
@@ -268,7 +267,7 @@ const actions = {
             );
     },
     userUpdate({ dispatch }, userData) {
-        return axios
+        return $http
             .post("api/auth/user/update", {
                 params: {
                     userData,
@@ -287,7 +286,7 @@ const actions = {
             email: data.email,
             restaurantId: data.restaurantId
         } : { email: data };
-        return axios
+        return $http
             .post("api/auth/forgot-password", formData)
             .then((res) => {
                 dispatch("fetchUser");
@@ -301,7 +300,7 @@ const actions = {
             );
     },
     checkToken({ commit }, token) {
-        return axios
+        return $http
             .get(`api/auth/password/reset`, { params: { token: token } })
             .then((res) => {
                 commit('setEmail', res.data.data.email);
@@ -315,7 +314,7 @@ const actions = {
             );
     },
     resetPassword({ }, data) {
-        return axios
+        return $http
             .post("api/auth/password/reset-password", {
                 email: data.email,
                 token: data.token,
@@ -336,7 +335,7 @@ const actions = {
 
     },
     update({ commit }, userData) {
-        return axios.post('api/auth/user/update', null, {
+        return $http.post('api/auth/user/update', null, {
             params: userData
         }).then(result => {
             commit('updateUser', {
@@ -352,7 +351,7 @@ const actions = {
         );
     },
     getUserAddress({ commit }) {
-        return axios.get('api/auth/user/address').then((res) => {
+        return $http.get('api/auth/user/address').then((res) => {
             commit('setUserAddress', res.data.data);
             return {
                 type: 'success',
@@ -363,7 +362,7 @@ const actions = {
         );
     },
     addUserAddress({ dispatch }, data) {
-        return axios.post('api/auth/user/address/add', null, { params: data }).then((res) => {
+        return $http.post('api/auth/user/address/add', null, { params: data }).then((res) => {
             dispatch('getUserAddress')
             return {
                 type: 'success',
@@ -374,7 +373,7 @@ const actions = {
         );
     },
     removeUserAddress({ dispatch }, id) {
-        return axios.put('api/auth/user/address/remove', null, { params: { id } }).then((res) => {
+        return $http.put('api/auth/user/address/remove', null, { params: { id } }).then((res) => {
             dispatch('getUserAddress')
             return {
                 type: 'success',
@@ -385,7 +384,7 @@ const actions = {
         );
     },
     editUserAddress({ dispatch }, data) {
-        return axios.post('api/auth/user/address/edit', null, { params: data }).then((res) => {
+        return $http.post('api/auth/user/address/edit', null, { params: data }).then((res) => {
             dispatch('getUserAddress')
             return {
                 type: 'success',

package/src/modules/manager.js

@@ -1,4 +1,4 @@
-import axios from "axios";
+import {$http} from '../common';
 
 const state = () => {
   return {
@@ -18,12 +18,12 @@ const mutations = {
 
 const actions = {
   getRestaurantInfo({ commit }) {
-    return axios.get("api/managers/restaurant").then((result) => {
+    return $http.get("api/managers/restaurant").then((result) => {
       commit("setRestaurantInfo", result.data.data[0]);
     });
   },
   getOrders({ commit }, {dateFrom,dateTo,filterType,restaurantId}) {
-    return axios
+    return $http
       .get("api/managers/order", {
         params: {
           from_date:dateFrom,
@@ -45,7 +45,7 @@ const actions = {
       status: data.status,
       restaurantId: data.restaurantId,
     };
-    return axios
+    return $http
       .post(
         `api/managers/order/change-status`,
 
@@ -59,7 +59,7 @@ const actions = {
       });
   },
   getOrdersPerMinute({},{startTime,endTime,filterType,id} ) {
-    return axios
+    return $http
       .get("api/managers/order", {
         params: {
           from_date: startTime,
@@ -76,7 +76,7 @@ const actions = {
       });
   },
   updateOrders({}, id) {
-    return axios
+    return $http
       .get("api/order", {
         params: {
           orderId: id,

package/src/modules/order.js

@@ -1,5 +1,4 @@
-import axios from "axios";
-import {commonErrorCallback, calculateBasketIdParameter, restaurantIdEnv, updateBasket} from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, restaurantIdEnv, updateBasket, $http} from '../common';
 
 const state = () => ({
     productOrder: null,
@@ -73,7 +72,7 @@ const actions = {
         // let delivery_time =
         //     `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()
         //     } ${(date.getHours()).toString().padStart(2, '0')}:${(date.getMinutes()).toString().padStart(2, '0')}`
-        return axios
+        return $http
             .post("api/basket/create", {
                 ...delivery_time,
                 restaurantId: data.restaurantId,
@@ -94,7 +93,7 @@ const actions = {
     },
     createBasketFromOrder({ dispatch }, data) {
         const basketData = JSON.parse(localStorage.getItem("basket") || "[]");
-        return axios
+        return $http
             .post("api/order/create-basket", data)
             .then(async res => {
                 basketData.push({
@@ -128,7 +127,7 @@ const actions = {
 
 
 
-        return axios.post('api/basket/set-table', {
+        return $http.post('api/basket/set-table', {
             restaurantId: data.restaurantId,
             ...basketId,
             ...table,
@@ -157,7 +156,7 @@ const actions = {
 
         data.quantity = parseInt(data.quantity);
 
-        axios.post("api/basket/add", {
+        $http.post("api/basket/add", {
             ...basketId,
             productId: data.productId,
             quantity: !data.quantity || data.quantity < 1 ? 1 : data.quantity,
@@ -190,7 +189,7 @@ const actions = {
         } : {}
 
         basketProduct.changingQuantity = true;
-        axios.get("api/basket/remove", {
+        $http.get("api/basket/remove", {
             params: {
                 ...basketId,
                 basketProductId: basketProduct.basketProductId,
@@ -223,7 +222,7 @@ const actions = {
         } : {}
 
         basketProduct.changingQuantity = true;
-        axios.get("api/basket/remove", {
+        $http.get("api/basket/remove", {
             params: {
                 ...basketId,
                 basketProductId: data.basketProductId,
@@ -255,7 +254,7 @@ const actions = {
         } : {}
 
         basketProduct.deleting = true;
-        return axios.get("api/basket/delete-basket-product", {
+        return $http.get("api/basket/delete-basket-product", {
             params: {
                 ...basketId,
                 basketProductId: basketProduct.basketProductId,
@@ -288,7 +287,7 @@ const actions = {
         } : {}
 
         basketProduct.deleting = true;
-        axios.get("api/basket/delete-basket-product", {
+        $http.get("api/basket/delete-basket-product", {
             params: {
                 ...basketId,
                 basketProductId: data.basketProductId,
@@ -315,7 +314,7 @@ const actions = {
         data.quantity = parseInt(data.quantity);
 
         if(basketProduct) basketProduct.changingQuantity = true;
-        return axios.post('api/basket/add-product-package-items', {
+        return $http.post('api/basket/add-product-package-items', {
             ...basketId,
             ...data,
             quantity: !data.quantity || data.quantity < 1 ? 1 : data.quantity,
@@ -332,7 +331,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        return axios
+        return $http
             .post("api/basket/add-address", {
                 ...basketId,
                 restaurantId: data.restaurantId,
@@ -350,7 +349,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        return axios
+        return $http
             .get("api/order/check-address", {
                 params: {
                     ...basketId,
@@ -382,7 +381,7 @@ const actions = {
             basketId: data.basketId
         } : {}
         const restaurantID = data.restaurantId ? { restaurantId: data.restaurantId } : {}
-        return axios
+        return $http
             .post("api/order/create-order", {
                 ...basketId,
                 ...restaurantID,
@@ -435,7 +434,7 @@ const actions = {
             );
     },
     getOrder({ commit }, orderId) {
-        return axios
+        return $http
             .get("api/order", {
                 params: {
                     orderId: orderId
@@ -462,7 +461,7 @@ const actions = {
             );
     },
     requestBill({ }, orderId) {
-        return axios
+        return $http
             .get("api/order/bill-request", {
                 params: {
                     order_id: orderId
@@ -486,7 +485,7 @@ const actions = {
         } : {}
         const restaurantID = data.restaurantId ? { restaurantId: data.restaurantId } : {}
 
-        axios.get('api/payment/prepare', {
+        $http.get('api/payment/prepare', {
             params: {
                 ...basketId,
                 ...restaurantID,
@@ -498,7 +497,7 @@ const actions = {
         );
     },
     updatePaymentStatus({ dispatch, commit }, data) {
-        return axios
+        return $http
             .get(`api/payment/update`, { params: { paymentId: data.paymentId } })
             .then((res) => {
                 const status = res.data.data.status;
@@ -530,7 +529,7 @@ const actions = {
         if (!data.postalCode || !data.deliveryType) {
             return
         }
-        return axios
+        return $http
             .get(`api/restaurant/shipping-price`, {
                 params: {
                     deliveryType: data.deliveryType,
@@ -569,7 +568,7 @@ const actions = {
         if (!data.postalCode || !data.deliveryType) {
             return
         }
-        return axios
+        return $http
             .get(`api/basket/total-price`, {
                 params: {
                     ...basketId,
@@ -597,7 +596,7 @@ const actions = {
                 parseInt(basket.restaurantId) === parseInt(restaurantId)
             ).basketId
         } : {}
-        return axios
+        return $http
             .post("api/basket/add-delivery-time", {
                 ...basketId,
                 delivery_time: data.date && data.time ? data.date + " " + data.time : null,
@@ -618,7 +617,7 @@ const actions = {
             );
     },
     getOrderHistory({ commit }, data) {
-        return axios
+        return $http
             .get("api/order/history", { params: data })
             .then((res) => {
                 commit('setorderList', res.data.data)
@@ -632,7 +631,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        return axios.post('api/basket/add-voucher-to-basket', null, {
+        return $http.post('api/basket/add-voucher-to-basket', null, {
             params: {
                 voucherCode: data.voucherCode,
                 restaurantId: data.restaurantId,
@@ -653,7 +652,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == restaurantId).basketId
         } : {}
-        return axios.get('api/basket/remove-voucher-from-basket', {
+        return $http.get('api/basket/remove-voucher-from-basket', {
             params: {
                 ...basketId,
                 restaurantId: restaurantId
@@ -673,7 +672,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        return axios.post('api/basket/add-tip', {
+        return $http.post('api/basket/add-tip', {
             ...basketId,
             restaurantId: data.restaurantId,
             tip_price: data.tip_price
@@ -692,7 +691,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == restaurantId).basketId
         } : {}
-        return axios.put('api/basket/remove-tip-from-basket', {
+        return $http.put('api/basket/remove-tip-from-basket', {
             ...basketId,
             restaurantId: restaurantId,
         }).then((result) => {
@@ -710,7 +709,7 @@ const actions = {
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        return axios.post('api/order/is-valid', null, {
+        return $http.post('api/order/is-valid', null, {
             params: {
                 restaurantId: data.restaurantId,
                 ...basketId
@@ -733,7 +732,7 @@ const actions = {
             return {type: 'error', msg: 'Basket not found'};
         }
 
-        return axios.post('api/basket/update-extraInfo', {
+        return $http.post('api/basket/update-extraInfo', {
             basketId,
             restaurantId: data.restaurantId || restaurantIdEnv,
             ...data

package/src/modules/product.js

@@ -1,5 +1,4 @@
-import axios from "axios";
-import {commonErrorCallback, calculateBasketIdParameter, updateBasket, restaurantIdEnv} from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, updateBasket, restaurantIdEnv, $http} from '../common';
 
 const state = () => ({
     selectedTime: null,
@@ -141,11 +140,11 @@ const mutations = {
 	}
 };
 const actions = {
-    // TODO: note the axios in loop
+    // TODO: note the $http in loop
     // Orderiom api doesn't use this function
     // check whether ordermood is using this function or not
     getCategoriesWithProducts({ commit, dispatch }, restaurantId) {
-        return axios.get("api/restaurant/category", {
+        return $http.get("api/restaurant/category", {
             params: {
                 restaurantId: restaurantId
             }
@@ -153,7 +152,7 @@ const actions = {
             let categories = res.data.data
             commit("setSelectedCategory", categories[0]);
 
-            axios.get("api/restaurant/category", {
+            $http.get("api/restaurant/category", {
                 params: {
                     restaurantId: restaurantId,
                     extra: 1
@@ -189,13 +188,13 @@ const actions = {
         );
     },
     getCategories({ commit, dispatch }, restaurantId) {
-        return axios
+        return $http
             .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
             .then((res) => {
                 let categories = res.data.data;
                 //TODO: why calling an api write after another while we can do it together?
                 //TODO: this api call returns empty on restaurant refresh
-                axios
+                $http
                     .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1 } })
                     .then((res) => {
                         if (res.data.data.length) {
@@ -243,7 +242,7 @@ const actions = {
             return { type: 'error', msg: 'Basket not found' }
         }
 
-        return axios.get("api/restaurant/products", {params: {
+        return $http.get("api/restaurant/products", {params: {
             categoryId: data.category.id,
             restaurantId: data.restaurantId,
             delivery_time: data.delivery_time || undefined,
@@ -272,7 +271,7 @@ const actions = {
         }
 
         commit('startFetchingBasket');
-        return axios.get('api/basket', {
+        return $http.get('api/basket', {
             params: {
                 basketId,
                 restaurantId: data.restaurantId || restaurantIdEnv
@@ -287,7 +286,7 @@ const actions = {
         });
     },
     getAttributeItems({ commit }, data) {
-        return axios.get('api/restaurant/category-attributes-items', {
+        return $http.get('api/restaurant/category-attributes-items', {
             params: {
                 restaurantId: data.restaurantId, categoryId: data.category.id,
             }
@@ -298,7 +297,7 @@ const actions = {
         );
     },
     getPackage({ commit }, data) {
-        return axios.get('api/restaurant/product-packages', {
+        return $http.get('api/restaurant/product-packages', {
             params: {
                 productId: data.productId,
                 restaurantId: data.restaurantId
@@ -310,7 +309,7 @@ const actions = {
         );
     },
     searchOnProducts({ commit }, data) {
-        return axios.get('api/restaurant/product/search', {
+        return $http.get('api/restaurant/product/search', {
             params: {
                 query: data.query,
                 restaurantId: data.restaurantId
@@ -333,7 +332,7 @@ const actions = {
         const shoppingCartItems = rootState.orderiomApiPackage.product.ShoppingCart.length;
 
         commit('startChangingDeliveryType');
-        return axios.post('api/basket/change-delivery-method', {
+        return $http.post('api/basket/change-delivery-method', {
             deliveryType,
             basketId,
             restaurantId: basketId ? undefined : (restaurantId || restaurantIdEnv)
@@ -376,7 +375,7 @@ const actions = {
 
         // TODO: It is recommended to use a new api instead of multiple api calls inside a loop.
         return Promise.all(list.map(category =>
-            axios.get("api/restaurant/products", {
+            $http.get("api/restaurant/products", {
                 params: {
                     categoryId: category.id,
                     restaurantId: restaurantId || restaurantIdEnv,

package/src/modules/restaurant.js

@@ -1,5 +1,4 @@
-import axios from "axios";
-import { commonErrorCallback, restaurantIdEnv } from '../common';
+import { commonErrorCallback, restaurantIdEnv, $http } from '../common';
 
 const state = () => ({
     restaurantInfo: {},
@@ -59,7 +58,7 @@ const mutations = {
 
 const actions = {
     getRestaurants({ commit }, data) {
-        return axios.get('api/restaurant', {
+        return $http.get('api/restaurant', {
             params: {
                 postalCode: data.postalCode,
                 deliveryType: data.deliveryType,
@@ -79,7 +78,7 @@ const actions = {
     },
     getRestaurantInfo({ commit }, restaurantId) {
         commit('startFetchingRestaurantInfo');
-        return axios.get('api/restaurant/restaurant-by-id', { params: { restaurantId } }).then(result => {
+        return $http.get('api/restaurant/restaurant-by-id', { params: { restaurantId } }).then(result => {
             commit('setRestaurantInfo', result.data.data[0]);
         }).catch(
             commonErrorCallback()
@@ -88,7 +87,7 @@ const actions = {
         });
     },
     getRestaurantIdBySlug({ commit }, restaurantSlug) {
-        return axios.get('api/restaurant/id', {
+        return $http.get('api/restaurant/id', {
             params: {
                 slug: restaurantSlug,
             }
@@ -99,7 +98,7 @@ const actions = {
         );
     },
     contact({ }, data) {
-        return axios.post('api/contact', data).then((result) => {
+        return $http.post('api/contact', data).then((result) => {
             return {
                 type: 'success',
                 msg: 'your message has been delivered successfully!'
@@ -109,14 +108,14 @@ const actions = {
         );
     },
     getImprint({ commit }, restaurantId) {
-        return axios.get('api/restaurant/imprint', { params: { restaurantId: restaurantId } }).then(res => {
+        return $http.get('api/restaurant/imprint', { params: { restaurantId: restaurantId } }).then(res => {
             commit('setImprint', res.data.data.imprint)
         }).catch(
             commonErrorCallback()
         )
     },
     Newsletter({ }, data) {
-        return axios.post('api/newsletter/create', null, {
+        return $http.post('api/newsletter/create', null, {
             params: data
         }).then((res) => {
             return {
@@ -128,7 +127,7 @@ const actions = {
         )
     },
     getTables({ commit }, restaurantId) {
-        return axios.get('api/restaurant/tables', {
+        return $http.get('api/restaurant/tables', {
             params: {
                 restaurantId: restaurantId
             }
@@ -143,7 +142,7 @@ const actions = {
         );
     },
     addReservedTables({ commit }, data) {
-        return axios  
+        return $http  
         .post("api/restaurant/reserve-table", {
             restaurantId: data.restaurantId || restaurantIdEnv,
             people: data.people,
@@ -163,7 +162,7 @@ const actions = {
         );
     },
     getBlogs({ commit }, restaurantId) {
-        return axios.get('api/blogs', {
+        return $http.get('api/blogs', {
             params: restaurantId
         }).then(res => {
             commit('setBlogs', res.data.data)
@@ -178,7 +177,7 @@ const actions = {
     },
     getBlogsByTag({ commit },{tagId, restaurantId = null}) {
         commit('startFetchingBlogs');
-        return axios.get('/api/blogs/by-tag', {
+        return $http.get('/api/blogs/by-tag', {
             params: {
                 restaurantId: restaurantId || restaurantIdEnv,
                 tagId
@@ -198,7 +197,7 @@ const actions = {
         })
     },
     getBlog({ commit }, blogId) {
-        return axios.get('api/blogs/show', {
+        return $http.get('api/blogs/show', {
             params: blogId
         }).then(res => {
             commit('setBlog', res.data.data)
@@ -212,7 +211,7 @@ const actions = {
         })
     },
     getBlogBySlug({ commit },{blogSlug, restaurantId = null}) {
-        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId: restaurantId || restaurantIdEnv}}).then(res => {
+        return $http.get('api/blogs/show/slug', { params: {blogSlug, restaurantId: restaurantId || restaurantIdEnv}}).then(res => {
             commit('setBlog', res.data.data);
             return { type: 'success', msg: 'ok' }
         }).catch(error => {
@@ -221,7 +220,7 @@ const actions = {
         })
     },
     getTestimonials({ commit }, data) {
-        return axios.get('api/testimonials', {
+        return $http.get('api/testimonials', {
             params: data
         }).then(res => {
             commit('setTestimonials', res.data.data)