@pisell/private-materials 6.6.78 → 6.6.80

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

package/es/components/booking/info2/service/editService/index.js

@@ -90,6 +90,7 @@ var Info = function Info(_, ref) {
     dispatch = _useContext.dispatch;
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
+  var shouldReallocateBundlePriceRef = useRef(false);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     noteModalOpen = _useState4[0],
@@ -361,7 +362,8 @@ var Info = function Info(_, ref) {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    if (isChangeTotal.current) {
+    var shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
+    if (shouldReallocatePrice) {
       var _extend$other, _extend$other2;
       // 计算折扣比例
       var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
@@ -437,8 +439,8 @@ var Info = function Info(_, ref) {
 
     if (groupId) {
       // 手动改价时移除优惠券使用
-      if (isChangeTotal.current) {
-        _item = deleteDiscountList(_item);
+      if (shouldReallocatePrice) {
+        _item = deleteDiscountList(_item, true);
       }
       _list = _list.filter(function (d) {
         var _d$_extend;
@@ -459,8 +461,8 @@ var Info = function Info(_, ref) {
         return isSameBookingServiceItem(d, _item);
       });
       if (matchById || matchByBooking) {
-        if (isChangeTotal.current) {
-          _item = deleteDiscountList(_item);
+        if (shouldReallocatePrice) {
+          _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
           _list = _list.map(function (d) {
@@ -540,6 +542,7 @@ var Info = function Info(_, ref) {
     console.log('setEditDatasetEditData', _cacheItem, open);
     setCurrentTab('batch_edit');
     isChangeTotal.current = false;
+    shouldReallocateBundlePriceRef.current = false;
     // 重置编辑标记
     isEditedRef.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
@@ -731,6 +734,7 @@ var Info = function Info(_, ref) {
         var _cacheItem$metadata, _cacheItem$_extend, _cacheItem$_extend2;
         // 标记已执行过编辑操作
         isEditedRef.current = true;
+        shouldReallocateBundlePriceRef.current = false;
         var _detail = detail || item;
         var other = JSON.parse(JSON.stringify(e));
 
@@ -791,10 +795,12 @@ var Info = function Info(_, ref) {
             return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';
           });
           if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
-            // 手动折扣编辑套餐时只延续旧折后比例，不改子商品单价，避免后续重复折扣。
+            // 手动折扣编辑套餐时延续旧折后比例，保存时再按新原价分摊，避免重复折扣。
             var sellingRatio = new Decimal(previousTotal).div(previousOriginTotal);
             _total = new Decimal(origin_total).mul(sellingRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
             cacheItem._extend.total = _total;
+            // 套餐变化后，即使折后总价未触发 onChange，也需要重新分摊子商品售价。
+            shouldReallocateBundlePriceRef.current = true;
           }
         }
 
@@ -1270,11 +1276,16 @@ var Info = function Info(_, ref) {
   };
   var deleteDiscountList = function deleteDiscountList(cacheItem) {
     var _cacheItem$_extend$ot, _cacheItem$_extend$ot2;
+    var preserveBundleSellingPrice = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     delete cacheItem.discount_list;
     (_cacheItem$_extend$ot = cacheItem._extend.other) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot = _cacheItem$_extend$ot.bundle) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot2 = _cacheItem$_extend$ot.forEach) === null || _cacheItem$_extend$ot2 === void 0 || _cacheItem$_extend$ot2.call(_cacheItem$_extend$ot, function (bundle) {
       var _bundle$metadata;
+      var bundleSellingPrice = Number(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price);
+      var hasBundleSellingPrice = preserveBundleSellingPrice && (bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) != null && Number.isFinite(bundleSellingPrice);
       var restoredPrice = getBundleOriginalSellingPrice(bundle);
-      if (restoredPrice !== undefined) {
+      if (hasBundleSellingPrice) {
+        bundle.price = bundleSellingPrice;
+      } else if (restoredPrice !== undefined) {
         bundle.price = restoredPrice;
         bundle.original_price = restoredPrice;
         bundle.original_total = restoredPrice;

package/es/components/eftposPay/adyenPos/receipt.js

@@ -109,6 +109,18 @@ var renderKeyValue = function renderKeyValue(name, value, width) {
   if (nameWidth + valueWidth + 1 <= width) {
     return ["".concat(name).concat(' '.repeat(width - nameWidth - valueWidth)).concat(value)];
   }
+
+  // Keep the label visible on the first line for long values (for example,
+  // Adyen's Reference UUID), then align continuation lines with the value.
+  var gapWidth = 3;
+  var valueLineWidth = width - nameWidth - gapWidth;
+  if (valueLineWidth > 0) {
+    var prefix = "".concat(name).concat(' '.repeat(gapWidth));
+    var continuationPrefix = ' '.repeat(nameWidth + gapWidth);
+    return wrapText(value, valueLineWidth).map(function (line, index) {
+      return index === 0 ? "".concat(prefix).concat(line) : "".concat(continuationPrefix).concat(line);
+    });
+  }
   return [].concat(_toConsumableArray(wrapText(name, width)), _toConsumableArray(rightAlignText(value, width)));
 };
 var renderReceiptLine = function renderReceiptLine(receiptLine, width) {

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" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,7 +301,7 @@ 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" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/plus/pisellAdyenDashboard/locales.js

@@ -10,7 +10,7 @@ export default {
   'zh-CN': {
     'pisell-adyen-dashboard.menu.transactions': '交易',
     'pisell-adyen-dashboard.menu.reports': '报表',
-    'pisell-adyen-dashboard.menu.payouts': '付款',
+    'pisell-adyen-dashboard.menu.payouts': '打款',
     'pisell-adyen-dashboard.menu.disputes': '争议',
     'pisell-adyen-dashboard.menu.paymentLinks': '支付链接',
     'pisell-adyen-dashboard.loading': '正在加载 Adyen 看板...'
@@ -18,7 +18,7 @@ export default {
   'zh-HK': {
     'pisell-adyen-dashboard.menu.transactions': '交易',
     'pisell-adyen-dashboard.menu.reports': '報表',
-    'pisell-adyen-dashboard.menu.payouts': '付款',
+    'pisell-adyen-dashboard.menu.payouts': '打款',
     'pisell-adyen-dashboard.menu.disputes': '爭議',
     'pisell-adyen-dashboard.menu.paymentLinks': '付款連結',
     'pisell-adyen-dashboard.loading': '正在載入 Adyen 看板...'
@@ -26,7 +26,7 @@ export default {
   'zh-TW': {
     'pisell-adyen-dashboard.menu.transactions': '交易',
     'pisell-adyen-dashboard.menu.reports': '報表',
-    'pisell-adyen-dashboard.menu.payouts': '付款',
+    'pisell-adyen-dashboard.menu.payouts': '打款',
     'pisell-adyen-dashboard.menu.disputes': '爭議',
     'pisell-adyen-dashboard.menu.paymentLinks': '付款連結',
     'pisell-adyen-dashboard.loading': '正在載入 Adyen 看板...'

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -91,6 +91,7 @@ var Info = (_, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
+  const shouldReallocateBundlePriceRef = (0, import_react.useRef)(false);
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
@@ -280,7 +281,8 @@ var Info = (_, ref) => {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    if (isChangeTotal.current) {
+    const shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
+    if (shouldReallocatePrice) {
       const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
       const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
       let childProductsTotal = new import_decimal.default(0);
@@ -326,8 +328,8 @@ var Info = (_, ref) => {
     let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
     const origin_total = (_n2 = (_m2 = (_l2 = (_k2 = _item._extend) == null ? void 0 : _k2.items) == null ? void 0 : _l2[0]) == null ? void 0 : _m2._extend) == null ? void 0 : _n2.origin_total;
     if (groupId) {
-      if (isChangeTotal.current) {
-        _item = deleteDiscountList(_item);
+      if (shouldReallocatePrice) {
+        _item = deleteDiscountList(_item, true);
       }
       _list = _list.filter((d) => {
         var _a3;
@@ -342,8 +344,8 @@ var Info = (_, ref) => {
       const matchById = _list.some((d) => d._id === _id);
       const matchByBooking = !matchById && _list.some((d) => isSameBookingServiceItem(d, _item));
       if (matchById || matchByBooking) {
-        if (isChangeTotal.current) {
-          _item = deleteDiscountList(_item);
+        if (shouldReallocatePrice) {
+          _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
           _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
@@ -415,6 +417,7 @@ var Info = (_, ref) => {
       console.log("setEditDatasetEditData", _cacheItem, open2);
       setCurrentTab("batch_edit");
       isChangeTotal.current = false;
+      shouldReallocateBundlePriceRef.current = false;
       isEditedRef.current = false;
       let cacheItem = _cacheItem || state.service.cacheItem;
       let values = cacheItem._extend;
@@ -561,6 +564,7 @@ var Info = (_, ref) => {
       callback: (e2, extension_type, detail) => {
         var _a3, _b3, _c3, _d3, _e3, _f2, _g2;
         isEditedRef.current = true;
+        shouldReallocateBundlePriceRef.current = false;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
         if (item.discount_amount) {
@@ -617,6 +621,7 @@ var Info = (_, ref) => {
             const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
             _total = new import_decimal.default(origin_total).mul(sellingRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
             cacheItem._extend.total = _total;
+            shouldReallocateBundlePriceRef.current = true;
           }
         }
         cacheItem._extend.origin_total = origin_total;
@@ -1056,13 +1061,17 @@ var Info = (_, ref) => {
       }
     }
   };
-  const deleteDiscountList = (cacheItem) => {
+  const deleteDiscountList = (cacheItem, preserveBundleSellingPrice = false) => {
     var _a2, _b2, _c2;
     delete cacheItem.discount_list;
     (_c2 = (_b2 = (_a2 = cacheItem._extend.other) == null ? void 0 : _a2.bundle) == null ? void 0 : _b2.forEach) == null ? void 0 : _c2.call(_b2, (bundle) => {
       var _a3;
+      const bundleSellingPrice = Number(bundle == null ? void 0 : bundle.bundle_selling_price);
+      const hasBundleSellingPrice = preserveBundleSellingPrice && (bundle == null ? void 0 : bundle.bundle_selling_price) != null && Number.isFinite(bundleSellingPrice);
       const restoredPrice = getBundleOriginalSellingPrice(bundle);
-      if (restoredPrice !== void 0) {
+      if (hasBundleSellingPrice) {
+        bundle.price = bundleSellingPrice;
+      } else if (restoredPrice !== void 0) {
         bundle.price = restoredPrice;
         bundle.original_price = restoredPrice;
         bundle.original_total = restoredPrice;

package/lib/components/eftposPay/adyenPos/receipt.js

@@ -127,6 +127,15 @@ var renderKeyValue = (name, value, width) => {
   if (nameWidth + valueWidth + 1 <= width) {
     return [`${name}${" ".repeat(width - nameWidth - valueWidth)}${value}`];
   }
+  const gapWidth = 3;
+  const valueLineWidth = width - nameWidth - gapWidth;
+  if (valueLineWidth > 0) {
+    const prefix = `${name}${" ".repeat(gapWidth)}`;
+    const continuationPrefix = " ".repeat(nameWidth + gapWidth);
+    return wrapText(value, valueLineWidth).map(
+      (line, index) => index === 0 ? `${prefix}${line}` : `${continuationPrefix}${line}`
+    );
+  }
   return [...wrapText(name, width), ...rightAlignText(value, width)];
 };
 var renderReceiptLine = (receiptLine, width) => {

package/lib/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" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,7 +301,7 @@ 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" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/lib/plus/pisellAdyenDashboard/locales.js

@@ -34,7 +34,7 @@ var locales_default = {
   "zh-CN": {
     "pisell-adyen-dashboard.menu.transactions": "交易",
     "pisell-adyen-dashboard.menu.reports": "报表",
-    "pisell-adyen-dashboard.menu.payouts": "付款",
+    "pisell-adyen-dashboard.menu.payouts": "打款",
     "pisell-adyen-dashboard.menu.disputes": "争议",
     "pisell-adyen-dashboard.menu.paymentLinks": "支付链接",
     "pisell-adyen-dashboard.loading": "正在加载 Adyen 看板..."
@@ -42,7 +42,7 @@ var locales_default = {
   "zh-HK": {
     "pisell-adyen-dashboard.menu.transactions": "交易",
     "pisell-adyen-dashboard.menu.reports": "報表",
-    "pisell-adyen-dashboard.menu.payouts": "付款",
+    "pisell-adyen-dashboard.menu.payouts": "打款",
     "pisell-adyen-dashboard.menu.disputes": "爭議",
     "pisell-adyen-dashboard.menu.paymentLinks": "付款連結",
     "pisell-adyen-dashboard.loading": "正在載入 Adyen 看板..."
@@ -50,7 +50,7 @@ var locales_default = {
   "zh-TW": {
     "pisell-adyen-dashboard.menu.transactions": "交易",
     "pisell-adyen-dashboard.menu.reports": "報表",
-    "pisell-adyen-dashboard.menu.payouts": "付款",
+    "pisell-adyen-dashboard.menu.payouts": "打款",
     "pisell-adyen-dashboard.menu.disputes": "爭議",
     "pisell-adyen-dashboard.menu.paymentLinks": "付款連結",
     "pisell-adyen-dashboard.loading": "正在載入 Adyen 看板..."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.78",
+  "version": "6.6.80",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -65,8 +65,8 @@
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.18",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",