@pisell/pisellos 0.10.49 → 0.10.51

package/lib/solution/BaseSales/pickupTiming.js

@@ -0,0 +1,222 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PickupTimingController = void 0;
+var _lodashEs = require("lodash-es");
+var _FulfillmentTiming = require("../../modules/FulfillmentTiming");
+async function withTimeout(request) {
+  let timer;
+  try {
+    return await Promise.race([request, new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error('Unable to load pickup times. Please try again.')), 30000);
+    })]);
+  } finally {
+    if (timer !== undefined) clearTimeout(timer);
+  }
+}
+
+/** Coordinates fresh configuration with the independent appointment; UI keeps edit drafts. */
+class PickupTimingController {
+  latest;
+  requests = new Map();
+  writeSequence = 0;
+  constructor(host) {
+    this.host = host;
+  }
+  now() {
+    return this.host.now?.() ?? new Date();
+  }
+  async snapshot(force, includeSchedule, tolerateScheduleError = false) {
+    const scope = this.host.getScope();
+    const key = `${scope}:${force}:${includeSchedule}:${tolerateScheduleError}`;
+    let request = this.requests.get(key);
+    if (!request) {
+      request = (async () => {
+        const config = (0, _FulfillmentTiming.normalizePickupTimingConfig)(await withTimeout(this.host.loadOpenData(force)));
+        const timezone = this.host.getTimezone();
+        let schedules = [];
+        let error;
+        if (includeSchedule && config.handoverModes.includes('pick_up') && config.timingMode !== 'asap_only' && config.scheduleIds.length) {
+          try {
+            const schedule = this.host.getSchedule();
+            if (!schedule) throw new Error('Pickup schedule is unavailable. Please try again.');
+            await withTimeout(schedule.loadAllSchedule({
+              useCache: false
+            }));
+            const ids = [...new Set([...config.scheduleIds, ...(config.operatingHoursScheduleIds || [])])];
+            schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(ids) || []);
+          } catch (reason) {
+            if (!tolerateScheduleError) throw reason;
+            error = reason instanceof Error ? reason.message : 'Pickup schedule is unavailable. Please try again.';
+          }
+        }
+        if (scope !== this.host.getScope()) throw new Error('Store settings changed. Please try again.');
+        return {
+          config,
+          timezone,
+          schedules,
+          scope,
+          error
+        };
+      })();
+      this.requests.set(key, request);
+    }
+    try {
+      const result = await request;
+      if (scope !== this.host.getScope()) throw new Error('Store settings changed. Please try again.');
+      this.latest = result;
+      return result;
+    } finally {
+      if (this.requests.get(key) === request) this.requests.delete(key);
+    }
+  }
+  async getAvailability(params = {}) {
+    const snapshot = await this.snapshot(params.force !== false, true, true);
+    const now = this.now();
+    try {
+      return {
+        ...(0, _FulfillmentTiming.computePickupTimingAvailability)({
+          ...snapshot,
+          date: params.date,
+          now
+        }),
+        error: snapshot.error
+      };
+    } catch (reason) {
+      // Keep the handover selector usable when only Pickup's timezone is unavailable.
+      return {
+        config: snapshot.config,
+        timezone: snapshot.timezone,
+        now: now.toISOString(),
+        today: '',
+        maxDate: '',
+        date: params.date || '',
+        dates: [],
+        slots: [],
+        error: reason instanceof Error ? reason.message : 'Pickup times are unavailable. Please try again.'
+      };
+    }
+  }
+  getSelection() {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const booking = order.getPickupTimingBooking();
+    const config = this.latest?.scope === this.host.getScope() ? this.latest.config : undefined;
+    const storedServiceType = String(tempOrder?.metadata?.shop_service_data?.service_type || '');
+    const serviceType = config?.handoverModes.length ? config.handoverModes.includes(storedServiceType) ? storedServiceType : config.handoverModes[0] : storedServiceType;
+    const details = serviceType === 'pick_up' ? booking?.metadata.fulfillment_timing : undefined;
+    const mode = config?.timingMode === 'asap_only' ? 'asap' : config?.timingMode === 'scheduled_only' ? 'scheduled' : details?.mode ?? 'asap';
+    const sameMode = details?.mode === mode;
+    return {
+      serviceType,
+      mode,
+      source: mode === 'asap' ? 'asap' : sameMode && details?.source || 'schedule',
+      ...(sameMode && booking ? {
+        date: booking.start_date,
+        time: booking.start_time,
+        instant: details?.instant
+      } : {})
+    };
+  }
+  async validateSnapshot(selection) {
+    const snapshot = await this.snapshot(true, selection.serviceType === 'pick_up' && selection.mode === 'scheduled' && selection.source !== 'pos_manual');
+    const now = this.now();
+    const result = (0, _FulfillmentTiming.validatePickupTimingSelection)(selection, {
+      ...snapshot,
+      now,
+      allowManualOverride: this.host.isPos()
+    });
+    return {
+      snapshot,
+      now,
+      result
+    };
+  }
+  async validate(selection) {
+    return (await this.validateSnapshot(selection)).result;
+  }
+  async setSelection(selection, options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.ensureTempOrder();
+    const sequence = ++this.writeSequence;
+    const {
+      snapshot,
+      now,
+      result
+    } = await this.validateSnapshot(selection);
+    if (sequence !== this.writeSequence || order.getTempOrder() !== tempOrder || snapshot.scope !== this.host.getScope()) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    if (!result.valid) throw new Error(result.message || 'Please choose a valid pickup time.');
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return this.getSelection();
+    }
+    if (selection.serviceType !== 'pick_up') {
+      order.updateTempOrderServiceType(selection.serviceType);
+      return this.getSelection();
+    }
+    const slot = selection.mode === 'asap' ? (0, _FulfillmentTiming.getAsapPickupTiming)({
+      ...snapshot,
+      now
+    }) : result.slot;
+    if (!slot) throw new Error('Please choose a pickup time.');
+    // Validate everything before either field is changed; notify once after the combined update.
+    tempOrder.metadata = {
+      ...(tempOrder.metadata || {}),
+      shop_service_data: {
+        ...(tempOrder.metadata?.shop_service_data || {}),
+        service_type: 'pick_up'
+      }
+    };
+    order.setPickupTimingBooking({
+      mode: selection.mode,
+      source: selection.mode === 'asap' ? 'asap' : selection.source === 'pos_manual' ? 'pos_manual' : 'schedule',
+      date: slot.date,
+      time: slot.time,
+      instant: slot.instant,
+      timezone: snapshot.timezone,
+      frozen: options.frozen ?? false
+    });
+    return this.getSelection();
+  }
+
+  /** Called before a new checkout/payment; payment callbacks keep their already prepared appointment. */
+  async prepare(options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const sequence = this.writeSequence;
+    if (order.getOrderIdentity()?.isSubmitted) return this.getSelection();
+    const booking = order.getPickupTimingBooking();
+    if (booking?.metadata.fulfillment_timing?.frozen) return this.getSelection();
+    // An actual payment callback must never revalidate or move the time after funds have been taken.
+    const paymentStatus = order.getTempOrder()?.payment_status;
+    if (paymentStatus === 'paid' || paymentStatus === 'partially_paid') {
+      if (booking?.metadata.fulfillment_timing) {
+        const detail = booking.metadata.fulfillment_timing;
+        order.setPickupTimingBooking({
+          ...detail,
+          date: booking.start_date,
+          time: booking.start_time,
+          frozen: true
+        });
+      }
+      return this.getSelection();
+    }
+    const snapshot = await this.snapshot(true, false);
+    if (order !== this.host.getOrder() || order.getTempOrder() !== tempOrder || sequence !== this.writeSequence) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    const selection = this.getSelection();
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return selection;
+    }
+    return this.setSelection(selection, {
+      frozen: options.freeze ?? false
+    });
+  }
+}
+exports.PickupTimingController = PickupTimingController;

package/lib/solution/BaseSales/utils/parseSalesResponse.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseSalesResponse = parseSalesResponse;
 var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
+var _pickupTiming = require("../../../modules/Order/pickupTiming");
 /**
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
@@ -64,6 +65,7 @@ function pickCustomer(raw) {
  */
 function isRootBooking(booking) {
   if (!booking || typeof booking !== 'object') return false;
+  if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
   const parentId = booking.parent_id;
   if (parentId === 0 || parentId === null || parentId === undefined) return true;
   return false;
@@ -71,6 +73,7 @@ function isRootBooking(booking) {
 function indexBookingsByProductUid(bookings) {
   const result = {};
   for (const b of bookings) {
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(b)) continue;
     const uid = b && (b.product_uid || b.metadata?.product_uid) || '';
     if (!uid) continue;
     const key = String(uid);

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 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/utils/cartView.js

@@ -8,12 +8,14 @@ exports.buildCustomerView = buildCustomerView;
 exports.indexBookingsByProductUid = indexBookingsByProductUid;
 exports.isWalkInCustomer = isWalkInCustomer;
 var _addTimeAvailability = require("./addTimeAvailability");
+var _pickupTiming = require("../../../modules/Order/pickupTiming");
 /**
  * 仅按 booking.product_uid 建索引，避免发明 booking 与商品行之间的其它等价关系。
  */
 function indexBookingsByProductUid(bookings) {
   if (!Array.isArray(bookings) || bookings.length === 0) return {};
   return bookings.reduce((acc, booking) => {
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return acc;
     const uid = booking?.product_uid;
     if (uid === undefined || uid === null || uid === '') return acc;
     const key = String(uid);
@@ -105,7 +107,7 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
-  const childBookings = bookingList.filter(booking => booking.parent_id !== 0);
+  const childBookings = bookingList.filter(booking => booking.parent_id !== 0 && !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
   const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);

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

@@ -59,6 +59,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected defaultName: string;
     protected defaultVersion: string;
     protected store: UnifiedBookingSalesState;
+    protected pickupTimingEnabled: boolean;
     private unifiedProductCatalog;
     private availabilityRuntimeOffsetMinutes;
     private availabilityScheduleCatalog;
@@ -148,6 +149,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    protected loadPickupTimingOpenData(force: boolean): Promise<Record<string, unknown>>;
     private resetAllergyItemRuleState;
     private fetchAllergyItemRuleConfigs;
     private ensureAllergyItemRuleConfigsLoaded;

package/lib/solution/UnifiedBookingSales/index.js

@@ -1199,6 +1199,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   defaultName = 'unifiedBookingSales';
   defaultVersion = '1.0.0';
   store = {};
+  pickupTimingEnabled = true;
   unifiedProductCatalog = [];
   availabilityRuntimeOffsetMinutes = null;
   availabilityScheduleCatalog = null;
@@ -1747,6 +1748,25 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       channel
     });
   }
+  async loadPickupTimingOpenData(force) {
+    const scope = this.getPickupTimingScope();
+    // A fresh validation must not borrow a request started for a previous store/context.
+    if (force && this.loadOpenDataInFlight) await this.loadOpenDataInFlight;
+    if (scope !== this.getPickupTimingScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+    const businessCode = String(this.otherParams?.businessCode ?? this.otherParams?.business_code ?? '').trim();
+    const channel = String(this.getSubmitOrderSalesChannel() ?? '').trim();
+    const config = await this.loadOpenData({
+      businessCode,
+      channel,
+      force
+    });
+    if (scope !== this.getPickupTimingScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+    return config;
+  }
   resetAllergyItemRuleState() {
     this.allergyItemRuleConfigs = [];
     this.allergyItemRuleConfigsPromise = null;

package/package.json

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