orderiom-api-package 0.3.2 → 0.3.5

package/package.json

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

package/src/common.js

@@ -1,4 +1,4 @@
-export const restaurantId = parseInt(process.env.VUE_APP_RESTAURANT_ID) || null;
+export const restaurantIdEnv = process.env.VUE_APP_RESTAURANT_ID ? parseInt(process.env.VUE_APP_RESTAURANT_ID) : null;
 
 export function commonErrorCallback(unknownErrorMessage = 'Something went wrong'){
 	return error => {
@@ -21,7 +21,7 @@ export function commonErrorCallback(unknownErrorMessage = 'Something went wrong'
 	}
 }
 
-export function calculateBasketIdParameter(isLogin) {
+export function calculateBasketIdParameter(isLogin, restaurantId) {
 	if(isLogin) return undefined;
 	// localStorage might fail
 	let baskets = [];
@@ -31,14 +31,14 @@ export function calculateBasketIdParameter(isLogin) {
 		console.error(e);
 		throw new Error('Basket not found');
 	}
-	const foundBasket = baskets.find(basket => Number(basket.restaurantId) === restaurantId);
+	const foundBasket = baskets.find(basket => Number(basket.restaurantId) === (restaurantId || restaurantIdEnv));
 	if(!foundBasket){
 		throw new Error('Basket not found');
 	}
 	return foundBasket.basketId;
 }
 
-export function updateBasket({commit, basketId, res, isOutsideProduct}){
+export function updateBasket({commit, basketId, res, isOutsideProduct, restaurantId}){
 	const basketInfo = res.data.data;
 	commit(`${isOutsideProduct ? 'product/' : ''}setBasketInfo`, basketInfo);
 
@@ -58,10 +58,10 @@ export function updateBasket({commit, basketId, res, isOutsideProduct}){
 
 	if (parseInt(basketInfo.id) !== parseInt(basketId)) {
 		const baskets = JSON.parse(localStorage.getItem('basket'));
-		const basketIndex  = baskets.findIndex(basket => parseInt(basket.restaurantId) === restaurantId);
+		const basketIndex  = baskets.findIndex(basket => parseInt(basket.restaurantId) === (restaurantId || restaurantIdEnv));
 		if (basketIndex > -1) baskets.splice(basketIndex, 1);
 		baskets.push({
-			restaurantId,
+			restaurantId: (restaurantId || restaurantIdEnv),
 			basketId: basketInfo.id,
 		});
 		localStorage.setItem('basket', JSON.stringify(baskets));

package/src/modules/auth.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { commonErrorCallback, calculateBasketIdParameter, restaurantId } from '../common';
+import { commonErrorCallback } from '../common';
 
 const state = {
     publicToken: null,

package/src/modules/manager.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import { commonErrorCallback, calculateBasketIdParameter, restaurantId } from '../common';
 
 const state = () => {
   return {

package/src/modules/order.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import {commonErrorCallback, calculateBasketIdParameter, restaurantId, updateBasket} from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, restaurantIdEnv, updateBasket} from '../common';
 
 const state = () => ({
     productOrder: null,
@@ -105,11 +105,11 @@ const actions = {
             .post("api/order/create-basket", data)
             .then(async res => {
                 basketData.push({
-                    restaurantId: restaurantId,
+                    restaurantId: restaurantIdEnv,
                     basketId: res.data.data.id,
                 });
                 localStorage.setItem("basket", JSON.stringify(basketData));
-                const result = await dispatch('product/getBasket', restaurantId, { root: true }) ;
+                const result = await dispatch('product/getBasket', restaurantIdEnv, { root: true }) ;
                 return {
                     type:  result ? 'success' : 'error',
                     msg:  result  ? 'Basket created' : 'There was an error in fetching the basket info',
@@ -506,7 +506,7 @@ const actions = {
     getShippingPrice({ commit, rootState }, data) {
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
         } catch(e) {
             console.error(e);
             return { type: 'error', msg: 'Basket not found' }
@@ -525,9 +525,20 @@ const actions = {
             })
             .then((res) => {
                 commit('setshippingPrice', res.data.data.shippingPrice.toString());
+                commit('product/setshippingPrice', res.data.data.shippingPrice.toString(),{root: true});
+                if(res.data.data.totalPrice){
+                    const value = Number(res.data.data.totalPrice).toFixed(2);
+                    commit('setTotalPrice', value);
+                    commit('product/SetTotalPrice', value, {root: true});
+                }
+                if(res.data.data.totalWithDiscount){
+                    const value = Number(res.data.data.totalWithDiscount).toFixed(2);
+                    commit('product/setTotalWithDiscount', value, {root: true});
+                }
+
                 return {
                     type: 'success',
-                    msg: 'ok'
+                    msg: ''
                 }
             })
             .catch(
@@ -697,7 +708,7 @@ const actions = {
     editCartProductExtraInfo({rootState, commit}, data){
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
         } catch(e) {
             console.error(e);
             return {type: 'error', msg: 'Basket not found'};
@@ -707,7 +718,7 @@ const actions = {
             basketId,
             ...data
         }).then(res =>
-            updateBasket({commit, basketId, res, isOutsideProduct: true})
+            updateBasket({commit, basketId, res, isOutsideProduct: true, restaurantId: data.restaurantId})
         ).catch(err => {
             console.error(err);
             return false;

package/src/modules/product.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 import Vue from 'vue';
-import {commonErrorCallback, calculateBasketIdParameter, restaurantId, updateBasket} from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, updateBasket, restaurantIdEnv} from '../common';
 
 const state = () => ({
     selectedTime: null,
@@ -212,7 +212,7 @@ const actions = {
 
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
         } catch(e) {
             console.error(e);
             return { type: 'error', msg: 'Basket not found' }
@@ -257,10 +257,10 @@ const actions = {
             commonErrorCallback()
         );
     },
-    getBasket({ commit, rootState }) {
+    getBasket({ commit, rootState }, data) {
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data?.restaurantId);
         } catch(e) {
             console.error(e);
             return false;
@@ -270,10 +270,10 @@ const actions = {
         return axios.get('api/basket', {
             params: {
                 basketId,
-                restaurantId
+                restaurantId: restaurantIdEnv
             }
         }).then(res =>
-            updateBasket({commit, basketId, res, isOutsideProduct: false})
+            updateBasket({commit, basketId, res, isOutsideProduct: false, restaurantId: data?.restaurantId})
         ).catch(error => {
             console.error(error);
             return false;
@@ -316,10 +316,10 @@ const actions = {
             commonErrorCallback()
         );
     },
-    changeDeliveryMethod({ commit, dispatch, rootState, state }, deliveryType){
+    changeDeliveryMethod({ commit, dispatch, rootState, state }, deliveryType, restaurantId = null){
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, restaurantId);
         } catch(e) {
             console.error(e);
             return { type: 'error', msg: 'Basket not found' }
@@ -331,15 +331,15 @@ const actions = {
         return axios.post('api/basket/change-delivery-method', {
             deliveryType,
             basketId,
-            restaurantId: !basketId ? restaurantId : undefined
+            restaurantId: basketId ? undefined : (restaurantId || restaurantIdEnv)
         }).then(async res => {
             if(res.data.message.type !== 'success'){
                 return { type: 'error', msg: 'There was an error in updating the delivery type' }
             }
 
-            dispatch('getCategories', restaurantId);
+            dispatch('getCategories', (restaurantId || restaurantIdEnv));
 
-            const result = await dispatch("getBasket", restaurantId);
+            const result = await dispatch("getBasket", (restaurantId || restaurantIdEnv));
 
             return {
                 type: result ? 'success' : 'error',
@@ -358,10 +358,10 @@ const actions = {
             commit('finishChangingDeliveryType');
         });
     },
-    getProductsFromAllCategories({ commit, state, rootState }, categories = null) {
+    getProductsFromAllCategories({ commit, state, rootState }, categories = null, restaurantId = null) {
         let basketId = undefined;
         try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, restaurantId);
         } catch(e) {
             console.error(e);
             return { type: 'error', msg: 'Basket not found', data: [] }
@@ -374,7 +374,7 @@ const actions = {
             axios.get("api/restaurant/products", {
                 params: {
                     categoryId: category.id,
-                    restaurantId,
+                    restaurantId: restaurantId || restaurantIdEnv,
                     basketId
                 }
             })

package/src/modules/restaurant.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { commonErrorCallback, calculateBasketIdParameter, restaurantId } from '../common';
+import { commonErrorCallback, restaurantIdEnv } from '../common';
 
 const state = () => ({
     restaurantInfo: {},
@@ -145,7 +145,7 @@ const actions = {
     addReservedTables({ commit }, data) {
         return axios  
         .post("api/restaurant/reserve-table", {
-            restaurantId: restaurantId,
+            restaurantId: restaurantIdEnv,
             people: data.people,
             date: data.date,
             time: data.time,
@@ -180,7 +180,7 @@ const actions = {
         commit('startFetchingBlogs');
         return axios.get('/api/blogs/by-tag', {
             params: {
-                restaurantId,
+                restaurantId: restaurantIdEnv,
                 tagId
             }
         }).then(res => {
@@ -212,7 +212,7 @@ const actions = {
         })
     },
     getBlogBySlug({ commit }, blogSlug) {
-        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId}}).then(res => {
+        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId: restaurantIdEnv}}).then(res => {
             commit('setBlog', res.data.data);
             return { type: 'success', msg: 'ok' }
         }).catch(error => {
@@ -220,9 +220,9 @@ const actions = {
             return commonErrorCallback()(error);
         })
     },
-    getTestimonials({ commit }, restaurantId) {
+    getTestimonials({ commit }, data) {
         return axios.get('api/testimonials', {
-            params: restaurantId
+            params: data
         }).then(res => {
             commit('setTestimonials', res.data.data)
             return {