@pisell/pisellos 2.2.314 → 2.2.316

package/dist/modules/Order/utils.js

@@ -1,6 +1,6 @@
 var _excluded = ["custom_product_bundle_map_id"],
   _excluded2 = ["unique_identification_number"],
-  _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
+  _excluded3 = ["num", "_extend", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
   _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "order_meta_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id", "payment_status", "notes"],
   _excluded5 = ["collect_pax", "table_occupancy_duration", "cart_settlement_key", "cart_settlement_snapshot", "legal_currency_snapshot"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -22,6 +22,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
 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); }
+import { cloneDeep } from 'lodash-es';
 import dayjs from "dayjs";
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import Decimal from 'decimal.js';
@@ -31,6 +32,8 @@ import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
 import { encodeSalesNotes } from "./salesNotes";
+import { isFulfillmentTimingBooking } from "./pickupTiming";
+import { ensureHolderRelationUuids, getProductHolderRelations, hasProductBooking, removeProductHolderRelations } from "./holderRelations";
 dayjs.extend(customParseFormat);
 var POINT_CARD_SNAPSHOT_TAG = 'point_card';
 var VIRTUAL_CURRENCY_SNAPSHOT_TAG = 'virtual_currency';
@@ -187,6 +190,10 @@ export function normalizeVirtualCurrencySnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  var code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function normalizeVirtualCurrencySnapshotList(value) {
@@ -218,6 +225,10 @@ export function buildVirtualCurrencySnapshotFromList(value) {
     if (productId !== undefined) {
       snapshot.product_id = productId;
     }
+    var code = normalizeSnapshotScalar(item.code);
+    if (code !== undefined) {
+      snapshot.code = String(code).trim();
+    }
     result.push(snapshot);
     return result;
   }, []);
@@ -787,7 +798,7 @@ export function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-export function createDefaultOrderRulesHooks(getBookings) {
+export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
   var getProductStartDate = function getProductStartDate(product) {
     var _ref17, _product$metadata$uni, _product$metadata2, _ref18, _product$booking_uid, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
     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 : '');
@@ -910,7 +921,13 @@ export function createDefaultOrderRulesHooks(getBookings) {
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id,
+        holder_id: hasProductBooking(product) || !getHolderRelations ? (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id : getProductHolderRelations({
+          holder_relations: getHolderRelations()
+        }, product).filter(function (relation) {
+          return relation.holder_type === 'form';
+        }).map(function (relation) {
+          return relation.holder_id;
+        }),
         startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
@@ -1207,6 +1224,7 @@ function normalizeSubmitProduct(product) {
     _runtimeUid = _ref37.unique_identification_number,
     submitProduct = _objectWithoutProperties(_ref37, _excluded2);
   var num = submitProduct.num,
+    _productExtend = submitProduct._extend,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
     _deprecatedDiscountType = submitProduct.discount_type,
@@ -1287,7 +1305,7 @@ function normalizeSubmitProduct(product) {
     payment_price: formatOptions.virtualSettlementMode ? virtualPrice : (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
   });
 }
-var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
+var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder', 'is_fulfillment_timing', 'fulfillment_timing'];
 export function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }
@@ -1315,21 +1333,27 @@ export function normalizeSubmitBooking(booking) {
   } finally {
     _iterator7.f();
   }
-  if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
+  if (cleanMetadata.holder_id === undefined && !isFulfillmentTimingBooking(booking)) {
+    cleanMetadata.holder_id = null;
+  }
   var bookingRecord = booking;
   var startDate = bookingRecord.start_date;
   var shouldRestoreSelectDate = bookingRecord.select_date === undefined || bookingRecord.select_date === null || bookingRecord.select_date === '';
   var selectDateFromStartDate = typeof startDate === 'string' ? startDate.split(/\s+/)[0] : startDate;
-  return _objectSpread(_objectSpread(_objectSpread({}, booking), shouldRestoreSelectDate && selectDateFromStartDate ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, booking), shouldRestoreSelectDate && selectDateFromStartDate ? {
     select_date: selectDateFromStartDate
   } : {}), {}, {
     is_all: normalizeBookingIsAll(bookingRecord),
-    sub_type: normalizeBookingSubType(bookingRecord),
+    sub_type: normalizeBookingSubType(bookingRecord)
+  }, isFulfillmentTimingBooking(booking) ? {
+    like_status: bookingRecord.like_status || 'common',
+    schedule_id: bookingRecord.schedule_id || 0
+  } : {}), {}, {
     metadata: cleanMetadata
   });
 }
 var DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
-function resolveTableOccupancyDuration(tempOrder) {
+export function resolveTableOccupancyDuration(tempOrder) {
   var _metadata$table_confi, _metadata$tableConfig, _metadata$resource_co, _metadata$resourceCon;
   var metadata = tempOrder.metadata || {};
   var candidates = [metadata.table_occupancy_duration, metadata.booking_duration, metadata.table_duration, metadata.duration, (_metadata$table_confi = metadata.table_config) === null || _metadata$table_confi === void 0 ? void 0 : _metadata$table_confi.occupancy_duration, (_metadata$tableConfig = metadata.tableConfig) === null || _metadata$tableConfig === void 0 ? void 0 : _metadata$tableConfig.occupancy_duration, (_metadata$resource_co = metadata.resource_config) === null || _metadata$resource_co === void 0 ? void 0 : _metadata$resource_co.occupancy_duration, (_metadata$resourceCon = metadata.resourceConfig) === null || _metadata$resourceCon === void 0 ? void 0 : _metadata$resourceCon.occupancy_duration];
@@ -1391,6 +1415,7 @@ export function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1413,6 +1438,7 @@ function hasBoundBookingResource(bookings) {
   if (!Array.isArray(bookings)) return false;
   return bookings.some(function (booking) {
     if (!booking || _typeof(booking) !== 'object') return false;
+    if (isFulfillmentTimingBooking(booking)) return false;
     if (Number(booking.parent_id) === 0) return false;
     var resources = booking.resources;
     if (!Array.isArray(resources)) return false;
@@ -1447,7 +1473,9 @@ export function resolveSubmitOrderType(params) {
     return 'table-order';
   }
   if (currentType) return currentType;
-  if (Array.isArray(bookings) && bookings.length > 0) {
+  if (Array.isArray(bookings) && bookings.some(function (booking) {
+    return !isFulfillmentTimingBooking(booking);
+  })) {
     return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
   }
   return 'virtual';
@@ -1464,6 +1492,7 @@ export function buildSubmitPayload(params) {
     type = params.type,
     summary = params.summary,
     enhance = params.enhance;
+  ensureHolderRelationUuids(tempOrder);
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
   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';
@@ -1500,7 +1529,9 @@ export function buildSubmitPayload(params) {
     tempOrderBusinessCode: tempOrder.business_code,
     bookings: tempOrder.bookings
   });
-  var payload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var payload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), tempOrder.holder_relations !== undefined ? {
+    holder_relations: cloneDeep(tempOrder.holder_relations)
+  } : {}), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
@@ -1527,11 +1558,11 @@ export function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(function (booking) {
-      return Number(booking.parent_id) !== 0;
+      return isFulfillmentTimingBooking(booking) || Number(booking.parent_id) !== 0;
     }).map(function (booking) {
       return normalizeSubmitBooking(booking);
     }),
@@ -1687,21 +1718,32 @@ export function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 export function clearTempOrderHolderAssignments(tempOrder) {
-  var _tempOrder$_extend2;
-  var changed = false;
+  var _tempOrder$holder_rel, _tempOrder$holder_rel2, _tempOrder$_extend2;
+  var previousRelationCount = ((_tempOrder$holder_rel = tempOrder.holder_relations) === null || _tempOrder$holder_rel === void 0 ? void 0 : _tempOrder$holder_rel.length) || 0;
+  removeProductHolderRelations(tempOrder, (tempOrder.products || []).filter(function (product) {
+    return !hasProductBooking(product);
+  }));
+  var changed = previousRelationCount !== (((_tempOrder$holder_rel2 = tempOrder.holder_relations) === null || _tempOrder$holder_rel2 === void 0 ? void 0 : _tempOrder$holder_rel2.length) || 0);
   var resetHolderField = function resetHolderField(target) {
     var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
     if (!hasAssignedHolderId(target[key])) return;
     target[key] = null;
     changed = true;
   };
+  var clearHolder = function clearHolder(target) {
+    resetHolderField(target);
+    if (target.holder !== undefined && target.holder !== null) {
+      target.holder = null;
+      changed = true;
+    }
+  };
   var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
     _step8;
   try {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
-        resetHolderField(product.metadata);
+        clearHolder(product.metadata);
       }
     }
   } catch (err) {
@@ -1734,11 +1776,13 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       var entry = _Object$values[_i4];
       var origin = entry === null || entry === void 0 ? void 0 : entry.origin;
       if (!origin || _typeof(origin) !== 'object') continue;
+      clearHolder(origin);
       if (origin.metadata && _typeof(origin.metadata) === 'object') {
-        resetHolderField(origin.metadata);
+        clearHolder(origin.metadata);
       }
       if (origin._extend && _typeof(origin._extend) === 'object') {
-        resetHolderField(origin._extend);
+        clearHolder(origin._extend);
+        delete origin._extend.holder_relations;
       }
     }
   }

package/dist/modules/Payment/index.js

@@ -20,6 +20,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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); }
+import { loadPaymentMethods } from "../../shared/payment/loadPaymentMethods";
 import { BaseModule } from "../BaseModule";
 import { PaymentStatus, PaymentMethodType, RoundingRule } from "./types";
 import { getUniqueId } from "../Cart/utils";
@@ -363,37 +364,35 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "getPayMethodListAsync",
     value: (function () {
       var _getPayMethodListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var response, payMethods;
+        var payMethods;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.logInfo('Starting getPayMethodListAsync');
               _context3.prev = 1;
               _context3.next = 4;
-              return this.request.get('/pay/custom-payment/all', {
+              return loadPaymentMethods(this.request, {
+                transport: 'os-server',
                 filterPaymentMethods: true
-              }, {
-                osServer: true
               });
             case 4:
-              response = _context3.sent;
-              payMethods = (response === null || response === void 0 ? void 0 : response.data) || response || [];
+              payMethods = _context3.sent;
               this.logInfo('getPayMethodListAsync completed successfully', {
                 payMethods: payMethods
               });
               return _context3.abrupt("return", payMethods);
-            case 10:
-              _context3.prev = 10;
+            case 9:
+              _context3.prev = 9;
               _context3.t0 = _context3["catch"](1);
               console.error('[PaymentModule] 获取支付方式列表失败', _context3.t0);
               this.logError('getPayMethodListAsync failed', _context3.t0);
               // 如果所有操作都失败，返回空数组
               return _context3.abrupt("return", []);
-            case 15:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 10]]);
+        }, _callee3, this, [[1, 9]]);
       }));
       function getPayMethodListAsync() {
         return _getPayMethodListAsync.apply(this, arguments);

package/dist/modules/Product/types.d.ts

@@ -218,6 +218,17 @@ export interface ProductData {
     bundle?: any[];
     /** 商品选项组成 */
     options?: any[];
+    /** 单规格组；用于由已选 option 反查规格项名称、价格等商品快照字段。 */
+    option_group?: Array<{
+        id: number | string;
+        option_item?: Array<{
+            id: number | string;
+            name?: string | Record<string, any>;
+            title?: string | Record<string, any>;
+            [key: string]: any;
+        }>;
+        [key: string]: any;
+    }>;
     /** 商品原信息 */
     origin?: any;
     /** 容量 */

package/dist/modules/ProductList/index.js

@@ -227,7 +227,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 online_store: 'online-store',
                 scan_to_order: 'online-store',
                 'scan-to-order': 'online-store',
-                scan_to_order_2: 'mobile_order',
+                scan_to_order_2: 'online-store',
                 scan_to_order_3: 'scantoorder3'
               };
               rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;

package/dist/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,7 @@
 import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
+/** Resolve the label without changing the real calendar timestamp. */
+export declare function getDurationBusinessDate(projection: AvailabilityProjection, startAt: string): string;
 export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
 export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilityQueryResult;
 export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilitySelectionValidationResult;