@pisell/pisellos 2.2.163 → 2.2.165

package/lib/modules/BookingContext/utils/timeSlices.d.ts

@@ -0,0 +1,42 @@
+import dayjs from 'dayjs';
+import { getDurationValue } from './flexible';
+export interface TimeSlice {
+    label: string;
+    value: string;
+}
+export interface DurationSlice {
+    label: string;
+    value: number;
+}
+export interface TimeSlicesResult {
+    timeSlices: TimeSlice[];
+    durationSlicesBasedOnTime: DurationSlice[];
+}
+/**
+ * 把一天切成等长时间槽，输出 timeSlices（开始时间标签）与 durationSlicesBasedOnTime（基于切片的时长选项）。
+ *
+ * 与 info2 `sliceDayIntoFiveMinutes` 行为等价；为了不依赖 `locales`，label 输出原始时间字符串（'08:00 AM' / '90'），
+ * UI 侧需要本地化展示时可基于 value 自行包装。
+ *
+ * @param config booking config `basic.service_time`，{ value: minutes }
+ * @param isDay 是否跨日预约（true 时按 1~30 天切片）
+ */
+export declare function sliceDayIntoFiveMinutes(config: {
+    value?: number;
+} | undefined | null, isDay?: boolean): TimeSlicesResult;
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
+export declare function findNextDuration(current: {
+    value?: number;
+} | undefined, array: DurationSlice[], defaultValue?: number): number | undefined;
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
+export declare function findNextSlice(params: {
+    timeSlices: TimeSlice[];
+    index?: number;
+    date?: string;
+}): string | undefined;
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
+export declare function getEndDate(startDate: dayjs.Dayjs, duration: string | number, endDate: any, shopOpeningHours?: string): dayjs.Dayjs;
+export { getDurationValue };

package/lib/modules/BookingContext/utils/timeSlices.js

@@ -0,0 +1,124 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/BookingContext/utils/timeSlices.ts
+var timeSlices_exports = {};
+__export(timeSlices_exports, {
+  findNextDuration: () => findNextDuration,
+  findNextSlice: () => findNextSlice,
+  getDurationValue: () => import_flexible.getDurationValue,
+  getEndDate: () => getEndDate,
+  sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
+});
+module.exports = __toCommonJS(timeSlices_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_flexible = require("./flexible");
+function sliceDayIntoFiveMinutes(config, isDay) {
+  const startTime = (0, import_dayjs.default)().startOf("day");
+  const endTime = (0, import_dayjs.default)().endOf("day");
+  const timeSlice = config && config.value || 5;
+  const timeSlices = [];
+  const durationSlicesBasedOnTime = [];
+  let currentTime = startTime;
+  if (isDay) {
+    let currentDay = 1;
+    while (currentDay <= 30) {
+      timeSlices.push({
+        label: currentTime.format("hh:mm A"),
+        value: currentTime.format("HH:mm")
+      });
+      durationSlicesBasedOnTime.push({
+        label: String(currentDay),
+        value: currentDay
+      });
+      currentDay += 1;
+    }
+    return { timeSlices, durationSlicesBasedOnTime };
+  }
+  while (currentTime.isBefore(endTime)) {
+    timeSlices.push({
+      label: currentTime.format("hh:mm A"),
+      value: currentTime.format("HH:mm")
+    });
+    const nextTime = currentTime.add(timeSlice, "minute");
+    const durationValue = nextTime.diff(startTime, "minute");
+    durationSlicesBasedOnTime.push({
+      label: String(durationValue),
+      value: durationValue
+    });
+    currentTime = nextTime;
+  }
+  return { timeSlices, durationSlicesBasedOnTime };
+}
+function findNextDuration(current, array, defaultValue) {
+  if (defaultValue !== void 0 && defaultValue !== null)
+    return defaultValue;
+  if (!array || array.length === 0)
+    return void 0;
+  for (let i = 0; i < array.length; i += 1) {
+    if (array[i].value === (current == null ? void 0 : current.value))
+      return array[i].value;
+  }
+  return array[0].value;
+}
+function findNextSlice(params) {
+  var _a;
+  const { timeSlices, index = 0, date = "" } = params;
+  const currentTimeValue = date || (0, import_dayjs.default)().format("HH:mm");
+  for (let i = 0; i < timeSlices.length; i += 1) {
+    if (timeSlices[i].value !== "now" && timeSlices[i].value >= currentTimeValue) {
+      return timeSlices[i].value;
+    }
+  }
+  return (_a = timeSlices[index]) == null ? void 0 : _a.value;
+}
+function getEndDate(startDate, duration, endDate, shopOpeningHours) {
+  if (duration === "flexible") {
+    let openingDate = (0, import_dayjs.default)(
+      `${startDate.format("YYYY-MM-DD")} ${shopOpeningHours || "23:59"}`
+    );
+    if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
+      openingDate = openingDate.add(1, "day");
+    }
+    if (!endDate)
+      return openingDate;
+    const endDateObj = (0, import_dayjs.default)(endDate);
+    if (endDateObj.isAfter(openingDate))
+      return openingDate;
+    return endDateObj;
+  }
+  return startDate.add(Number(duration), "minute");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findNextDuration,
+  findNextSlice,
+  getDurationValue,
+  getEndDate,
+  sliceDayIntoFiveMinutes
+});

package/lib/modules/Customer/index.js

@@ -169,10 +169,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.total = total;
       this.store.hasMore = page * pageSize < total;
       this.store.customerList = (0, import_lodash_es.cloneDeep)(customerList);
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -192,6 +188,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loading = false;
       this.storeChange();
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
     }
   }
   /**
@@ -372,10 +372,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
           hasMore: this.store.hasMore
         }
       );
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -396,6 +392,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loadingMore = false;
       this.storeChange();
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
     }
   }
   /**

package/lib/modules/Discount/index.js

@@ -97,8 +97,12 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
+    const rawDiscountList = [
+      ...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [],
+      ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []
+    ];
     const goodPassList = this.filterEnabledDiscountList(
-      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
+      rawDiscountList
     ) || [];
     return goodPassList;
   }

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

@@ -1,9 +1,9 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateProductInOrderParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -43,8 +43,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private createDefaultRulesHooks;
     loadDiscountConfig(params: {
         customerId: number;
-        action?: 'create';
-    }): Promise<void>;
+        action?: 'create' | 'edit';
+        orderId?: number;
+        apply?: boolean;
+    }): Promise<Discount[]>;
     getDiscountList(): Discount[];
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -70,6 +72,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getLocalOrderByOrderNumber(orderNumber: string): Promise<Record<string, any> | null>;
     getLocalOrderByExternalSaleNumber(externalSaleNumber: string): Promise<Record<string, any> | null>;
     saveDraft(): Promise<void>;
+    private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
     private calculatePaymentTotal;
@@ -79,6 +82,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;
     getTempOrder(): OrderTempOrder | null;
+    replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
     getOrderIdentity(): OrderIdentitySnapshot | null;
     getOrderSyncState(): OrderSyncState;
     getOrderAmountSnapshot(): OrderAmountSnapshot | null;
@@ -89,12 +93,18 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
+    private getBookingUniqueIdentificationNumber;
+    private findBookingIndexByUniqueIdentificationNumber;
+    private removeLinkedBookingsForProduct;
     private getSalesSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
     }): Promise<OrderSummary | null>;
     getOrderSummary(): Promise<OrderSummary>;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
+    syncTempOrderNoteToRemote(orderId: number | string, note: string): Promise<string>;
     getTempOrderNote(): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderBuzzer(buzzer: string): string;
@@ -147,8 +157,15 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;
+    updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
+    updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
+    updateOrderBooking(params: UpdateOrderBookingParams): any[];
     removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    /**
+     * 仅清空购物车行（products / bookings / discount_list），不重置整单。
+     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
+     */
+    clearOrderCartLines(): Promise<OrderTempOrder>;
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -173,7 +190,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     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;
@@ -220,8 +237,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
+    private normalizeTempOrderForRuntime;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
 }
-export type { UpdateProductInOrderParams } from './types';
+export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';