@pisell/private-materials 6.6.32 → 6.6.34

package/es/components/booking/locales.d.ts

@@ -314,6 +314,18 @@ declare const _default: {
         'pisell2.booking.text.search-placeholder': string;
         'pisell-select-holder-please-select': string;
         'pisell-select-holder-selected': string;
+        'pisell2.discount-change.title': string;
+        'pisell2.discount-change.desc': string;
+        'pisell2.discount-change.reason': string;
+        'pisell2.discount-change.options-title': string;
+        'pisell2.discount-change.keep-original': string;
+        'pisell2.discount-change.keep-original-desc': string;
+        'pisell2.discount-change.continue': string;
+        'pisell2.discount-change.continue-desc': string;
+        'pisell2.discount-change.remove': string;
+        'pisell2.discount-change.remove-desc': string;
+        'pisell2.discount-change.cancel': string;
+        'pisell2.text.edit-service-success': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -630,6 +642,18 @@ declare const _default: {
         'pisell2.booking.text.search-placeholder': string;
         'pisell-select-holder-please-select': string;
         'pisell-select-holder-selected': string;
+        'pisell2.discount-change.title': string;
+        'pisell2.discount-change.desc': string;
+        'pisell2.discount-change.reason': string;
+        'pisell2.discount-change.options-title': string;
+        'pisell2.discount-change.keep-original': string;
+        'pisell2.discount-change.keep-original-desc': string;
+        'pisell2.discount-change.continue': string;
+        'pisell2.discount-change.continue-desc': string;
+        'pisell2.discount-change.remove': string;
+        'pisell2.discount-change.remove-desc': string;
+        'pisell2.discount-change.cancel': string;
+        'pisell2.text.edit-service-success': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -946,6 +970,18 @@ declare const _default: {
         'pisell2.booking.text.search-placeholder': string;
         'pisell-select-holder-please-select': string;
         'pisell-select-holder-selected': string;
+        'pisell2.discount-change.title': string;
+        'pisell2.discount-change.desc': string;
+        'pisell2.discount-change.reason': string;
+        'pisell2.discount-change.options-title': string;
+        'pisell2.discount-change.keep-original': string;
+        'pisell2.discount-change.keep-original-desc': string;
+        'pisell2.discount-change.continue': string;
+        'pisell2.discount-change.continue-desc': string;
+        'pisell2.discount-change.remove': string;
+        'pisell2.discount-change.remove-desc': string;
+        'pisell2.discount-change.cancel': string;
+        'pisell2.text.edit-service-success': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -369,7 +369,20 @@ export default {
     'pisell2.booking.text.contact-info.title': 'Contact info',
     'pisell2.booking.text.search-placeholder': 'Customers / Contacts / Holder',
     'pisell-select-holder-please-select': 'Please Select',
-    'pisell-select-holder-selected': 'Selected: '
+    'pisell-select-holder-selected': 'Selected: ',
+    // 折扣变更弹窗
+    'pisell2.discount-change.title': 'Discount No Longer Available — Choose How to Handle',
+    'pisell2.discount-change.desc': 'The discount previously applied to this order is no longer valid because:',
+    'pisell2.discount-change.reason': 'The discount has expired, been deactivated, or no longer meets its conditions',
+    'pisell2.discount-change.options-title': 'Please choose how you would like to continue:',
+    'pisell2.discount-change.keep-original': 'Keep Original Discount',
+    'pisell2.discount-change.keep-original-desc': 'Keep the existing discount amount. New or modified items will be charged at full price.',
+    'pisell2.discount-change.continue': 'Continue Discount',
+    'pisell2.discount-change.continue-desc': 'Continue using the original discount rate (e.g. 20% off) for this order, even if the campaign has ended.',
+    'pisell2.discount-change.remove': 'Remove Discount',
+    'pisell2.discount-change.remove-desc': 'Remove all discounts. All items will be charged at full price.',
+    'pisell2.discount-change.cancel': 'Cancel',
+    'pisell2.text.edit-service-success': 'Price updated. Discount recalculated automatically.'
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -745,7 +758,20 @@ export default {
     'pisell2.booking.text.contact-info.title': '联系信息',
     'pisell2.booking.text.search-placeholder': '搜索客户/联系信息/持有人',
     'pisell-select-holder-please-select': '请选择',
-    'pisell-select-holder-selected': '已选择：'
+    'pisell-select-holder-selected': '已选择：',
+    // 折扣变更弹窗
+    'pisell2.discount-change.title': '商品折扣无法继续使用，请选择处理方式',
+    'pisell2.discount-change.desc': '当前订单中使用的商品折扣已失效，可能是因为：',
+    'pisell2.discount-change.reason': '折扣已过期、被停用，或条件不再符合',
+    'pisell2.discount-change.options-title': '您可以选择以下方式继续：',
+    'pisell2.discount-change.keep-original': '保留原折扣',
+    'pisell2.discount-change.keep-original-desc': '旧部分保持优惠，新商品按原价。',
+    'pisell2.discount-change.continue': '延续折扣',
+    'pisell2.discount-change.continue-desc': '可用商品继续按原折扣比例计算（如8折）。',
+    'pisell2.discount-change.remove': '移除折扣',
+    'pisell2.discount-change.remove-desc': '删除折扣，按原价结算。',
+    'pisell2.discount-change.cancel': '取消',
+    'pisell2.text.edit-service-success': '价格已调整，折扣已自动重算'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -1121,6 +1147,19 @@ export default {
     'pisell2.booking.text.contact-info.title': '聯繫信息',
     'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息/持有人',
     'pisell-select-holder-please-select': '請選擇',
-    'pisell-select-holder-selected': '已選擇：'
+    'pisell-select-holder-selected': '已選擇：',
+    // 折扣變更彈窗
+    'pisell2.discount-change.title': '商品折扣無法繼續使用，請選擇處理方式',
+    'pisell2.discount-change.desc': '當前訂單中使用的商品折扣已失效，可能是因為：',
+    'pisell2.discount-change.reason': '折扣已過期、被停用，或條件不再符合',
+    'pisell2.discount-change.options-title': '您可以選擇以下方式繼續：',
+    'pisell2.discount-change.keep-original': '保留原折扣',
+    'pisell2.discount-change.keep-original-desc': '舊部分保持優惠，新商品按原價。',
+    'pisell2.discount-change.continue': '延續折扣',
+    'pisell2.discount-change.continue-desc': '可用商品繼續按原折扣比例計算（如8折）。',
+    'pisell2.discount-change.remove': '移除折扣',
+    'pisell2.discount-change.remove-desc': '刪除折扣，按原價結算。',
+    'pisell2.discount-change.cancel': '取消',
+    'pisell2.text.edit-service-success': '价格已调整，折扣已自动重算'
   }
 };

package/es/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/es/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/components/voucher/index.js

@@ -160,7 +160,7 @@ var VoucherCard = (props) => {
     return val;
   }, [state.addons.value]);
   const holdersMemo = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2;
     if (isBooking4Shop) {
       let list = [];
       if ((_a2 = state.pet) == null ? void 0 : _a2.value) {
@@ -169,7 +169,7 @@ var VoucherCard = (props) => {
           list = entries[0][1];
         }
       }
-      shopDiscount.setHolders(list);
+      (_b2 = shopDiscount == null ? void 0 : shopDiscount.setHolders) == null ? void 0 : _b2.call(shopDiscount, list);
       holderChangedRef.current = true;
       return list || [];
     }
@@ -186,7 +186,7 @@ var VoucherCard = (props) => {
     var _a2;
     if (["paid", "partially_paid"].includes(
       (_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status
-    ) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
+    ) && (0, import_utils2.hasEveryBookingId)([...state.addons.value || [], ...state.service.value || []])) {
       return true;
     }
     return false;

package/lib/components/booking/components/voucher/utils.d.ts

@@ -2,3 +2,4 @@ export declare const getServiceAddons: (list: any[]) => {
     serviceList: any[];
     addonsList: any[];
 };
+export declare const hasEveryBookingId: (list: any[]) => boolean;

package/lib/components/booking/components/voucher/utils.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/components/voucher/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  getServiceAddons: () => getServiceAddons
+  getServiceAddons: () => getServiceAddons,
+  hasEveryBookingId: () => hasEveryBookingId
 });
 module.exports = __toCommonJS(utils_exports);
 var getServiceAddons = (list) => {
@@ -37,7 +38,14 @@ var getServiceAddons = (list) => {
     addonsList
   };
 };
+var hasEveryBookingId = (list) => {
+  return list.every((item) => {
+    var _a, _b, _c, _d;
+    return item.booking_id && ((_d = (_c = (_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) == null ? void 0 : _c.every) == null ? void 0 : _d.call(_c, (bundle) => bundle.booking_id));
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getServiceAddons
+  getServiceAddons,
+  hasEveryBookingId
 });

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/service2/Group/utils.js

@@ -68,7 +68,7 @@ var concatBookings = (items) => {
   };
 };
 var createBookingItemsByGroup = (item, isBatchEdit) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   const groupId = item._extend.groupId || (0, import_utils.getUniqueId)("bookingGroup_");
   let bookings = [];
   for (let i = 0; i < item._extend.duration; i++) {
@@ -96,8 +96,9 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
       }
     };
     const totalPrice = (0, import_utils2.getProductTotalPrice)(cacheItem);
+    const origin_total = (_f = (_e = (_d = (_c = item._extend) == null ? void 0 : _c.items) == null ? void 0 : _d[0]) == null ? void 0 : _e._extend) == null ? void 0 : _f.origin_total;
     cacheItem._extend.total = totalPrice;
-    cacheItem._extend.origin_total = totalPrice;
+    cacheItem._extend.origin_total = origin_total ?? totalPrice;
     cacheItem._extend.items = void 0;
     cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
     bookings.push(cacheItem);

package/lib/components/booking/info2/service/editService/DiscountChangeModal/index.d.ts

@@ -0,0 +1,25 @@
+import React from 'react';
+import './index.less';
+/**
+ * 折扣变更弹窗 Props
+ */
+export interface DiscountChangeModalProps {
+    /** 弹窗是否可见 */
+    open: boolean;
+    /** 保留原折扣回调 */
+    onKeepOriginal?: () => void;
+    /** 延续折扣回调 */
+    onContinue?: () => void;
+    /** 移除折扣回调 */
+    onRemove?: () => void;
+    /** 取消回调 */
+    onCancel?: () => void;
+}
+/**
+ * 折扣变更弹窗组件
+ *
+ * @description 当订单中使用的商品折扣已失效时，弹出此弹窗让用户选择处理方式
+ * @author Pisell Team
+ */
+declare const DiscountChangeModal: React.FC<DiscountChangeModalProps>;
+export default DiscountChangeModal;

package/lib/components/booking/info2/service/editService/DiscountChangeModal/index.js

@@ -0,0 +1,64 @@
+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/components/booking/info2/service/editService/DiscountChangeModal/index.tsx
+var DiscountChangeModal_exports = {};
+__export(DiscountChangeModal_exports, {
+  default: () => DiscountChangeModal_default
+});
+module.exports = __toCommonJS(DiscountChangeModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_index = require("./index.less");
+var DiscountChangeModal = ({
+  open,
+  onKeepOriginal,
+  onContinue,
+  onRemove,
+  onCancel
+}) => {
+  const renderFooter = () => {
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "discount-change-modal__footer" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: 12, wrap: true }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", onClick: onContinue }, import_utils.locales.getText("pisell2.discount-change.continue")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: onRemove }, import_utils.locales.getText("pisell2.discount-change.remove")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: onCancel }, import_utils.locales.getText("pisell2.discount-change.cancel"))));
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellModal,
+    {
+      open,
+      title: import_utils.locales.getText("pisell2.discount-change.title"),
+      onCancel,
+      footer: renderFooter(),
+      maskClosable: false,
+      width: 560,
+      destroyOnClose: true
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "discount-change-modal__content" }, /* @__PURE__ */ import_react.default.createElement("p", { className: "discount-change-modal__desc" }, import_utils.locales.getText("pisell2.discount-change.desc")), /* @__PURE__ */ import_react.default.createElement("ul", { className: "discount-change-modal__reasons" }, /* @__PURE__ */ import_react.default.createElement("li", null, import_utils.locales.getText("pisell2.discount-change.reason"))), /* @__PURE__ */ import_react.default.createElement("p", { className: "discount-change-modal__desc" }, import_utils.locales.getText("pisell2.discount-change.options-title")), /* @__PURE__ */ import_react.default.createElement("ul", { className: "discount-change-modal__options" }, /* @__PURE__ */ import_react.default.createElement("li", null, /* @__PURE__ */ import_react.default.createElement("strong", null, import_utils.locales.getText("pisell2.discount-change.continue")), "：", import_utils.locales.getText("pisell2.discount-change.continue-desc")), /* @__PURE__ */ import_react.default.createElement("li", null, /* @__PURE__ */ import_react.default.createElement("strong", null, import_utils.locales.getText("pisell2.discount-change.remove")), "：", import_utils.locales.getText("pisell2.discount-change.remove-desc"))))
+  );
+};
+var DiscountChangeModal_default = DiscountChangeModal;

package/lib/components/booking/info2/service/editService/DiscountChangeModal/index.less

@@ -0,0 +1,41 @@
+.discount-change-modal {
+  &__content {
+    padding: 8px 0;
+  }
+
+  &__desc {
+    margin-bottom: 8px;
+    color: var(--Gray-900, #101828);
+    font-size: 14px;
+    line-height: 1.6;
+  }
+
+  &__reasons,
+  &__options {
+    margin: 0 0 16px 0;
+    padding-left: 20px;
+    color: var(--Gray-600, #475467);
+    font-size: 14px;
+    line-height: 1.8;
+
+    li {
+      margin-bottom: 4px;
+    }
+
+    strong {
+      color: var(--Gray-900, #101828);
+      font-weight: 600;
+    }
+  }
+
+  &__options {
+    margin-bottom: 0;
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+}
+