orderiom-api-package 0.4.102 → 0.4.104
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/common.js +0 -5
- package/src/modules/auth.js +0 -1
- package/src/modules/order.js +5 -47
- package/src/modules/product.js +6 -9
package/package.json
CHANGED
package/src/common.js
CHANGED
|
@@ -54,16 +54,11 @@ export function updateBasket({commit, basketId, res, restaurantId}){
|
|
|
54
54
|
const basketInfo = res.data.data;
|
|
55
55
|
commit(`product/setBasketInfo`, basketInfo, { root: true });
|
|
56
56
|
|
|
57
|
-
// TODO: why two separate states use same value?
|
|
58
|
-
commit(`product/SetSubtotalPrice`, basketInfo.totalPrice, { root: true });
|
|
59
|
-
commit(`product/SetTotalPrice`, basketInfo.totalPrice, { root: true });
|
|
60
|
-
|
|
61
57
|
commit(`product/SetShoppingCart`, basketInfo.products, { root: true });
|
|
62
58
|
commit(`product/setDeliveryTime`, basketInfo.deliveryTime, { root: true });
|
|
63
59
|
commit(`product/setServiceDuration`, basketInfo.duration, { root: true });
|
|
64
60
|
commit(`product/setVoucherCode`, basketInfo.voucher_code, { root: true });
|
|
65
61
|
commit(`product/setVoucherValue`, basketInfo.voucherValue, { root: true });
|
|
66
|
-
commit(`product/setTotalWithDiscount`, basketInfo.totalWithDiscount, { root: true });
|
|
67
62
|
commit(`product/setDelivertType`, basketInfo.deliveryType, { root: true });
|
|
68
63
|
commit(`product/setPostalCode`, basketInfo.postalCode, { root: true });
|
|
69
64
|
commit(`product/setTip`, basketInfo.tip, { root: true });
|
package/src/modules/auth.js
CHANGED
package/src/modules/order.js
CHANGED
|
@@ -15,12 +15,10 @@ const state = () => ({
|
|
|
15
15
|
// Others
|
|
16
16
|
productOrder: null,
|
|
17
17
|
userOrder: {},
|
|
18
|
-
totalPriceOrder: null,
|
|
19
18
|
shippigPriceOrder: null,
|
|
20
19
|
order: {},
|
|
21
20
|
paymentStatus: null,
|
|
22
21
|
shippingPrice: null,
|
|
23
|
-
totalPrice: null,
|
|
24
22
|
orderList: [],
|
|
25
23
|
tableOrder: {},
|
|
26
24
|
externalTableOrders: [],
|
|
@@ -35,8 +33,8 @@ const mutations = {
|
|
|
35
33
|
setuserOrder(state, userOrder) {
|
|
36
34
|
state.userOrder = userOrder;
|
|
37
35
|
},
|
|
38
|
-
settotalPriceOrder(
|
|
39
|
-
|
|
36
|
+
settotalPriceOrder() {
|
|
37
|
+
console.error('Deprecated: settotalPriceOrder is deprecated and does nothing.');
|
|
40
38
|
},
|
|
41
39
|
setshippigPriceOrder(state, shippigPriceOrder) {
|
|
42
40
|
state.shippigPriceOrder = shippigPriceOrder;
|
|
@@ -50,8 +48,8 @@ const mutations = {
|
|
|
50
48
|
setshippingPrice(state, shippingPrice) {
|
|
51
49
|
state.shippingPrice = shippingPrice;
|
|
52
50
|
},
|
|
53
|
-
setTotalPrice(
|
|
54
|
-
|
|
51
|
+
setTotalPrice() {
|
|
52
|
+
console.error('Deprecated: setTotalPrice is deprecated and does nothing.');
|
|
55
53
|
},
|
|
56
54
|
setorderList(state, orderList) {
|
|
57
55
|
state.orderList = orderList;
|
|
@@ -546,7 +544,6 @@ const actions = {
|
|
|
546
544
|
}).then(res => {
|
|
547
545
|
// localStorage.setItem("orderId", res.data.data.order.id);
|
|
548
546
|
// commit('setproductOrder', res.data.data.product)
|
|
549
|
-
// commit('settotalPriceOrder', res.data.data.order.total_price)
|
|
550
547
|
// commit('setorder', res.data.data.order)
|
|
551
548
|
// commit('setuserOrder', JSON.parse(res.data.data.order.user_details));
|
|
552
549
|
// commit('setshippigPriceOrder', res.data.data.order.shipping_price);
|
|
@@ -561,11 +558,9 @@ const actions = {
|
|
|
561
558
|
}
|
|
562
559
|
}
|
|
563
560
|
|
|
564
|
-
commit("product/SetSubtotalPrice", "0.00", {root: true});
|
|
565
561
|
commit("product/SetShoppingCart", [], {root: true});
|
|
566
562
|
commit("product/setBasketInfo", {}, {root: true});
|
|
567
563
|
commit("product/setDeliveryTime", "", {root: true});
|
|
568
|
-
commit("product/SetTotalPrice", "0.00", {root: true});
|
|
569
564
|
|
|
570
565
|
const classicRedirect = (res) => {
|
|
571
566
|
window.location = res.data.data.paymentLink;
|
|
@@ -645,15 +640,12 @@ const actions = {
|
|
|
645
640
|
.then((res) => {
|
|
646
641
|
if(!res.data.data.order.is_online_payment) delete res.data.data.order.payment_id;
|
|
647
642
|
commit("setproductOrder", res.data.data.products);
|
|
648
|
-
commit("settotalPriceOrder", res.data.data.order.total_price);
|
|
649
643
|
commit("setorder", res.data.data.order);
|
|
650
644
|
commit("setTableOrder", res.data.data.table);
|
|
651
645
|
commit("setuserOrder", JSON.parse(res.data.data.order.user_details));
|
|
652
646
|
commit("setshippigPriceOrder", res.data.data.order.shipping_price);
|
|
653
|
-
commit("product/SetSubtotalPrice", "0.00", { root: true });
|
|
654
647
|
commit("product/SetShoppingCart", [], { root: true });
|
|
655
648
|
commit("product/setDeliveryTime", "", { root: true });
|
|
656
|
-
commit("product/SetTotalPrice", "0.00", { root: true });
|
|
657
649
|
return res;
|
|
658
650
|
})
|
|
659
651
|
.catch(commonErrorCallback());
|
|
@@ -745,47 +737,13 @@ const actions = {
|
|
|
745
737
|
res.data.data.shippingPrice.toString(),
|
|
746
738
|
{ root: true }
|
|
747
739
|
);
|
|
748
|
-
if (res.data.data.totalPrice) {
|
|
749
|
-
const value = Number(res.data.data.totalPrice).toFixed(2);
|
|
750
|
-
commit("setTotalPrice", value);
|
|
751
|
-
commit("product/SetTotalPrice", value, { root: true });
|
|
752
|
-
}
|
|
753
|
-
if (res.data.data.totalWithDiscount) {
|
|
754
|
-
const value = Number(res.data.data.totalWithDiscount).toFixed(2);
|
|
755
|
-
commit("product/setTotalWithDiscount", value, { root: true });
|
|
756
|
-
}
|
|
757
740
|
|
|
758
741
|
return res;
|
|
759
742
|
})
|
|
760
743
|
.catch(commonErrorCallback());
|
|
761
744
|
},
|
|
762
745
|
getTotalPrice({ commit, rootState }, data) {
|
|
763
|
-
|
|
764
|
-
return;
|
|
765
|
-
}
|
|
766
|
-
|
|
767
|
-
let basketId = undefined;
|
|
768
|
-
try {
|
|
769
|
-
basketId = calculateBasketIdParameter(data ? data.restaurantId : undefined);
|
|
770
|
-
} catch (e) {
|
|
771
|
-
console.error(e);
|
|
772
|
-
return { type: "error", msg: "Basket not found" };
|
|
773
|
-
}
|
|
774
|
-
|
|
775
|
-
return $http
|
|
776
|
-
.get(`api/basket/total-price`, {
|
|
777
|
-
params: {
|
|
778
|
-
basketId,
|
|
779
|
-
deliveryType: data.deliveryType,
|
|
780
|
-
postalCode: data.postalCode,
|
|
781
|
-
restaurantId: data.restaurantId,
|
|
782
|
-
},
|
|
783
|
-
})
|
|
784
|
-
.then((res) => {
|
|
785
|
-
commit("setTotalPrice", res.data.data.totalPrice);
|
|
786
|
-
return res;
|
|
787
|
-
})
|
|
788
|
-
.catch(commonErrorCallback());
|
|
746
|
+
console.error('Deprecated: getTotalPrice is deprecated and does nothing.')
|
|
789
747
|
},
|
|
790
748
|
addDeliveryTimeToBasket({commit, dispatch, rootState}, data) {
|
|
791
749
|
let basketId = undefined;
|
package/src/modules/product.js
CHANGED
|
@@ -9,15 +9,12 @@ const state = () => ({
|
|
|
9
9
|
products: null,
|
|
10
10
|
selectedProduct: null,
|
|
11
11
|
ShoppingCart: [],
|
|
12
|
-
SubtotalPrice: null,
|
|
13
|
-
TotalPrice: null,
|
|
14
12
|
deliveryTime: null,
|
|
15
13
|
serviceDuration: null,
|
|
16
14
|
attributes: null,
|
|
17
15
|
attributeItems: null,
|
|
18
16
|
voucherCode: null,
|
|
19
17
|
VoucherValue: null,
|
|
20
|
-
totalWithDiscount: null,
|
|
21
18
|
productPackage: null,
|
|
22
19
|
deliveryType: null,
|
|
23
20
|
basketInfo: {},
|
|
@@ -209,11 +206,11 @@ const mutations = {
|
|
|
209
206
|
changingQuantity: false,
|
|
210
207
|
}));
|
|
211
208
|
},
|
|
212
|
-
SetSubtotalPrice(
|
|
213
|
-
|
|
209
|
+
SetSubtotalPrice() {
|
|
210
|
+
console.error('Deprecated: SetSubtotalPrice is deprecated and does nothing.')
|
|
214
211
|
},
|
|
215
|
-
SetTotalPrice(
|
|
216
|
-
|
|
212
|
+
SetTotalPrice() {
|
|
213
|
+
console.error('Deprecated: SetTotalPrice is deprecated and does nothing.')
|
|
217
214
|
},
|
|
218
215
|
setDeliveryTime(state, time) {
|
|
219
216
|
state.deliveryTime = time;
|
|
@@ -233,8 +230,8 @@ const mutations = {
|
|
|
233
230
|
setVoucherValue(state, VoucherValue) {
|
|
234
231
|
state.VoucherValue = VoucherValue
|
|
235
232
|
},
|
|
236
|
-
setTotalWithDiscount(
|
|
237
|
-
|
|
233
|
+
setTotalWithDiscount() {
|
|
234
|
+
console.error('Deprecated: setTotalWithDiscount is deprecated and does nothing.')
|
|
238
235
|
},
|
|
239
236
|
setProductPackage(state, productPackage) {
|
|
240
237
|
state.productPackage = productPackage
|