@pisell/pisellos 2.3.128 → 2.3.130
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/index.d.ts +2 -0
- package/dist/index.js +3 -1
- package/dist/model/strategy/adapter/promotion/index.js +0 -9
- package/dist/model/strategy/adapter/walletPass/evaluator.d.ts +2 -0
- package/dist/model/strategy/adapter/walletPass/evaluator.js +4 -2
- package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +58 -19
- package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +24 -12
- package/dist/modules/Customer/index.js +6 -3
- package/dist/modules/Customer/types.d.ts +2 -0
- package/dist/modules/Discount/availability.d.ts +7 -0
- package/dist/modules/Discount/availability.js +49 -0
- package/dist/modules/Discount/entitlementPass.d.ts +34 -0
- package/dist/modules/Discount/entitlementPass.js +147 -0
- package/dist/modules/Discount/index.d.ts +2 -2
- package/dist/modules/Discount/index.js +37 -151
- package/dist/modules/Discount/types.d.ts +36 -5
- package/dist/modules/FulfillmentTiming/index.d.ts +11 -0
- package/dist/modules/FulfillmentTiming/index.js +407 -0
- package/dist/modules/FulfillmentTiming/types.d.ts +67 -0
- package/dist/modules/FulfillmentTiming/types.js +1 -0
- package/dist/modules/OpenData/types.d.ts +6 -0
- package/dist/modules/Order/index.d.ts +12 -0
- package/dist/modules/Order/index.js +498 -247
- package/dist/modules/Order/pickupTiming.d.ts +46 -0
- package/dist/modules/Order/pickupTiming.js +53 -0
- package/dist/modules/Order/types.d.ts +5 -1
- package/dist/modules/Order/utils/orderCollectionIdentity.js +16 -12
- package/dist/modules/Order/utils.d.ts +1 -1
- package/dist/modules/Order/utils.js +117 -66
- package/dist/modules/Payment/index.js +9 -10
- package/dist/modules/Payment/types.d.ts +21 -1
- package/dist/modules/Payment/types.js +2 -0
- package/dist/modules/Payment/walletpass.d.ts +1 -1
- package/dist/modules/Payment/walletpass.js +80 -47
- package/dist/modules/Rules/index.d.ts +2 -2
- package/dist/modules/Rules/index.js +480 -186
- package/dist/modules/Rules/types.d.ts +4 -0
- package/dist/modules/Schedule/index.d.ts +8 -0
- package/dist/modules/Schedule/index.js +141 -39
- package/dist/modules/index.d.ts +1 -0
- package/dist/modules/index.js +1 -0
- package/dist/plugins/request.d.ts +7 -0
- package/dist/server/modules/order/types.d.ts +2 -0
- package/dist/server/utils/small-ticket.d.ts +1 -85
- package/dist/server/utils/small-ticket.js +2 -2542
- package/dist/shared/payment/loadPaymentMethods.d.ts +9 -0
- package/dist/shared/payment/loadPaymentMethods.js +66 -0
- package/dist/shared/receipt/loadCustomerInvoiceLayout.d.ts +22 -0
- package/dist/shared/receipt/loadCustomerInvoiceLayout.js +142 -0
- package/dist/shared/receipt/small-ticket.d.ts +85 -0
- package/dist/shared/receipt/small-ticket.js +2576 -0
- package/dist/shared/sales/loadSalesOrderSnapshot.d.ts +9 -0
- package/dist/shared/sales/loadSalesOrderSnapshot.js +21 -0
- package/dist/solution/BaseSales/index.d.ts +25 -0
- package/dist/solution/BaseSales/index.js +1226 -1040
- package/dist/solution/BaseSales/pickupTiming.d.ts +43 -0
- package/dist/solution/BaseSales/pickupTiming.js +589 -0
- package/dist/solution/BaseSales/types.d.ts +2 -2
- package/dist/solution/BaseSales/utils/cartPromotion.js +141 -126
- package/dist/solution/BaseSales/utils/parseSalesResponse.js +3 -0
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.d.ts +4 -5
- package/dist/solution/BookingTicket/index.js +60 -63
- package/dist/solution/BookingTicket/types.d.ts +5 -1
- package/dist/solution/BookingTicket/utils/cartView.js +3 -1
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +2 -0
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +338 -147
- package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +8 -4
- package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +6 -0
- package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.js +19 -6
- package/dist/solution/OrderInvoicePreview/index.d.ts +56 -0
- package/dist/solution/OrderInvoicePreview/index.js +269 -0
- package/dist/solution/ShopDiscount/index.d.ts +2 -0
- package/dist/solution/ShopDiscount/index.js +99 -42
- package/dist/solution/ShopDiscount/utils.d.ts +4 -2
- package/dist/solution/ShopDiscount/utils.js +43 -23
- package/dist/solution/UnifiedBookingSales/index.d.ts +13 -4
- package/dist/solution/UnifiedBookingSales/index.js +874 -709
- package/dist/solution/index.d.ts +1 -0
- package/dist/solution/index.js +2 -1
- package/lib/index.d.ts +2 -0
- package/lib/index.js +21 -1
- package/lib/model/strategy/adapter/walletPass/evaluator.d.ts +2 -0
- package/lib/model/strategy/adapter/walletPass/evaluator.js +2 -0
- package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +35 -6
- package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +13 -6
- package/lib/modules/Customer/index.js +5 -1
- package/lib/modules/Customer/types.d.ts +2 -0
- package/lib/modules/Discount/availability.d.ts +7 -0
- package/lib/modules/Discount/availability.js +43 -0
- package/lib/modules/Discount/entitlementPass.d.ts +34 -0
- package/lib/modules/Discount/entitlementPass.js +141 -0
- package/lib/modules/Discount/index.d.ts +2 -2
- package/lib/modules/Discount/index.js +23 -129
- package/lib/modules/Discount/types.d.ts +36 -5
- package/lib/modules/FulfillmentTiming/index.d.ts +11 -0
- package/lib/modules/FulfillmentTiming/index.js +359 -0
- package/lib/modules/FulfillmentTiming/types.d.ts +67 -0
- package/lib/modules/FulfillmentTiming/types.js +5 -0
- package/lib/modules/OpenData/types.d.ts +6 -0
- package/lib/modules/Order/index.d.ts +12 -0
- package/lib/modules/Order/index.js +252 -48
- package/lib/modules/Order/pickupTiming.d.ts +46 -0
- package/lib/modules/Order/pickupTiming.js +61 -0
- package/lib/modules/Order/types.d.ts +5 -1
- package/lib/modules/Order/utils/orderCollectionIdentity.js +14 -11
- package/lib/modules/Order/utils.d.ts +1 -1
- package/lib/modules/Order/utils.js +51 -7
- package/lib/modules/Payment/index.js +3 -4
- package/lib/modules/Payment/types.d.ts +21 -1
- package/lib/modules/Payment/types.js +1 -0
- package/lib/modules/Payment/walletpass.d.ts +1 -1
- package/lib/modules/Payment/walletpass.js +29 -9
- package/lib/modules/Rules/index.d.ts +2 -2
- package/lib/modules/Rules/index.js +357 -110
- package/lib/modules/Rules/types.d.ts +4 -0
- package/lib/modules/Schedule/index.d.ts +8 -0
- package/lib/modules/Schedule/index.js +68 -12
- package/lib/modules/index.d.ts +1 -0
- package/lib/modules/index.js +11 -0
- package/lib/plugins/request.d.ts +7 -0
- package/lib/server/modules/order/types.d.ts +2 -0
- package/lib/server/utils/small-ticket.d.ts +1 -85
- package/lib/server/utils/small-ticket.js +9 -2305
- package/lib/shared/payment/loadPaymentMethods.d.ts +9 -0
- package/lib/shared/payment/loadPaymentMethods.js +40 -0
- package/lib/shared/receipt/loadCustomerInvoiceLayout.d.ts +22 -0
- package/lib/shared/receipt/loadCustomerInvoiceLayout.js +86 -0
- package/lib/shared/receipt/small-ticket.d.ts +85 -0
- package/lib/shared/receipt/small-ticket.js +2342 -0
- package/lib/shared/sales/loadSalesOrderSnapshot.d.ts +9 -0
- package/lib/shared/sales/loadSalesOrderSnapshot.js +22 -0
- package/lib/solution/BaseSales/index.d.ts +25 -0
- package/lib/solution/BaseSales/index.js +102 -3
- package/lib/solution/BaseSales/pickupTiming.d.ts +43 -0
- package/lib/solution/BaseSales/pickupTiming.js +269 -0
- package/lib/solution/BaseSales/types.d.ts +2 -2
- package/lib/solution/BaseSales/utils/cartPromotion.js +12 -4
- package/lib/solution/BaseSales/utils/parseSalesResponse.js +3 -0
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.d.ts +4 -5
- package/lib/solution/BookingTicket/index.js +36 -33
- package/lib/solution/BookingTicket/types.d.ts +5 -1
- package/lib/solution/BookingTicket/utils/cartView.js +3 -1
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +2 -0
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +174 -42
- package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +8 -4
- package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +6 -0
- package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +11 -3
- package/lib/solution/OrderInvoicePreview/index.d.ts +56 -0
- package/lib/solution/OrderInvoicePreview/index.js +192 -0
- package/lib/solution/ShopDiscount/index.d.ts +2 -0
- package/lib/solution/ShopDiscount/index.js +55 -9
- package/lib/solution/ShopDiscount/utils.d.ts +4 -2
- package/lib/solution/ShopDiscount/utils.js +42 -25
- package/lib/solution/UnifiedBookingSales/index.d.ts +13 -4
- package/lib/solution/UnifiedBookingSales/index.js +132 -48
- package/lib/solution/index.d.ts +1 -0
- package/lib/solution/index.js +11 -0
- package/package.json +1 -1
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
export type PickupTimingSelectionMode = 'asap' | 'scheduled';
|
|
2
|
+
export type PickupTimingSource = 'asap' | 'schedule' | 'pos_manual';
|
|
3
|
+
export interface PickupTimingBookingInput {
|
|
4
|
+
mode: PickupTimingSelectionMode;
|
|
5
|
+
source: PickupTimingSource;
|
|
6
|
+
/** Store-local calendar date and minute; the caller validates availability. */
|
|
7
|
+
date: string;
|
|
8
|
+
time: string;
|
|
9
|
+
/** Absolute timestamp disambiguates a repeated local minute at a DST change. */
|
|
10
|
+
instant?: string;
|
|
11
|
+
timezone?: string;
|
|
12
|
+
frozen?: boolean;
|
|
13
|
+
}
|
|
14
|
+
export interface PickupTimingBookingMetadata {
|
|
15
|
+
unique_identification_number: string;
|
|
16
|
+
is_fulfillment_timing: true;
|
|
17
|
+
fulfillment_timing: {
|
|
18
|
+
method: 'pick_up';
|
|
19
|
+
mode: PickupTimingSelectionMode;
|
|
20
|
+
source: PickupTimingSource;
|
|
21
|
+
instant?: string;
|
|
22
|
+
timezone?: string;
|
|
23
|
+
frozen?: boolean;
|
|
24
|
+
};
|
|
25
|
+
[key: string]: any;
|
|
26
|
+
}
|
|
27
|
+
export interface PickupTimingBooking {
|
|
28
|
+
schedule_id: number | string;
|
|
29
|
+
start_date: string;
|
|
30
|
+
end_date: string;
|
|
31
|
+
start_time: string;
|
|
32
|
+
end_time: string;
|
|
33
|
+
select_date: string;
|
|
34
|
+
duration: 0;
|
|
35
|
+
is_all: 0;
|
|
36
|
+
sub_type: 'minutes';
|
|
37
|
+
like_status: string;
|
|
38
|
+
resources: [];
|
|
39
|
+
metadata: PickupTimingBookingMetadata;
|
|
40
|
+
schedule_event_id?: number | string;
|
|
41
|
+
[key: string]: any;
|
|
42
|
+
}
|
|
43
|
+
/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
|
|
44
|
+
export declare function isFulfillmentTimingBooking(booking: unknown): boolean;
|
|
45
|
+
/** Update an independent pickup appointment without changing its persisted row identity. */
|
|
46
|
+
export declare function buildPickupTimingBooking(input: PickupTimingBookingInput, existing?: Record<string, any> | null): PickupTimingBooking;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
+
import { createUuidV4 } from "./utils/orderCollectionIdentity";
|
|
8
|
+
/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
|
|
9
|
+
export function isFulfillmentTimingBooking(booking) {
|
|
10
|
+
var _metadata;
|
|
11
|
+
return (booking === null || booking === void 0 || (_metadata = booking.metadata) === null || _metadata === void 0 ? void 0 : _metadata.is_fulfillment_timing) === true;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** Update an independent pickup appointment without changing its persisted row identity. */
|
|
15
|
+
export function buildPickupTimingBooking(input, existing) {
|
|
16
|
+
var booking = _objectSpread({}, existing || {});
|
|
17
|
+
var metadata = _objectSpread({}, booking.metadata || {});
|
|
18
|
+
// A fulfillment appointment never becomes a product/resource/holder purchase line.
|
|
19
|
+
for (var _i = 0, _arr = ['product_uid', 'product', 'holder', 'holder_id', 'collect_pax', 'capacity']; _i < _arr.length; _i++) {
|
|
20
|
+
var _key = _arr[_i];
|
|
21
|
+
delete booking[_key];
|
|
22
|
+
delete metadata[_key];
|
|
23
|
+
}
|
|
24
|
+
delete metadata.booking_uid;
|
|
25
|
+
return _objectSpread(_objectSpread({}, booking), {}, {
|
|
26
|
+
schedule_id: booking.schedule_id || 0,
|
|
27
|
+
start_date: input.date,
|
|
28
|
+
end_date: input.date,
|
|
29
|
+
start_time: input.time,
|
|
30
|
+
end_time: input.time,
|
|
31
|
+
select_date: input.date,
|
|
32
|
+
duration: 0,
|
|
33
|
+
is_all: 0,
|
|
34
|
+
sub_type: 'minutes',
|
|
35
|
+
like_status: booking.like_status || 'common',
|
|
36
|
+
resources: [],
|
|
37
|
+
metadata: _objectSpread(_objectSpread({}, metadata), {}, {
|
|
38
|
+
unique_identification_number: String(metadata.unique_identification_number || createUuidV4()),
|
|
39
|
+
is_fulfillment_timing: true,
|
|
40
|
+
fulfillment_timing: _objectSpread(_objectSpread(_objectSpread({
|
|
41
|
+
method: 'pick_up',
|
|
42
|
+
mode: input.mode,
|
|
43
|
+
source: input.source
|
|
44
|
+
}, input.instant !== undefined ? {
|
|
45
|
+
instant: input.instant
|
|
46
|
+
} : {}), input.timezone !== undefined ? {
|
|
47
|
+
timezone: input.timezone
|
|
48
|
+
} : {}), input.frozen !== undefined ? {
|
|
49
|
+
frozen: input.frozen
|
|
50
|
+
} : {})
|
|
51
|
+
})
|
|
52
|
+
});
|
|
53
|
+
}
|
|
@@ -7,9 +7,10 @@ import type { SubmitPayloadEnhancer } from './utils';
|
|
|
7
7
|
import type { PaymentItem } from '../Payment/types';
|
|
8
8
|
import type { ICustomer } from '../AccountList/types';
|
|
9
9
|
import type { OrderProductDiscountItem } from '../../server/modules/order/types';
|
|
10
|
+
import type { PickupTimingBooking, PickupTimingBookingInput } from './pickupTiming';
|
|
10
11
|
export type { OrderProductDiscountItem } from '../../server/modules/order/types';
|
|
11
12
|
export type PickupReferenceMode = 'counter_pickup' | 'table_service';
|
|
12
|
-
export type ShopServiceType = 'dine_in' | 'takeaway';
|
|
13
|
+
export type ShopServiceType = 'dine_in' | 'takeaway' | 'pick_up' | 'delivery';
|
|
13
14
|
export interface ShopServiceData {
|
|
14
15
|
pickup_reference_mode?: PickupReferenceMode;
|
|
15
16
|
service_type?: ShopServiceType | '';
|
|
@@ -863,6 +864,9 @@ export interface OrderModuleAPI {
|
|
|
863
864
|
updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
|
|
864
865
|
updateTempOrderPickupReferenceMode: (mode: PickupReferenceMode) => ShopServiceData;
|
|
865
866
|
updateTempOrderServiceType: (serviceType: ShopServiceType) => ShopServiceData;
|
|
867
|
+
getPickupTimingBooking: () => PickupTimingBooking | null;
|
|
868
|
+
setPickupTimingBooking: (input: PickupTimingBookingInput) => PickupTimingBooking;
|
|
869
|
+
clearPickupTimingBooking: () => void;
|
|
866
870
|
updateTempOrderBuzzer: (buzzer: string) => string;
|
|
867
871
|
updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
|
|
868
872
|
addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
|
|
@@ -12,6 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
12
12
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
13
13
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
14
14
|
import { cloneDeep } from 'lodash-es';
|
|
15
|
+
import { isFullCoveragePass } from "../../Discount/entitlementPass";
|
|
15
16
|
var IDENTITY_CONFIG = {
|
|
16
17
|
product: {
|
|
17
18
|
persistentIdField: 'order_detail_id',
|
|
@@ -74,22 +75,25 @@ export function setOrderCollectionUid(kind, item, uid) {
|
|
|
74
75
|
delete record[uidField];
|
|
75
76
|
return record;
|
|
76
77
|
}
|
|
77
|
-
function
|
|
78
|
-
var _ref, _ref2,
|
|
79
|
-
var
|
|
80
|
-
|
|
81
|
-
var type = (item === null || item === void 0 ? void 0 : item.type) || (item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.type) || (item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.tag);
|
|
82
|
-
return type === 'good_pass';
|
|
78
|
+
function getFullCoveragePassIdentity(product) {
|
|
79
|
+
var _ref, _ref2, _pass$discount$resour, _pass$discount;
|
|
80
|
+
var pass = (product.discount_list || []).find(function (item) {
|
|
81
|
+
return isFullCoveragePass(item);
|
|
83
82
|
});
|
|
84
|
-
if (!
|
|
85
|
-
var resourceId = (_ref = (_ref2 = (
|
|
86
|
-
|
|
83
|
+
if (!pass) return null;
|
|
84
|
+
var resourceId = (_ref = (_ref2 = (_pass$discount$resour = (_pass$discount = pass.discount) === null || _pass$discount === void 0 ? void 0 : _pass$discount.resource_id) !== null && _pass$discount$resour !== void 0 ? _pass$discount$resour : pass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : pass.discount_id) !== null && _ref !== void 0 ? _ref : pass.id;
|
|
85
|
+
if (isBlankOrderCollectionIdentity(resourceId)) return null;
|
|
86
|
+
return {
|
|
87
|
+
type: String(pass.type || pass.tag),
|
|
88
|
+
resourceId: String(resourceId)
|
|
89
|
+
};
|
|
87
90
|
}
|
|
88
91
|
function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
|
|
89
92
|
var encodedOriginalUid = encodeURIComponent(originalUid);
|
|
90
|
-
var
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
+
var passIdentity = getFullCoveragePassIdentity(product);
|
|
94
|
+
if (passIdentity) {
|
|
95
|
+
var passType = passIdentity.type === 'good_pass' ? 'good-pass' : 'entitlement-pass';
|
|
96
|
+
return "os-split:product:".concat(encodedOriginalUid, ":").concat(passType, ":").concat(encodeURIComponent(passIdentity.resourceId), ":").concat(duplicateOrdinal);
|
|
93
97
|
}
|
|
94
98
|
return "os-split:product:".concat(encodedOriginalUid, ":duplicate:").concat(duplicateOrdinal);
|
|
95
99
|
}
|
|
@@ -171,7 +171,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
|
|
|
171
171
|
* // => -4
|
|
172
172
|
*/
|
|
173
173
|
export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
|
|
174
|
-
export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
|
|
174
|
+
export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
|
|
175
175
|
/**
|
|
176
176
|
* 通过 session 类商品的开始时间结束时间生成商品的时长
|
|
177
177
|
* @param {CartItem} cartItem
|
|
@@ -23,6 +23,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
|
|
|
23
23
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
24
24
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
25
25
|
import dayjs from "dayjs";
|
|
26
|
+
import customParseFormat from 'dayjs/plugin/customParseFormat';
|
|
26
27
|
import Decimal from 'decimal.js';
|
|
27
28
|
import { withOriginalBundleOptionPrices } from "./utils/weighedProduct";
|
|
28
29
|
import { hasManualProductDiscountFlag } from "./utils/manualProductDiscount";
|
|
@@ -30,6 +31,8 @@ import { getProductHolderConfig } from "../Holder/utils";
|
|
|
30
31
|
import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
|
|
31
32
|
import { createUuidV4 } from "./utils/orderCollectionIdentity";
|
|
32
33
|
import { encodeSalesNotes } from "./salesNotes";
|
|
34
|
+
import { isFulfillmentTimingBooking } from "./pickupTiming";
|
|
35
|
+
dayjs.extend(customParseFormat);
|
|
33
36
|
var POINT_CARD_SNAPSHOT_TAG = 'point_card';
|
|
34
37
|
var VIRTUAL_CURRENCY_SNAPSHOT_TAG = 'virtual_currency';
|
|
35
38
|
function isPlainObject(value) {
|
|
@@ -659,6 +662,22 @@ function resolveSubmitBundleMapId(bundle) {
|
|
|
659
662
|
}
|
|
660
663
|
return undefined;
|
|
661
664
|
}
|
|
665
|
+
function ensureSubmitDiscountIdentity(discount) {
|
|
666
|
+
if (!discount || _typeof(discount) !== 'object' || Array.isArray(discount)) {
|
|
667
|
+
return discount;
|
|
668
|
+
}
|
|
669
|
+
var discountRecord = discount;
|
|
670
|
+
var metadata = discountRecord.metadata && _typeof(discountRecord.metadata) === 'object' && !Array.isArray(discountRecord.metadata) ? discountRecord.metadata : {};
|
|
671
|
+
var uniqueIdentificationNumber = metadata.unique_identification_number;
|
|
672
|
+
if (uniqueIdentificationNumber !== undefined && uniqueIdentificationNumber !== null && String(uniqueIdentificationNumber).trim() !== '') {
|
|
673
|
+
return discount;
|
|
674
|
+
}
|
|
675
|
+
return _objectSpread(_objectSpread({}, discountRecord), {}, {
|
|
676
|
+
metadata: _objectSpread(_objectSpread({}, metadata), {}, {
|
|
677
|
+
unique_identification_number: createUuidV4()
|
|
678
|
+
})
|
|
679
|
+
});
|
|
680
|
+
}
|
|
662
681
|
function collectSubmitProductDiscountList(product) {
|
|
663
682
|
var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
|
|
664
683
|
var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
|
|
@@ -694,7 +713,7 @@ function collectSubmitProductDiscountList(product) {
|
|
|
694
713
|
} finally {
|
|
695
714
|
_iterator5.f();
|
|
696
715
|
}
|
|
697
|
-
return normalizeOrderProductDiscountList(submitDiscountList);
|
|
716
|
+
return normalizeOrderProductDiscountList(submitDiscountList.map(ensureSubmitDiscountIdentity));
|
|
698
717
|
}
|
|
699
718
|
|
|
700
719
|
/**
|
|
@@ -767,14 +786,37 @@ export function resolveEffectivePerUnitDiscount(product) {
|
|
|
767
786
|
if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
|
|
768
787
|
return fromList + (originalPrice - finalPrice);
|
|
769
788
|
}
|
|
770
|
-
export function createDefaultOrderRulesHooks() {
|
|
789
|
+
export function createDefaultOrderRulesHooks(getBookings) {
|
|
790
|
+
var getProductStartDate = function getProductStartDate(product) {
|
|
791
|
+
var _ref17, _product$metadata$uni, _product$metadata2, _ref18, _product$booking_uid, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
|
|
792
|
+
var productUid = String((_ref17 = (_product$metadata$uni = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number) !== null && _ref17 !== void 0 ? _ref17 : '');
|
|
793
|
+
var bookingUid = String((_ref18 = (_product$booking_uid = product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_uid) !== null && _ref18 !== void 0 ? _ref18 : '');
|
|
794
|
+
// 每次读取当前 bookings,覆盖改期、订单回显以及直接调用 Rules 的选券入口。
|
|
795
|
+
var bookings = (getBookings === null || getBookings === void 0 ? void 0 : getBookings()) || [];
|
|
796
|
+
var booking = bookings.find(function (item) {
|
|
797
|
+
var _ref19, _item$product_uid, _item$metadata3;
|
|
798
|
+
return productUid && String((_ref19 = (_item$product_uid = item === null || item === void 0 ? void 0 : item.product_uid) !== null && _item$product_uid !== void 0 ? _item$product_uid : item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.product_uid) !== null && _ref19 !== void 0 ? _ref19 : '') === productUid;
|
|
799
|
+
}) || bookings.find(function (item) {
|
|
800
|
+
var _ref20, _item$metadata$unique, _item$metadata4;
|
|
801
|
+
return bookingUid && String((_ref20 = (_item$metadata$unique = item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) !== null && _item$metadata$unique !== void 0 ? _item$metadata$unique : item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _ref20 !== void 0 ? _ref20 : '') === bookingUid;
|
|
802
|
+
});
|
|
803
|
+
if (booking) {
|
|
804
|
+
// 严格解析并保留 Invalid Date,让公共时间校验拒绝缺失/非法时间,避免回退到当前时间。
|
|
805
|
+
return dayjs("".concat(booking.start_date, " ").concat(booking.start_time), ['YYYY-MM-DD HH:mm', 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD H:mm', 'YYYY-MM-DD H:mm:ss'], true);
|
|
806
|
+
}
|
|
807
|
+
if (getBookings && (bookingUid || product.booking_id || (_product$metadata4 = product.metadata) !== null && _product$metadata4 !== void 0 && _product$metadata4.booking_id)) {
|
|
808
|
+
return dayjs('');
|
|
809
|
+
}
|
|
810
|
+
var legacyStartDate = ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate);
|
|
811
|
+
return legacyStartDate ? dayjs(legacyStartDate) : undefined;
|
|
812
|
+
};
|
|
771
813
|
var toUnitPriceString = function toUnitPriceString(totalLike, num) {
|
|
772
814
|
var effectiveNum = Number(num) > 0 ? Number(num) : 1;
|
|
773
815
|
return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
|
|
774
816
|
};
|
|
775
817
|
var getBundleIdentity = function getBundleIdentity(bundle) {
|
|
776
|
-
var
|
|
777
|
-
return [(
|
|
818
|
+
var _ref21, _bundle$bundle_id, _ref22, _ref23, _bundle$bundle_produc, _ref24, _ref25, _bundle$bundle_varian, _ref26, _bundle$bundle_group_;
|
|
819
|
+
return [(_ref21 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref21 !== void 0 ? _ref21 : '', (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : '', (_ref24 = (_ref25 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref25 !== void 0 ? _ref25 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0, (_ref26 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref26 !== void 0 ? _ref26 : ''].join('|');
|
|
778
820
|
};
|
|
779
821
|
var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
|
|
780
822
|
if (!Array.isArray(rulesBundle)) return rulesBundle;
|
|
@@ -784,7 +826,7 @@ export function createDefaultOrderRulesHooks() {
|
|
|
784
826
|
currentByIdentity.set(getBundleIdentity(bundle), bundle);
|
|
785
827
|
});
|
|
786
828
|
return rulesBundle.map(function (bundle) {
|
|
787
|
-
var _bundle$price_type_ex2,
|
|
829
|
+
var _bundle$price_type_ex2, _ref27, _ref28, _current$price, _ref29, _ref30, _ref31, _current$original_pri;
|
|
788
830
|
if (!bundle || _typeof(bundle) !== 'object') return bundle;
|
|
789
831
|
var current = currentByIdentity.get(getBundleIdentity(bundle));
|
|
790
832
|
if (!current) return bundle;
|
|
@@ -793,8 +835,8 @@ export function createDefaultOrderRulesHooks() {
|
|
|
793
835
|
} : {});
|
|
794
836
|
var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
|
|
795
837
|
if (!isProductPriceBundle) return bundleWithDisplayFields;
|
|
796
|
-
var sourcePrice = (
|
|
797
|
-
var originalPrice = (
|
|
838
|
+
var sourcePrice = (_ref27 = (_ref28 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref28 !== void 0 ? _ref28 : current.original_price) !== null && _ref27 !== void 0 ? _ref27 : current.bundle_selling_price;
|
|
839
|
+
var originalPrice = (_ref29 = (_ref30 = (_ref31 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref31 !== void 0 ? _ref31 : current.price) !== null && _ref30 !== void 0 ? _ref30 : current.custom_price) !== null && _ref29 !== void 0 ? _ref29 : sourcePrice;
|
|
798
840
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
|
|
799
841
|
price: sourcePrice
|
|
800
842
|
} : {}), originalPrice !== undefined ? {
|
|
@@ -806,7 +848,7 @@ export function createDefaultOrderRulesHooks() {
|
|
|
806
848
|
};
|
|
807
849
|
return {
|
|
808
850
|
getProduct: function getProduct(product) {
|
|
809
|
-
var _product$
|
|
851
|
+
var _product$metadata7, _product$metadata8, _product$metadata9, _metadataAny$_promoti;
|
|
810
852
|
// source_product_price 是权威源;兜底链:source → mainSelling − options(反推)→ 行 selling_price
|
|
811
853
|
var metadataAny = product.metadata || {};
|
|
812
854
|
var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
|
|
@@ -833,7 +875,7 @@ export function createDefaultOrderRulesHooks() {
|
|
|
833
875
|
// 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
|
|
834
876
|
// 不透明 identity 契约下,normalizeOrderProduct / hydrate 已保证唯一值存在;
|
|
835
877
|
// 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
|
|
836
|
-
_id: (_product$
|
|
878
|
+
_id: (_product$metadata7 = product.metadata) !== null && _product$metadata7 !== void 0 && _product$metadata7.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
|
|
837
879
|
// Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option,
|
|
838
880
|
// 所以这里必须喂 source-level(不含 option、不含 bundle、不含折扣)单价,避免双加 option。
|
|
839
881
|
price: sourcePrice,
|
|
@@ -845,23 +887,23 @@ export function createDefaultOrderRulesHooks() {
|
|
|
845
887
|
num: product.num || 1,
|
|
846
888
|
discount_list: product.discount_list || [],
|
|
847
889
|
bundle: product.product_bundle || [],
|
|
848
|
-
booking_id: ((_product$
|
|
890
|
+
booking_id: ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_id) || null,
|
|
849
891
|
isClient: false,
|
|
850
892
|
// 勿写死 false:否则 Rules 不会走 total≠origin_total 的手动价推断,
|
|
851
893
|
// 无券时会把 bundle 价还原成 original_price(手动改价套餐会从 20 回到 30)。
|
|
852
894
|
isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
|
|
853
|
-
holder_id: (_product$
|
|
854
|
-
startDate: (
|
|
895
|
+
holder_id: (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id,
|
|
896
|
+
startDate: getProductStartDate(product),
|
|
855
897
|
main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
|
|
856
898
|
inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
|
|
857
899
|
_promotion: metadataAny._promotion
|
|
858
900
|
};
|
|
859
901
|
},
|
|
860
902
|
setProduct: function setProduct(product, values) {
|
|
861
|
-
var
|
|
862
|
-
var nextNum = Number((
|
|
903
|
+
var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _product$product_sku, _values$discount_list, _values$quantity2;
|
|
904
|
+
var nextNum = Number((_ref32 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref32 !== void 0 ? _ref32 : 1) || 1;
|
|
863
905
|
var metadataAny = product.metadata || {};
|
|
864
|
-
var existedSource = (
|
|
906
|
+
var existedSource = (_ref33 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref33 !== void 0 ? _ref33 : '0';
|
|
865
907
|
var nextOptions = getProductSkuOptions(product);
|
|
866
908
|
var optionSum = sumOptionUnitPrice(nextOptions);
|
|
867
909
|
|
|
@@ -1072,7 +1114,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1072
1114
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1073
1115
|
if (!Array.isArray(bundle)) return [];
|
|
1074
1116
|
return bundle.map(function (b) {
|
|
1075
|
-
var
|
|
1117
|
+
var _ref34, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref35, _rawBundle$price_type, _ref36, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
|
|
1076
1118
|
var rawBundle = b && _typeof(b) === 'object' ? b : {};
|
|
1077
1119
|
var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
|
|
1078
1120
|
var _customProductBundleMapId = existedMetadata.custom_product_bundle_map_id,
|
|
@@ -1083,7 +1125,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1083
1125
|
var sellingPrice = formatOptions.virtualSettlementMode ? '0.00' : getBundleSellingMagnitude(rawBundle).toFixed(2);
|
|
1084
1126
|
// payment 价由整单折扣均摊层产出;缺省(无折扣)时与 selling 净额同义。
|
|
1085
1127
|
var paymentPrice = formatOptions.virtualSettlementMode ? '0.00' : rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
|
|
1086
|
-
var priceValue = formatOptions.virtualSettlementMode ? 0 : (
|
|
1128
|
+
var priceValue = formatOptions.virtualSettlementMode ? 0 : (_ref34 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref34 !== void 0 ? _ref34 : rawBundle.bundle_selling_price;
|
|
1087
1129
|
var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
|
|
1088
1130
|
var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
|
|
1089
1131
|
var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
|
|
@@ -1102,8 +1144,8 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1102
1144
|
extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
|
|
1103
1145
|
extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
|
|
1104
1146
|
price: priceValue,
|
|
1105
|
-
price_type: (
|
|
1106
|
-
price_type_ext: (
|
|
1147
|
+
price_type: (_ref35 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref35 !== void 0 ? _ref35 : '',
|
|
1148
|
+
price_type_ext: (_ref36 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref36 !== void 0 ? _ref36 : '',
|
|
1107
1149
|
bundle_selling_price: sellingPrice,
|
|
1108
1150
|
bundle_payment_price: paymentPrice,
|
|
1109
1151
|
option: formatSubmitOptionItems(rawBundle.option, formatOptions),
|
|
@@ -1139,11 +1181,11 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1139
1181
|
* 法币仅做字段/metadata 裁剪;虚拟币在出站前再次执行零加价与固定单价断言。
|
|
1140
1182
|
*/
|
|
1141
1183
|
function normalizeSubmitProduct(product) {
|
|
1142
|
-
var
|
|
1184
|
+
var _ref38, _submitProduct$bundle, _rawMetadata$product_, _rawMetadata$selected, _rawMetadata$selected2, _submitProduct$produc, _submitProduct$paymen;
|
|
1143
1185
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1144
|
-
var
|
|
1145
|
-
_runtimeUid =
|
|
1146
|
-
submitProduct = _objectWithoutProperties(
|
|
1186
|
+
var _ref37 = product,
|
|
1187
|
+
_runtimeUid = _ref37.unique_identification_number,
|
|
1188
|
+
submitProduct = _objectWithoutProperties(_ref37, _excluded2);
|
|
1147
1189
|
var num = submitProduct.num,
|
|
1148
1190
|
_productSurchargeFee = submitProduct.surcharge_fee,
|
|
1149
1191
|
_deprecatedDiscountAmount = submitProduct.discount_amount,
|
|
@@ -1160,7 +1202,7 @@ function normalizeSubmitProduct(product) {
|
|
|
1160
1202
|
// 兼容历史 BigSale 编辑链路:bundle_edit 曾被写入 metadata,
|
|
1161
1203
|
// 出站时需提升到商品顶层;套餐未编辑时也必须显式提交 0。
|
|
1162
1204
|
var hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
|
|
1163
|
-
var bundleEdit = (
|
|
1205
|
+
var bundleEdit = (_ref38 = (_submitProduct$bundle = submitProduct.bundle_edit) !== null && _submitProduct$bundle !== void 0 ? _submitProduct$bundle : rawMetadata.bundle_edit) !== null && _ref38 !== void 0 ? _ref38 : hasProductBundle ? 0 : undefined;
|
|
1164
1206
|
var cleanMetadata = {};
|
|
1165
1207
|
if (rawMetadata.unique_identification_number) {
|
|
1166
1208
|
cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
|
|
@@ -1225,7 +1267,7 @@ function normalizeSubmitProduct(product) {
|
|
|
1225
1267
|
payment_price: formatOptions.virtualSettlementMode ? virtualPrice : (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
|
|
1226
1268
|
});
|
|
1227
1269
|
}
|
|
1228
|
-
var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
|
|
1270
|
+
var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder', 'is_fulfillment_timing', 'fulfillment_timing'];
|
|
1229
1271
|
export function normalizeBookingIsAll(booking) {
|
|
1230
1272
|
return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
|
|
1231
1273
|
}
|
|
@@ -1253,16 +1295,22 @@ export function normalizeSubmitBooking(booking) {
|
|
|
1253
1295
|
} finally {
|
|
1254
1296
|
_iterator7.f();
|
|
1255
1297
|
}
|
|
1256
|
-
if (cleanMetadata.holder_id === undefined
|
|
1298
|
+
if (cleanMetadata.holder_id === undefined && !isFulfillmentTimingBooking(booking)) {
|
|
1299
|
+
cleanMetadata.holder_id = null;
|
|
1300
|
+
}
|
|
1257
1301
|
var bookingRecord = booking;
|
|
1258
1302
|
var startDate = bookingRecord.start_date;
|
|
1259
1303
|
var shouldRestoreSelectDate = bookingRecord.select_date === undefined || bookingRecord.select_date === null || bookingRecord.select_date === '';
|
|
1260
1304
|
var selectDateFromStartDate = typeof startDate === 'string' ? startDate.split(/\s+/)[0] : startDate;
|
|
1261
|
-
return _objectSpread(_objectSpread(_objectSpread({}, booking), shouldRestoreSelectDate && selectDateFromStartDate ? {
|
|
1305
|
+
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, booking), shouldRestoreSelectDate && selectDateFromStartDate ? {
|
|
1262
1306
|
select_date: selectDateFromStartDate
|
|
1263
1307
|
} : {}), {}, {
|
|
1264
1308
|
is_all: normalizeBookingIsAll(bookingRecord),
|
|
1265
|
-
sub_type: normalizeBookingSubType(bookingRecord)
|
|
1309
|
+
sub_type: normalizeBookingSubType(bookingRecord)
|
|
1310
|
+
}, isFulfillmentTimingBooking(booking) ? {
|
|
1311
|
+
like_status: bookingRecord.like_status || 'common',
|
|
1312
|
+
schedule_id: bookingRecord.schedule_id || 0
|
|
1313
|
+
} : {}), {}, {
|
|
1266
1314
|
metadata: cleanMetadata
|
|
1267
1315
|
});
|
|
1268
1316
|
}
|
|
@@ -1351,6 +1399,7 @@ function hasBoundBookingResource(bookings) {
|
|
|
1351
1399
|
if (!Array.isArray(bookings)) return false;
|
|
1352
1400
|
return bookings.some(function (booking) {
|
|
1353
1401
|
if (!booking || _typeof(booking) !== 'object') return false;
|
|
1402
|
+
if (isFulfillmentTimingBooking(booking)) return false;
|
|
1354
1403
|
if (Number(booking.parent_id) === 0) return false;
|
|
1355
1404
|
var resources = booking.resources;
|
|
1356
1405
|
if (!Array.isArray(resources)) return false;
|
|
@@ -1385,13 +1434,15 @@ export function resolveSubmitOrderType(params) {
|
|
|
1385
1434
|
return 'table-order';
|
|
1386
1435
|
}
|
|
1387
1436
|
if (currentType) return currentType;
|
|
1388
|
-
if (Array.isArray(bookings) && bookings.
|
|
1437
|
+
if (Array.isArray(bookings) && bookings.some(function (booking) {
|
|
1438
|
+
return !isFulfillmentTimingBooking(booking);
|
|
1439
|
+
})) {
|
|
1389
1440
|
return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
|
|
1390
1441
|
}
|
|
1391
1442
|
return 'virtual';
|
|
1392
1443
|
}
|
|
1393
1444
|
export function buildSubmitPayload(params) {
|
|
1394
|
-
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_,
|
|
1445
|
+
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref40, _tempOrder$is_price_i, _tempOrder$is_deposit, _tempOrder$_extend, _enhancedPayload$summ;
|
|
1395
1446
|
var tempOrder = params.tempOrder,
|
|
1396
1447
|
cacheId = params.cacheId,
|
|
1397
1448
|
_params$now = params.now,
|
|
@@ -1405,29 +1456,29 @@ export function buildSubmitPayload(params) {
|
|
|
1405
1456
|
var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
|
|
1406
1457
|
var bookingUuid = createUuidV4();
|
|
1407
1458
|
var virtualSettlementMode = ((_tempOrder$metadata2 = tempOrder.metadata) === null || _tempOrder$metadata2 === void 0 || (_tempOrder$metadata2 = _tempOrder$metadata2.currency_settlement_config) === null || _tempOrder$metadata2 === void 0 ? void 0 : _tempOrder$metadata2.settlement_type) === 'virtual_currency';
|
|
1408
|
-
var
|
|
1409
|
-
_extend =
|
|
1410
|
-
_relationId =
|
|
1411
|
-
_tableFormId =
|
|
1412
|
-
_resourceId =
|
|
1413
|
-
_summary =
|
|
1414
|
-
_lastOrderInfo =
|
|
1415
|
-
_paidAmount =
|
|
1416
|
-
_shopId =
|
|
1417
|
-
_shopNote =
|
|
1418
|
-
_shopServiceType =
|
|
1419
|
-
_startTime =
|
|
1420
|
-
_customer =
|
|
1421
|
-
_discountList =
|
|
1422
|
-
_orderMetaList =
|
|
1423
|
-
_rootTaxFee =
|
|
1424
|
-
_totalAmount =
|
|
1425
|
-
_totalRefundAmount =
|
|
1426
|
-
_createDate =
|
|
1427
|
-
_holderId =
|
|
1428
|
-
_paymentStatus =
|
|
1429
|
-
_notes =
|
|
1430
|
-
tempOrderRest = _objectWithoutProperties(
|
|
1459
|
+
var _ref39 = tempOrder,
|
|
1460
|
+
_extend = _ref39._extend,
|
|
1461
|
+
_relationId = _ref39.relation_id,
|
|
1462
|
+
_tableFormId = _ref39.table_form_id,
|
|
1463
|
+
_resourceId = _ref39.resource_id,
|
|
1464
|
+
_summary = _ref39.summary,
|
|
1465
|
+
_lastOrderInfo = _ref39.lastOrderInfo,
|
|
1466
|
+
_paidAmount = _ref39.paid_amount,
|
|
1467
|
+
_shopId = _ref39.shop_id,
|
|
1468
|
+
_shopNote = _ref39.shop_note,
|
|
1469
|
+
_shopServiceType = _ref39.shop_service_type,
|
|
1470
|
+
_startTime = _ref39.start_time,
|
|
1471
|
+
_customer = _ref39.customer,
|
|
1472
|
+
_discountList = _ref39.discount_list,
|
|
1473
|
+
_orderMetaList = _ref39.order_meta_list,
|
|
1474
|
+
_rootTaxFee = _ref39.tax_fee,
|
|
1475
|
+
_totalAmount = _ref39.total_amount,
|
|
1476
|
+
_totalRefundAmount = _ref39.total_refund_amount,
|
|
1477
|
+
_createDate = _ref39.create_date,
|
|
1478
|
+
_holderId = _ref39.holder_id,
|
|
1479
|
+
_paymentStatus = _ref39.payment_status,
|
|
1480
|
+
_notes = _ref39.notes,
|
|
1481
|
+
tempOrderRest = _objectWithoutProperties(_ref39, _excluded4);
|
|
1431
1482
|
var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code;
|
|
1432
1483
|
var normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
|
|
1433
1484
|
var submitType = resolveSubmitOrderType({
|
|
@@ -1452,7 +1503,7 @@ export function buildSubmitPayload(params) {
|
|
|
1452
1503
|
type: submitType,
|
|
1453
1504
|
business_code: resolvedBusinessCode,
|
|
1454
1505
|
sales_channel: tempOrder.sales_channel || 'my_pisel',
|
|
1455
|
-
order_sales_channel: (
|
|
1506
|
+
order_sales_channel: (_ref40 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref40 !== void 0 ? _ref40 : 'online_store',
|
|
1456
1507
|
status: tempOrder.status || 'normal'
|
|
1457
1508
|
}, params.includePaymentStatus !== false ? {
|
|
1458
1509
|
payment_status: tempOrder.payment_status || 'payment_processing'
|
|
@@ -1469,7 +1520,7 @@ export function buildSubmitPayload(params) {
|
|
|
1469
1520
|
schedule_date: scheduleDate,
|
|
1470
1521
|
// created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
|
|
1471
1522
|
bookings: (tempOrder.bookings || []).filter(function (booking) {
|
|
1472
|
-
return Number(booking.parent_id) !== 0;
|
|
1523
|
+
return isFulfillmentTimingBooking(booking) || Number(booking.parent_id) !== 0;
|
|
1473
1524
|
}).map(function (booking) {
|
|
1474
1525
|
return normalizeSubmitBooking(booking);
|
|
1475
1526
|
}),
|
|
@@ -1480,13 +1531,13 @@ export function buildSubmitPayload(params) {
|
|
|
1480
1531
|
// holder: tempOrder.holder || null,
|
|
1481
1532
|
summary: summary || tempOrder.summary || createEmptySummary(),
|
|
1482
1533
|
metadata: function () {
|
|
1483
|
-
var
|
|
1484
|
-
_collectPax =
|
|
1485
|
-
_tableOccupancyDuration =
|
|
1486
|
-
_cartSettlementKey =
|
|
1487
|
-
_cartSettlementSnapshot =
|
|
1488
|
-
_legalCurrencySnapshot =
|
|
1489
|
-
rest = _objectWithoutProperties(
|
|
1534
|
+
var _ref41 = tempOrder.metadata || {},
|
|
1535
|
+
_collectPax = _ref41.collect_pax,
|
|
1536
|
+
_tableOccupancyDuration = _ref41.table_occupancy_duration,
|
|
1537
|
+
_cartSettlementKey = _ref41.cart_settlement_key,
|
|
1538
|
+
_cartSettlementSnapshot = _ref41.cart_settlement_snapshot,
|
|
1539
|
+
_legalCurrencySnapshot = _ref41.legal_currency_snapshot,
|
|
1540
|
+
rest = _objectWithoutProperties(_ref41, _excluded5);
|
|
1490
1541
|
return _objectSpread({}, rest);
|
|
1491
1542
|
}()
|
|
1492
1543
|
}, (_tempOrder$_extend = tempOrder._extend) !== null && _tempOrder$_extend !== void 0 && (_tempOrder$_extend = _tempOrder$_extend.salesNotesState) !== null && _tempOrder$_extend !== void 0 && _tempOrder$_extend.dirty ? {
|
|
@@ -1690,9 +1741,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
|
|
|
1690
1741
|
* getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
|
|
1691
1742
|
*/
|
|
1692
1743
|
export function getOrderProductLineUid(product) {
|
|
1693
|
-
var _product$metadata$
|
|
1744
|
+
var _product$metadata$uni2, _product$metadata10;
|
|
1694
1745
|
if (!product || _typeof(product) !== 'object') return null;
|
|
1695
|
-
var uid = (_product$metadata$
|
|
1746
|
+
var uid = (_product$metadata$uni2 = (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) !== null && _product$metadata$uni2 !== void 0 ? _product$metadata$uni2 : product.unique_identification_number;
|
|
1696
1747
|
if (uid === undefined || uid === null || uid === '') return null;
|
|
1697
1748
|
return String(uid);
|
|
1698
1749
|
}
|
|
@@ -1703,8 +1754,8 @@ export function getRuntimeProductOrigin(tempOrder, product) {
|
|
|
1703
1754
|
return tempOrder._extend.productsByUid[uid].origin;
|
|
1704
1755
|
}
|
|
1705
1756
|
var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
|
|
1706
|
-
var
|
|
1707
|
-
return item === product || getOrderProductLineUid(item) === uid || String((
|
|
1757
|
+
var _ref42, _item$product_id, _ref43, _product$product_id;
|
|
1758
|
+
return item === product || getOrderProductLineUid(item) === uid || String((_ref42 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref42 !== void 0 ? _ref42 : '') === String((_ref43 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref43 !== void 0 ? _ref43 : '');
|
|
1708
1759
|
});
|
|
1709
1760
|
var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
|
|
1710
1761
|
return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[matchedUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin) || null : null;
|