orderiom-api-package 0.3.43 → 0.3.45

package/package.json

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

package/src/modules/order.js

@@ -19,6 +19,7 @@ const state = () => ({
   tableOrder: {},
   externalTableOrders: [],
   tablePaymentStatus: null,
+  externalTableOrdersFromPayment:{}
 });
 const mutations = {
   setproductOrder(state, productOrder) {
@@ -57,6 +58,9 @@ const mutations = {
   setTablePaymentStatus(state, paymentStatus) {
     state.tablePaymentStatus = paymentStatus;
   },
+  setExternalTableOrdersFromPayment(state, ordersInfo){
+    state.externalTableOrdersFromPayment = ordersInfo
+  }
 };
 const actions = {
   async shoppingCartUpdateCallback({ dispatch, rootState }, data) {
@@ -165,11 +169,9 @@ const actions = {
       .catch(commonErrorCallback());
   },
   addToBasket({ dispatch, rootState }, data) {
-    // might be null
-    const basketProduct =
-      rootState.orderiomApiPackage.product.ShoppingCart.find(
-        (f) => f.basketProductId === Number(data.productId)
-      );
+    const basketProduct = !data.basketProductId
+        ? null
+        : rootState.orderiomApiPackage.product.ShoppingCart.find(f => f.basketProductId === data.basketProductId);
 
     const basket = JSON.parse(localStorage.getItem("basket"));
     const basketId = !rootState.orderiomApiPackage.auth.privateToken
@@ -187,7 +189,7 @@ const actions = {
     $http
       .post("api/basket/add", {
         ...basketId,
-        productId: basketProduct.RestaurantProductId,
+        productId: data.productId,
         quantity: !data.quantity || data.quantity < 1 ? 1 : data.quantity,
         attributeItems: data.attributeItems.length
           ? data.attributeItems
@@ -372,10 +374,9 @@ const actions = {
       });
   },
   addProductPackageItem({ dispatch, rootState }, data) {
-    const basketProduct =
-      rootState.orderiomApiPackage.product.ShoppingCart.find(
-        (f) => f.basketProductId === Number(data.productId)
-      );
+    const basketProduct = !data.basketProductId
+      ? null
+      : rootState.orderiomApiPackage.product.ShoppingCart.find(f => f.basketProductId === Number(data.basketProductId));
 
     const basket = JSON.parse(localStorage.getItem("basket"));
     const basketId = !rootState.orderiomApiPackage.auth.privateToken
@@ -393,7 +394,6 @@ const actions = {
       .post("api/basket/add-product-package-items", {
         ...basketId,
         ...data,
-        productId: basketProduct.RestaurantProductId,
         quantity: !data.quantity || data.quantity < 1 ? 1 : data.quantity,
       })
       .then(async () => {
@@ -888,8 +888,8 @@ const actions = {
       });
   },
   getTableExternalOrder({ commit }, { restaurantId, tableName }) {
-    console.log("getTableExternalOrder");
-    $http
+    commit("setExternalTableOrders", {});
+    return $http
       .post("api/table-payments/create", {
         restaurantId,
         tableName,
@@ -903,7 +903,7 @@ const actions = {
     { rootState },
     { tablePaymentId, paymentType, qrcode = null, pin = null }
   ) {
-    $http
+    return $http
       .post("/api/table-payments/pay", {
         tablePaymentId,
         paymentType,
@@ -913,7 +913,6 @@ const actions = {
         }),
       })
       .then((res) => {
-        console.log(res);
         window.location = res.data.data.paymentLink;
         return {
           type: "success",
@@ -922,10 +921,10 @@ const actions = {
       })
       .catch(commonErrorCallback());
   },
-  updateTablePaymentStatus({ commit }, data) {
+  updateTablePaymentStatus({ commit }, { tablePaymentId, status }) {
     return $http
       .get(`/api/table-payments/update`, {
-        params: { paymentId: data.paymentId, status: data.status },
+        params: { tablePaymentId, status },
       })
       .then((res) => {
         const status = res.data.data.status;
@@ -941,7 +940,7 @@ const actions = {
     return $http
       .get(`/api/table-payments`, { params: { tablePaymentId } })
       .then((res) => {
-        commit("setExternalTableOrders", res.data.data);
+        commit("setExternalTableOrdersFromPayment", res.data.data);
         return {
           type: "success",
           msg: "ok",