orderiom-api-package 0.4.101 → 0.4.103

package/package.json

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

package/src/common.js

@@ -54,10 +54,6 @@ export function updateBasket({commit, basketId, res, restaurantId}){
 	const basketInfo = res.data.data;
 	commit(`product/setBasketInfo`, basketInfo, { root: true });
 
-	// TODO: why two separate states use same value?
-	commit(`product/SetSubtotalPrice`, basketInfo.totalPrice, { root: true });
-	commit(`product/SetTotalPrice`, basketInfo.totalPrice, { root: true });
-
 	commit(`product/SetShoppingCart`, basketInfo.products, { root: true });
 	commit(`product/setDeliveryTime`, basketInfo.deliveryTime, { root: true });
 	commit(`product/setServiceDuration`, basketInfo.duration, { root: true });
@@ -223,13 +219,13 @@ export const defineInterceptors = ({$store}) => {
 			if(!isFetchingToken) getAuthToken($store, hadPrivateToken);
 		})
 	}, error => {
-		$store.dispatch('auth/finishedRequesting');
+		$store.dispatch('auth/finishRequesting');
 		return Promise.reject(error);
 	});
 
 	axios.interceptors.response.use(
 		res => {
-			$store.dispatch('auth/finishedRequesting');
+			$store.dispatch('auth/finishRequesting');
 			return {
 				type: 'success',
 				msg: '',
@@ -238,7 +234,7 @@ export const defineInterceptors = ({$store}) => {
 			}
 		},
 		error => {
-			$store.dispatch('auth/finishedRequesting');
+			$store.dispatch('auth/finishRequesting');
 			if (
 				error.response &&
 				error.response.data &&

package/src/modules/auth.js

@@ -55,10 +55,10 @@ const actions = {
 		console.warn('auth/auth action is deprecated. No need to call');
 	},
 	startRequesting({commit}){
-		commit('auth/setIsRequesting', true)
+		commit('setIsRequesting', true)
 	},
 	finishRequesting({commit}){
-		commit('auth/setIsRequesting', false)
+		commit('setIsRequesting', false)
 	},
 	login({commit, dispatch}, authData) {
 		var data = {...authData};
@@ -140,7 +140,6 @@ const actions = {
 				commit("clearAuthData");
 				dispatch('unassignBasket', restaurantId)
 				// commit("product/SetShoppingCart", [], { root: true });
-				// commit("product/SetSubtotalPrice", null, { root: true });
 				return true
 			})
 			.catch(

package/src/modules/order.js

@@ -15,12 +15,10 @@ const state = () => ({
     // Others
     productOrder: null,
     userOrder: {},
-    totalPriceOrder: null,
     shippigPriceOrder: null,
     order: {},
     paymentStatus: null,
     shippingPrice: null,
-    totalPrice: null,
     orderList: [],
     tableOrder: {},
     externalTableOrders: [],
@@ -35,8 +33,8 @@ const mutations = {
     setuserOrder(state, userOrder) {
         state.userOrder = userOrder;
     },
-    settotalPriceOrder(state, totalPriceOrder) {
-        state.totalPriceOrder = totalPriceOrder;
+    settotalPriceOrder() {
+        console.error('Deprecated: settotalPriceOrder is deprecated and does nothing.');
     },
     setshippigPriceOrder(state, shippigPriceOrder) {
         state.shippigPriceOrder = shippigPriceOrder;
@@ -50,8 +48,8 @@ const mutations = {
     setshippingPrice(state, shippingPrice) {
         state.shippingPrice = shippingPrice;
     },
-    setTotalPrice(state, totalPrice) {
-        state.totalPrice = totalPrice;
+    setTotalPrice() {
+        console.error('Deprecated: setTotalPrice is deprecated and does nothing.');
     },
     setorderList(state, orderList) {
         state.orderList = orderList;
@@ -546,7 +544,6 @@ const actions = {
 		}).then(res => {
 			// localStorage.setItem("orderId", res.data.data.order.id);
 			// commit('setproductOrder', res.data.data.product)
-			// commit('settotalPriceOrder', res.data.data.order.total_price)
 			// commit('setorder', res.data.data.order)
 			// commit('setuserOrder', JSON.parse(res.data.data.order.user_details));
 			// commit('setshippigPriceOrder', res.data.data.order.shipping_price);
@@ -561,11 +558,9 @@ const actions = {
 				}
 			}
 
-			commit("product/SetSubtotalPrice", "0.00", {root: true});
 			commit("product/SetShoppingCart", [], {root: true});
 			commit("product/setBasketInfo", {}, {root: true});
 			commit("product/setDeliveryTime", "", {root: true});
-			commit("product/SetTotalPrice", "0.00", {root: true});
 
 			const classicRedirect = (res) => {
 				window.location = res.data.data.paymentLink;
@@ -645,15 +640,12 @@ const actions = {
       .then((res) => {
 		if(!res.data.data.order.is_online_payment) delete res.data.data.order.payment_id;
         commit("setproductOrder", res.data.data.products);
-        commit("settotalPriceOrder", res.data.data.order.total_price);
         commit("setorder", res.data.data.order);
         commit("setTableOrder", res.data.data.table);
         commit("setuserOrder", JSON.parse(res.data.data.order.user_details));
         commit("setshippigPriceOrder", res.data.data.order.shipping_price);
-        commit("product/SetSubtotalPrice", "0.00", { root: true });
         commit("product/SetShoppingCart", [], { root: true });
         commit("product/setDeliveryTime", "", { root: true });
-        commit("product/SetTotalPrice", "0.00", { root: true });
         return res;
       })
       .catch(commonErrorCallback());
@@ -745,11 +737,6 @@ const actions = {
           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 });
@@ -760,32 +747,7 @@ const actions = {
       .catch(commonErrorCallback());
   },
   getTotalPrice({ commit, rootState }, data) {
-      if (!data.postalCode || !data.deliveryType) {
-          return;
-      }
-
-      let basketId = undefined;
-      try {
-          basketId = calculateBasketIdParameter(data ? data.restaurantId : undefined);
-      } catch (e) {
-          console.error(e);
-          return { type: "error", msg: "Basket not found" };
-      }
-
-    return $http
-      .get(`api/basket/total-price`, {
-        params: {
-          basketId,
-          deliveryType: data.deliveryType,
-          postalCode: data.postalCode,
-          restaurantId: data.restaurantId,
-        },
-      })
-      .then((res) => {
-        commit("setTotalPrice", res.data.data.totalPrice);
-        return res;
-      })
-      .catch(commonErrorCallback());
+      console.error('Deprecated: getTotalPrice is deprecated and does nothing.')
   },
 	addDeliveryTimeToBasket({commit, dispatch, rootState}, data) {
 		let basketId = undefined;

package/src/modules/product.js

@@ -9,8 +9,6 @@ const state = () => ({
     products: null,
     selectedProduct: null,
     ShoppingCart: [],
-    SubtotalPrice: null,
-    TotalPrice: null,
     deliveryTime: null,
     serviceDuration: null,
     attributes: null,
@@ -209,11 +207,11 @@ const mutations = {
             changingQuantity: false,
         }));
     },
-    SetSubtotalPrice(state, SubtotalPrice) {
-        state.SubtotalPrice = SubtotalPrice;
+    SetSubtotalPrice() {
+        console.error('Deprecated: SetSubtotalPrice is deprecated and does nothing.')
     },
-    SetTotalPrice(state, TotalPrice) {
-        state.TotalPrice = TotalPrice;
+    SetTotalPrice() {
+		console.error('Deprecated: SetTotalPrice is deprecated and does nothing.')
     },
     setDeliveryTime(state, time) {
         state.deliveryTime = time;