@pisell/private-materials 6.6.53 → 6.6.54

package/es/components/booking/components/footer/amount.js

@@ -519,7 +519,8 @@ var processItemsTax = function processItemsTax(items, state, options) {
   }
   return {
     originTax: expectedOriginTax,
-    tax: expectedTax
+    tax: expectedTax,
+    taxDecimal: preciseTax
   };
 };
 
@@ -651,7 +652,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
 
     // 处理附加商品
@@ -662,7 +663,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {

package/es/components/booking/components/footer/utils.js

@@ -108,6 +108,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var _d$metadata;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -135,7 +136,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: d._id,
+        custom_product_bundle_map_id: (d === null || d === void 0 || (_d$metadata = d.metadata) === null || _d$metadata === void 0 ? void 0 : _d$metadata.custom_product_bundle_map_id) || d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -477,7 +478,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item, quantity) {
+var formatProducts = function formatProducts(item, quantity, options) {
   var _item$_extend36, _getMainProductSellin, _item$_extend37, _item$_extend38, _item$_extend39, _item$_extend40;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
@@ -492,6 +493,9 @@ var formatProducts = function formatProducts(item, quantity) {
     d.metadata = _objectSpread(_objectSpread({}, d.metadata), {}, {
       unique_identification_number: "".concat(item._extend.unique_identification_number, "_").concat(d.discount.resource_id)
     });
+    if (options !== null && options !== void 0 && options.isServiceEdit && options !== null && options !== void 0 && options.isMultiDay) {
+      delete d.id;
+    }
   });
 
   // 非手动折扣
@@ -714,7 +718,10 @@ var formatBookings = function formatBookings(data, values) {
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
-      product: formatProducts(item),
+      product: formatProducts(item, undefined, {
+        isServiceEdit: data.service.edit,
+        isMultiDay: isMultiDay
+      }),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -128,7 +128,7 @@ var VoucherCard = function VoucherCard(props) {
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
       var _value$_extend, _value$_extend2, _value$_extend3;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,

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

@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundles, setProductPrice, mergeBundleWithOriginalPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -687,7 +687,9 @@ var Info = function Info(_, ref) {
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
-        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), {}, {
+          bundle: mergeBundles(item._extend.other)
+        }, sessionValue), {}, {
           quantity: values.quantity || item._extend.quantity
         })
       },
@@ -1223,6 +1225,8 @@ var Info = function Info(_, ref) {
     var _cacheItem$_extend$ot, _cacheItem$_extend$ot2;
     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;
+      bundle === null || bundle === void 0 || (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 || delete _bundle$metadata.custom_product_bundle_map_id;
       bundle === null || bundle === void 0 || delete bundle.discount_list;
       bundle === null || bundle === void 0 || delete bundle.booking_id;
       bundle === null || bundle === void 0 || delete bundle.bundle_selling_price;

package/es/components/booking/info2/service/editService/utils.d.ts

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -149,6 +149,22 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
 };
+export var mergeBundles = function mergeBundles(other) {
+  var bundle = (other === null || other === void 0 ? void 0 : other.bundle) || [];
+  var newBundle = [];
+  bundle.forEach(function (item) {
+    var newItem = newBundle.find(function (newItem) {
+      return newItem.id === item.id;
+    });
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push(_objectSpread({}, item));
+    }
+  });
+  return newBundle;
+};
 
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值

package/es/components/booking/payments/index.js

@@ -189,7 +189,7 @@ var Payments = Provider(function (props) {
         className: "payment-list-item-surcharge"
       }, "(", locales.getText("pisell2.text.surcharge"), " ", formatAmount(item.service_fee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), ")") : null, /*#__PURE__*/React.createElement("div", {
         className: "payment-list-item-date"
-      }, dayjs(item.payment_time).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
+      }, dayjs(item.payment_time || item.created_at).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
         className: "payment-list-item-platform-type"
       }, item.platform && locales.getText("pisell2.text.platform.type")(item.platform))))))));
     }

package/lib/components/booking/components/footer/amount.js

@@ -323,7 +323,7 @@ var processItemsTax = (items, state, options) => {
       }
     }
   }
-  return { originTax: expectedOriginTax, tax: expectedTax };
+  return { originTax: expectedOriginTax, tax: expectedTax, taxDecimal: preciseTax };
 };
 var clearTaxFee = (state) => {
   var _a, _b;
@@ -376,7 +376,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
       const addonsResult = processItemsTax(state.addons.value, state, {
@@ -385,7 +385,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {

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

@@ -111,13 +111,14 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
+    var _a;
     const option = formatProductOption(d.option);
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
-      var _a;
-      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
     }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
@@ -138,7 +139,7 @@ var formatProductBundle = (bundle) => {
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: d._id,
+        custom_product_bundle_map_id: ((_a = d == null ? void 0 : d.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) || d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -370,7 +371,7 @@ var getMainProductSellingPrice = (item) => {
   }
   return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
-var formatProducts = (item, quantity) => {
+var formatProducts = (item, quantity, options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
@@ -384,6 +385,9 @@ var formatProducts = (item, quantity) => {
       ...d.metadata,
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
+    if ((options == null ? void 0 : options.isServiceEdit) && (options == null ? void 0 : options.isMultiDay)) {
+      delete d.id;
+    }
   });
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
@@ -524,7 +528,10 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
-      product: formatProducts(item),
+      product: formatProducts(item, void 0, {
+        isServiceEdit: data.service.edit,
+        isMultiDay
+      }),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -111,7 +111,7 @@ var VoucherCard = (props) => {
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
       var _a3, _b2, _c2;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,

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

@@ -528,6 +528,7 @@ var Info = (_, ref) => {
         customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
           ...item._extend.other,
+          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
@@ -1023,6 +1024,8 @@ var Info = (_, ref) => {
     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;
+      (_a3 = bundle == null ? void 0 : bundle.metadata) == null ? true : delete _a3.custom_product_bundle_map_id;
       bundle == null ? true : delete bundle.discount_list;
       bundle == null ? true : delete bundle.booking_id;
       bundle == null ? true : delete bundle.bundle_selling_price;

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -32,6 +32,7 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
+  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -96,6 +97,20 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
+var mergeBundles = (other) => {
+  const bundle = (other == null ? void 0 : other.bundle) || [];
+  const newBundle = [];
+  bundle.forEach((item) => {
+    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push({ ...item });
+    }
+  });
+  return newBundle;
+};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -115,6 +130,7 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
+  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

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

@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time || item.created_at).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.53",
+  "version": "6.6.54",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.6.14",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "6.6.15"
   },
   "peerDependencies": {
     "react": "^18.0.0",