@pisell/pisellos 2.2.27 → 2.2.29
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.
|
@@ -27,7 +27,7 @@ import { BaseModule } from "../../../modules/BaseModule";
|
|
|
27
27
|
import dayjs from 'dayjs';
|
|
28
28
|
import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
|
|
29
29
|
import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
|
|
30
|
-
import { getDateIsInSchedule as _getDateIsInSchedule } from "
|
|
30
|
+
import { getDateIsInSchedule as _getDateIsInSchedule } from "../../../solution/ShopDiscount/utils";
|
|
31
31
|
dayjs.extend(isSameOrBefore);
|
|
32
32
|
dayjs.extend(isSameOrAfter);
|
|
33
33
|
|
|
@@ -3774,6 +3774,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3774
3774
|
_this$store$currentOr26,
|
|
3775
3775
|
_this$store$currentOr27,
|
|
3776
3776
|
_this$store$currentCu2,
|
|
3777
|
+
_this$otherParams,
|
|
3777
3778
|
_this$store$currentOr28,
|
|
3778
3779
|
_this$store$localOrde,
|
|
3779
3780
|
_this$store$localOrde2,
|
|
@@ -3998,6 +3999,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3998
3999
|
currency_code: this.otherParams.currency_code,
|
|
3999
4000
|
currency_symbol: this.otherParams.currency_symbol,
|
|
4000
4001
|
currency_format: this.otherParams.currency_format,
|
|
4002
|
+
business_code: ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.business_code) || undefined,
|
|
4001
4003
|
is_deposit: ((_this$store$currentOr28 = this.store.currentOrder) !== null && _this$store$currentOr28 !== void 0 && _this$store$currentOr28.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
|
|
4002
4004
|
deposit_amount: finalDepositAmount,
|
|
4003
4005
|
// 使用最终确定的定金金额(手动设置优先)
|
|
@@ -37,7 +37,7 @@ var import_BaseModule = require("../../../modules/BaseModule");
|
|
|
37
37
|
var import_dayjs = __toESM(require("dayjs"));
|
|
38
38
|
var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
|
|
39
39
|
var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
|
|
40
|
-
var import_utils = require("
|
|
40
|
+
var import_utils = require("../../../solution/ShopDiscount/utils");
|
|
41
41
|
import_dayjs.default.extend(import_isSameOrBefore.default);
|
|
42
42
|
import_dayjs.default.extend(import_isSameOrAfter.default);
|
|
43
43
|
var INDEXDB_STORE_NAME = "schedule";
|
|
@@ -2371,7 +2371,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2371
2371
|
* @returns 包含订单ID、UUID和完整后端响应的对象
|
|
2372
2372
|
*/
|
|
2373
2373
|
async syncOrderToBackendWithReturn(isManual = false, customPaymentItems, paymentStatus) {
|
|
2374
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
2374
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _i;
|
|
2375
2375
|
if (!this.store.localOrderData || !this.store.currentOrder) {
|
|
2376
2376
|
throw new Error("缺少必要的订单数据,无法同步到后端");
|
|
2377
2377
|
}
|
|
@@ -2506,12 +2506,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2506
2506
|
currency_code: this.otherParams.currency_code,
|
|
2507
2507
|
currency_symbol: this.otherParams.currency_symbol,
|
|
2508
2508
|
currency_format: this.otherParams.currency_format,
|
|
2509
|
-
|
|
2509
|
+
business_code: ((_d = this.otherParams) == null ? void 0 : _d.business_code) || void 0,
|
|
2510
|
+
is_deposit: (((_e = this.store.currentOrder) == null ? void 0 : _e.is_deposit) || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
|
|
2510
2511
|
deposit_amount: finalDepositAmount,
|
|
2511
2512
|
// 使用最终确定的定金金额(手动设置优先)
|
|
2512
2513
|
product_tax_fee: this.store.localOrderData.tax_fee,
|
|
2513
2514
|
note: this.store.localOrderData.shop_note,
|
|
2514
|
-
bookings: (
|
|
2515
|
+
bookings: (_f = this.store.localOrderData.bookings) == null ? void 0 : _f.map((item) => {
|
|
2515
2516
|
return {
|
|
2516
2517
|
...item,
|
|
2517
2518
|
product: {
|
|
@@ -2521,7 +2522,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2521
2522
|
deposit: void 0
|
|
2522
2523
|
};
|
|
2523
2524
|
}),
|
|
2524
|
-
relation_products: (
|
|
2525
|
+
relation_products: (_g = this.store.localOrderData.relation_products) == null ? void 0 : _g.map(
|
|
2525
2526
|
(item) => {
|
|
2526
2527
|
return {
|
|
2527
2528
|
...item,
|
|
@@ -2581,7 +2582,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2581
2582
|
orderUuid: this.store.currentOrder.uuid,
|
|
2582
2583
|
operation: isUpdateOperation ? "update" : "create",
|
|
2583
2584
|
isManual,
|
|
2584
|
-
orderId: submitSuccess ? ((
|
|
2585
|
+
orderId: submitSuccess ? ((_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
|
|
2585
2586
|
error: submitError,
|
|
2586
2587
|
duration: Date.now() - startTime,
|
|
2587
2588
|
timestamp: Date.now()
|
|
@@ -2607,7 +2608,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2607
2608
|
if (isUpdateOperation) {
|
|
2608
2609
|
realOrderId = currentOrderId;
|
|
2609
2610
|
} else {
|
|
2610
|
-
let extractedOrderId = (
|
|
2611
|
+
let extractedOrderId = (_i = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _i.order_id;
|
|
2611
2612
|
if (!extractedOrderId) {
|
|
2612
2613
|
extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
|
|
2613
2614
|
}
|