@pisell/pisellos 2.2.145 → 2.2.147
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/dist/model/strategy/adapter/walletPass/locales.js +8 -8
- package/dist/server/modules/order/index.js +1 -1
- package/dist/server/modules/order/utils/filterBookings.js +1 -1
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/lib/model/strategy/adapter/walletPass/locales.js +8 -8
- package/lib/server/modules/order/index.js +2 -2
- package/lib/server/modules/order/utils/filterBookings.js +1 -1
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/package.json +1 -1
|
@@ -6,9 +6,9 @@ export var locales = {
|
|
|
6
6
|
'max_passes_per_item_reached': '该商品已达到卡券使用上限',
|
|
7
7
|
'not_available_for_this_channel': '当前渠道不可使用',
|
|
8
8
|
'not_valid_for_this_order_type': '当前订单类型不适用',
|
|
9
|
-
'order_total_amount_not_enough': '
|
|
10
|
-
'applicable_product_total_amount_not_enough': '
|
|
11
|
-
'applicable_product_count_not_enough': '
|
|
9
|
+
'order_total_amount_not_enough': '满 {currency}{value} 可用',
|
|
10
|
+
'applicable_product_total_amount_not_enough': '满 {currency}{value} 可用',
|
|
11
|
+
'applicable_product_count_not_enough': '至少 {value} 件'
|
|
12
12
|
},
|
|
13
13
|
'en': {
|
|
14
14
|
'not_meet_the_required_conditions': 'Not meet the required conditions.',
|
|
@@ -18,8 +18,8 @@ export var locales = {
|
|
|
18
18
|
'not_available_for_this_channel': 'Not available for this channel.',
|
|
19
19
|
'not_valid_for_this_order_type': 'Not valid for this order type.',
|
|
20
20
|
'order_total_amount_not_enough': 'Spend {currency}{value} to use',
|
|
21
|
-
'applicable_product_total_amount_not_enough': '{currency}{value}
|
|
22
|
-
'applicable_product_count_not_enough': '
|
|
21
|
+
'applicable_product_total_amount_not_enough': 'Spend {currency}{value} to use',
|
|
22
|
+
'applicable_product_count_not_enough': 'Min. Qty {value}'
|
|
23
23
|
},
|
|
24
24
|
'zh-HK': {
|
|
25
25
|
'not_meet_the_required_conditions': '未達使用條件',
|
|
@@ -28,8 +28,8 @@ export var locales = {
|
|
|
28
28
|
'max_passes_per_item_reached': '該商品已達卡券使用上限',
|
|
29
29
|
'not_available_for_this_channel': '當前渠道不可使用',
|
|
30
30
|
'not_valid_for_this_order_type': '當前訂單類型不適用',
|
|
31
|
-
'order_total_amount_not_enough': '
|
|
32
|
-
'applicable_product_total_amount_not_enough': '
|
|
33
|
-
'applicable_product_count_not_enough': '
|
|
31
|
+
'order_total_amount_not_enough': '滿 {currency}{value} 可用',
|
|
32
|
+
'applicable_product_total_amount_not_enough': '滿 {currency}{value} 可用',
|
|
33
|
+
'applicable_product_count_not_enough': '至少 {value} 件'
|
|
34
34
|
}
|
|
35
35
|
};
|
|
@@ -94,7 +94,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
94
94
|
boundaryEnd = boundaryStart.add(1, 'day');
|
|
95
95
|
if (boundaryStart.isValid()) {
|
|
96
96
|
this.store.createdAtQuery = {
|
|
97
|
-
sales_time_between: [boundaryStart.format('YYYY-MM-DD HH:mm:ss'), boundaryEnd.format('YYYY-MM-DD HH:mm:ss')]
|
|
97
|
+
sales_time_between: [boundaryStart.startOf('day').format('YYYY-MM-DD HH:mm:ss'), boundaryEnd.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
|
|
98
98
|
};
|
|
99
99
|
} else {
|
|
100
100
|
// 边界时间异常时回退到自然日,避免 createdAtQuery 为空导致后续查询异常
|
|
@@ -160,7 +160,7 @@ function matchBooking(booking, orderInfo, ctx) {
|
|
|
160
160
|
}
|
|
161
161
|
if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
|
|
162
162
|
if (ctx.bookingTimeRange) {
|
|
163
|
-
var ts = toTimestamp(booking.start_date);
|
|
163
|
+
var ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
|
|
164
164
|
if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1]) return false;
|
|
165
165
|
}
|
|
166
166
|
if (ctx.afterExecutionTimeMs != null) {
|
|
@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
|
|
|
136
136
|
* 获取当前的客户搜索条件
|
|
137
137
|
* @returns 当前搜索条件
|
|
138
138
|
*/
|
|
139
|
-
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "
|
|
139
|
+
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
|
|
140
140
|
/**
|
|
141
141
|
* 获取客户列表状态(包含滚动加载相关状态)
|
|
142
142
|
* @returns 客户状态
|
|
@@ -30,9 +30,9 @@ var locales = {
|
|
|
30
30
|
"max_passes_per_item_reached": "该商品已达到卡券使用上限",
|
|
31
31
|
"not_available_for_this_channel": "当前渠道不可使用",
|
|
32
32
|
"not_valid_for_this_order_type": "当前订单类型不适用",
|
|
33
|
-
"order_total_amount_not_enough": "
|
|
34
|
-
"applicable_product_total_amount_not_enough": "
|
|
35
|
-
"applicable_product_count_not_enough": "
|
|
33
|
+
"order_total_amount_not_enough": "满 {currency}{value} 可用",
|
|
34
|
+
"applicable_product_total_amount_not_enough": "满 {currency}{value} 可用",
|
|
35
|
+
"applicable_product_count_not_enough": "至少 {value} 件"
|
|
36
36
|
},
|
|
37
37
|
"en": {
|
|
38
38
|
"not_meet_the_required_conditions": "Not meet the required conditions.",
|
|
@@ -42,8 +42,8 @@ var locales = {
|
|
|
42
42
|
"not_available_for_this_channel": "Not available for this channel.",
|
|
43
43
|
"not_valid_for_this_order_type": "Not valid for this order type.",
|
|
44
44
|
"order_total_amount_not_enough": "Spend {currency}{value} to use",
|
|
45
|
-
"applicable_product_total_amount_not_enough": "{currency}{value}
|
|
46
|
-
"applicable_product_count_not_enough": "
|
|
45
|
+
"applicable_product_total_amount_not_enough": "Spend {currency}{value} to use",
|
|
46
|
+
"applicable_product_count_not_enough": "Min. Qty {value}"
|
|
47
47
|
},
|
|
48
48
|
"zh-HK": {
|
|
49
49
|
"not_meet_the_required_conditions": "未達使用條件",
|
|
@@ -52,9 +52,9 @@ var locales = {
|
|
|
52
52
|
"max_passes_per_item_reached": "該商品已達卡券使用上限",
|
|
53
53
|
"not_available_for_this_channel": "當前渠道不可使用",
|
|
54
54
|
"not_valid_for_this_order_type": "當前訂單類型不適用",
|
|
55
|
-
"order_total_amount_not_enough": "
|
|
56
|
-
"applicable_product_total_amount_not_enough": "
|
|
57
|
-
"applicable_product_count_not_enough": "
|
|
55
|
+
"order_total_amount_not_enough": "滿 {currency}{value} 可用",
|
|
56
|
+
"applicable_product_total_amount_not_enough": "滿 {currency}{value} 可用",
|
|
57
|
+
"applicable_product_count_not_enough": "至少 {value} 件"
|
|
58
58
|
}
|
|
59
59
|
};
|
|
60
60
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -75,8 +75,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
75
75
|
if (boundaryStart.isValid()) {
|
|
76
76
|
this.store.createdAtQuery = {
|
|
77
77
|
sales_time_between: [
|
|
78
|
-
boundaryStart.format("YYYY-MM-DD HH:mm:ss"),
|
|
79
|
-
boundaryEnd.format("YYYY-MM-DD HH:mm:ss")
|
|
78
|
+
boundaryStart.startOf("day").format("YYYY-MM-DD HH:mm:ss"),
|
|
79
|
+
boundaryEnd.endOf("day").format("YYYY-MM-DD HH:mm:ss")
|
|
80
80
|
]
|
|
81
81
|
};
|
|
82
82
|
} else {
|
|
@@ -178,7 +178,7 @@ function matchBooking(booking, orderInfo, ctx) {
|
|
|
178
178
|
if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
|
|
179
179
|
return false;
|
|
180
180
|
if (ctx.bookingTimeRange) {
|
|
181
|
-
const ts = toTimestamp(booking.start_date);
|
|
181
|
+
const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
|
|
182
182
|
if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
|
|
183
183
|
return false;
|
|
184
184
|
}
|
|
@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
|
|
|
136
136
|
* 获取当前的客户搜索条件
|
|
137
137
|
* @returns 当前搜索条件
|
|
138
138
|
*/
|
|
139
|
-
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "
|
|
139
|
+
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
|
|
140
140
|
/**
|
|
141
141
|
* 获取客户列表状态(包含滚动加载相关状态)
|
|
142
142
|
* @returns 客户状态
|