@pisell/pisellos 0.10.12 → 0.10.14

package/dist/solution/UnifiedBookingSales/types.d.ts

@@ -6,6 +6,16 @@ import type { BookingTicketState } from '../BookingTicket/types';
 export type { AvailabilityAbsoluteRange, AvailabilityAssignment, AvailabilityCell, AvailabilityDateRange, AvailabilityDisplayRange, AvailabilityErrorCode, AvailabilityId, AvailabilityMode, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProductKind, AvailabilityProjection, AvailabilityProjectionInput, AvailabilityProjectionMeta, AvailabilityQuery, AvailabilityQueryResult, AvailabilityRequirementGroup, AvailabilityRequirementGroupResult, AvailabilityRequirementSelection, AvailabilityResource, AvailabilityResourceOption, AvailabilityResourceType, AvailabilityResourceWindow, AvailabilityScheduleMode, AvailabilityScheduleRef, AvailabilityScheduleRule, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, AvailabilitySessionRange, AvailabilityStatus, DateAvailabilityGroup, DateAvailabilityItem, DateAvailabilityQuery, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityGroup, ProductAvailabilityItem, ProductAvailabilityQuery, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, QueryAvailabilityBaseRequest, ResourceAvailabilityGroup, ResourceAvailabilityQuery, ResourceAvailabilityQueryResult, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem, TimeAvailabilityQuery, TimeAvailabilityQueryResult, } from '../../modules/ResourcePlanner';
 export interface UnifiedBookingSalesState extends BookingTicketState {
 }
+export interface UnifiedBookingSalesPolicy {
+    id?: AvailabilityId;
+    title?: unknown;
+    content?: string;
+    [key: string]: unknown;
+}
+export interface UnifiedBookingSalesPolicyResponse {
+    data?: UnifiedBookingSalesPolicy;
+    [key: string]: unknown;
+}
 export declare enum UnifiedBookingSalesHooks {
     onAvailabilityProjectionPrepared = "unifiedBookingSales:onAvailabilityProjectionPrepared",
     onAvailabilitySelectionCommitted = "unifiedBookingSales:onAvailabilitySelectionCommitted",

package/lib/modules/Order/index.d.ts

@@ -526,7 +526,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/ResourcePlanner/planner.js

@@ -1473,7 +1473,7 @@ function evaluateCandidate(projection, candidate, request) {
     const selection = selectionsByGroupKey.get(requirementGroup.id) || selectionsByGroupKey.get(String(requirementGroup.formId ?? ""));
     const matchedResources = (((_a2 = request.groupResourceIndex) == null ? void 0 : _a2.get([String(product.id), requirementGroup.id].join(":"))) || projection.resources.filter((resource) => matchesRequirementGroup(requirementGroup, resource, product, partySize)).filter((resource) => !evaluationContext.resourceIdSet || evaluationContext.resourceIdSet.has(String(resource.id)))).filter((resource) => !selection || selection.resourceIds.some((resourceId) => sameId(resourceId, resource.id)));
     const options = matchedResources.map((resource) => {
-      var _a3;
+      var _a3, _b2, _c;
       const matchedCell = aggregateMatchedCells(
         product.id,
         requirementGroup.id,
@@ -1487,6 +1487,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceId: resource.id,
           resourceName: resource.name,
           resourceFormId: resource.formId,
+          policyId: (_b2 = resource.raw) == null ? void 0 : _b2.policy_id,
           resourceType: resource.resourceType,
           status: isPast2 ? "past" : "unavailable",
           maxPartySize: 0,
@@ -1513,6 +1514,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceId: resource.id,
         resourceName: resource.name,
         resourceFormId: resource.formId,
+        policyId: (_c = resource.raw) == null ? void 0 : _c.policy_id,
         resourceType: resource.resourceType,
         status: status2,
         remainingCapacity,

package/lib/modules/ResourcePlanner/types.d.ts

@@ -258,6 +258,7 @@ export interface AvailabilityResourceOption {
     resourceId: AvailabilityId;
     resourceName?: string;
     resourceFormId?: AvailabilityId;
+    policyId?: AvailabilityId;
     resourceType: AvailabilityResourceType;
     status: AvailabilityStatus;
     remainingCapacity?: number;

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 2 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/UnifiedBookingSales/index.d.ts

@@ -4,7 +4,7 @@ import type { OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
 import type { ProductListLoadProductsParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
-import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import { BookingTicket } from '../BookingTicket';
 export * from './types';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
@@ -147,6 +147,10 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    /**
+     * Load a resource policy without depending on the legacy appointmentBooking solution.
+     */
+    getProtocol(policyId: string | number): Promise<UnifiedBookingSalesPolicyResponse>;
     /**
      * Loads the product catalog used by both UI and Planner. Schedule data is requested with each
      * product because session products carry their fixed intervals there.

package/lib/solution/UnifiedBookingSales/index.js

@@ -933,7 +933,9 @@ function buildBookingFromAvailabilitySelection(params) {
     candidate,
     product,
     resources = [],
-    bookingUid
+    bookingUid,
+    holder,
+    holderIds
   } = params;
   const bookingStartAt = candidate.bookingStartAt || candidate.startAt;
   const bookingEndAt = candidate.bookingEndAt || candidate.endAt;
@@ -948,6 +950,8 @@ function buildBookingFromAvailabilitySelection(params) {
       scheduleRefs: candidate.scheduleRefs
     });
   }
+  const normalizedHolder = holder && typeof holder === "object" ? (0, import_lodash_es.cloneDeep)(holder) : void 0;
+  const normalizedHolderIds = Array.isArray(holderIds) ? (0, import_lodash_es.cloneDeep)(holderIds) : holderIds;
   return {
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
@@ -956,6 +960,7 @@ function buildBookingFromAvailabilitySelection(params) {
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1e3))),
     like_status: "common",
     schedule_id: scheduleId ?? 0,
+    ...normalizedHolder ? { holder: normalizedHolder } : {},
     resources: assignments.map((assignment) => {
       const matchedResource = resources.find((resource) => sameAvailabilityId(resource.id, assignment.resourceId));
       const resourceName = String((matchedResource == null ? void 0 : matchedResource.name) || "").trim();
@@ -979,7 +984,9 @@ function buildBookingFromAvailabilitySelection(params) {
       availability_slice_end_at: candidate.endAt,
       availability_schedule_refs: candidate.scheduleRefs,
       ...timeSlotId == null ? {} : { time_slot_id: timeSlotId },
-      product_kind: product.kind
+      product_kind: product.kind,
+      ...normalizedHolderIds === void 0 ? {} : { holder_id: normalizedHolderIds },
+      ...normalizedHolder ? { holder: (0, import_lodash_es.cloneDeep)(normalizedHolder) } : {}
     }
   };
 }
@@ -1557,6 +1564,18 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
       return cachedData;
     return this.loadOpenData({ businessCode, channel });
   }
+  /**
+   * Load a resource policy without depending on the legacy appointmentBooking solution.
+   */
+  async getProtocol(policyId) {
+    const normalizedPolicyId = String(policyId ?? "").trim();
+    if (!normalizedPolicyId) {
+      throw new Error("[UnifiedBookingSales] getProtocol 需要 policyId");
+    }
+    return this.request.get(
+      `/shop-policy/${encodeURIComponent(normalizedPolicyId)}`
+    );
+  }
   /**
    * Loads the product catalog used by both UI and Planner. Schedule data is requested with each
    * product because session products carry their fixed intervals there.
@@ -2804,7 +2823,7 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
   }
   /** Revalidates against the latest landed occupancy cache, then mutates exactly one product line. */
   async commitAvailabilitySelection(contextId, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     const normalizedContextId = String(contextId || "").trim();
     if (!normalizedContextId) {
       throw new import_ResourcePlanner.AvailabilityError("INVALID_TARGET_FILTER", "commitAvailabilitySelection 缺少 contextId", {
@@ -3074,7 +3093,9 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
         candidate: refreshedCandidate,
         product,
         resources: refreshedProjection.resources,
-        bookingUid: existingBookingUid || void 0
+        bookingUid: existingBookingUid || void 0,
+        holder: ((_h = (_g = params.orderProduct) == null ? void 0 : _g._extend) == null ? void 0 : _h.holder) ?? (existingBooking == null ? void 0 : existingBooking.holder) ?? ((_i = existingBooking == null ? void 0 : existingBooking.metadata) == null ? void 0 : _i.holder),
+        holderIds: ((_k = (_j = params.orderProduct) == null ? void 0 : _j._extend) == null ? void 0 : _k.holder_id) ?? ((_n = (_m = (_l = params.orderProduct) == null ? void 0 : _l._extend) == null ? void 0 : _m.holder) == null ? void 0 : _n.form_record) ?? ((_o = existingBooking == null ? void 0 : existingBooking.metadata) == null ? void 0 : _o.holder_id) ?? ((_p = existingBooking == null ? void 0 : existingBooking.holder) == null ? void 0 : _p.form_record)
       });
       const transformed = this.buildUnifiedOrderProduct({
         ...params.orderProduct,
@@ -3121,10 +3142,10 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
         bookingUids = [bookingUid];
       } else {
         const beforeProductLineUids = new Set(
-          (((_g = this.getTempOrder()) == null ? void 0 : _g.products) || []).map((line) => getProductLineUid(line)).filter(Boolean)
+          (((_q = this.getTempOrder()) == null ? void 0 : _q.products) || []).map((line) => getProductLineUid(line)).filter(Boolean)
         );
         const beforeBookingUids = new Set(
-          (((_h = this.getTempOrder()) == null ? void 0 : _h.bookings) || []).map((item) => getBookingUid(item)).filter(Boolean)
+          (((_r = this.getTempOrder()) == null ? void 0 : _r.bookings) || []).map((item) => getBookingUid(item)).filter(Boolean)
         );
         const products = await this.addProductToOrder(transformed, booking);
         const addedLines = products.filter((line) => {
@@ -3132,7 +3153,7 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
           return sameAvailabilityId(line.product_id ?? line.id, refreshedCandidate.productId) && ((_a2 = line.metadata) == null ? void 0 : _a2.availability_candidate_key) === refreshedCandidate.key && !beforeProductLineUids.has(getProductLineUid(line));
         });
         productLineUids = addedLines.map((line) => getProductLineUid(line)).filter(Boolean);
-        const addedBookings = (((_i = this.getTempOrder()) == null ? void 0 : _i.bookings) || []).filter((item) => {
+        const addedBookings = (((_s = this.getTempOrder()) == null ? void 0 : _s.bookings) || []).filter((item) => {
           var _a2;
           return ((_a2 = item.metadata) == null ? void 0 : _a2.availability_candidate_key) === refreshedCandidate.key && !beforeBookingUids.has(getBookingUid(item));
         });

package/lib/solution/UnifiedBookingSales/types.d.ts

@@ -6,6 +6,16 @@ import type { BookingTicketState } from '../BookingTicket/types';
 export type { AvailabilityAbsoluteRange, AvailabilityAssignment, AvailabilityCell, AvailabilityDateRange, AvailabilityDisplayRange, AvailabilityErrorCode, AvailabilityId, AvailabilityMode, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProductKind, AvailabilityProjection, AvailabilityProjectionInput, AvailabilityProjectionMeta, AvailabilityQuery, AvailabilityQueryResult, AvailabilityRequirementGroup, AvailabilityRequirementGroupResult, AvailabilityRequirementSelection, AvailabilityResource, AvailabilityResourceOption, AvailabilityResourceType, AvailabilityResourceWindow, AvailabilityScheduleMode, AvailabilityScheduleRef, AvailabilityScheduleRule, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, AvailabilitySessionRange, AvailabilityStatus, DateAvailabilityGroup, DateAvailabilityItem, DateAvailabilityQuery, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityGroup, ProductAvailabilityItem, ProductAvailabilityQuery, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, QueryAvailabilityBaseRequest, ResourceAvailabilityGroup, ResourceAvailabilityQuery, ResourceAvailabilityQueryResult, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem, TimeAvailabilityQuery, TimeAvailabilityQueryResult, } from '../../modules/ResourcePlanner';
 export interface UnifiedBookingSalesState extends BookingTicketState {
 }
+export interface UnifiedBookingSalesPolicy {
+    id?: AvailabilityId;
+    title?: unknown;
+    content?: string;
+    [key: string]: unknown;
+}
+export interface UnifiedBookingSalesPolicyResponse {
+    data?: UnifiedBookingSalesPolicy;
+    [key: string]: unknown;
+}
 export declare enum UnifiedBookingSalesHooks {
     onAvailabilityProjectionPrepared = "unifiedBookingSales:onAvailabilityProjectionPrepared",
     onAvailabilitySelectionCommitted = "unifiedBookingSales:onAvailabilitySelectionCommitted",

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.12",
+  "version": "0.10.14",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",