@pisell/private-materials 3.0.198 → 3.0.200

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

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

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

@@ -147,6 +147,29 @@ var formatHolders = function formatHolders(state, item, values) {
   return obj;
 };
 
+/**
+ * @title: 格式化商品单价
+ * @description: 
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-23 12:05
+ */
+var formatProductPrice = function formatProductPrice(item) {
+  var _item$_extend2, _item$_extend3;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
+  var price = Number((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.price);
+
+  // 单规格， 单价 + 单规格价格
+  if (other !== null && other !== void 0 && other.option) {
+    var _other$option;
+    price = other === null || other === void 0 ? void 0 : (_other$option = other.option) === null || _other$option === void 0 ? void 0 : _other$option.reduce(function (pre, cur) {
+      return pre + Number(cur.price) * Number(cur.num);
+    }, price);
+  }
+  return price;
+};
+
 /**
  * @title: 格式化商品数据
  * @description: 
@@ -156,7 +179,7 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item) {
-  var _item$_extend2, _item$_extend2$other;
+  var _item$_extend4, _item$_extend4$other, _item$_extend5, _item$_extend5$other, _item$_extend6, _item$_extend6$other;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -165,7 +188,7 @@ var formatProducts = function formatProducts(item) {
   var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
   return {
     "num": item._extend.quantity,
-    "price": item._extend.price,
+    "price": formatProductPrice(item),
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -175,8 +198,10 @@ var formatProducts = function formatProducts(item) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.bundle),
-    "bundle_edit": item._extend.bundle_edit
+    "product_bundle": formatProductBundle((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : (_item$_extend4$other = _item$_extend4.other) === null || _item$_extend4$other === void 0 ? void 0 : _item$_extend4$other.bundle),
+    "bundle_edit": item._extend.bundle_edit,
+    "product_option_item": formatProductOption((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : (_item$_extend5$other = _item$_extend5.other) === null || _item$_extend5$other === void 0 ? void 0 : _item$_extend5$other.option),
+    "product_variant_id": ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : (_item$_extend6$other = _item$_extend6.other) === null || _item$_extend6$other === void 0 ? void 0 : _item$_extend6$other.product_variant_id) || 0
   };
 };
 
@@ -194,8 +219,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend3;
-    var holderId = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.holder_id;
+    var _item$_extend7;
+    var holderId = (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isAppointment = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isAppointment;
@@ -221,15 +246,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend4;
-      return ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend8;
+      return ((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend5;
-      var key = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id; // 分组键
+      var _item$_extend9;
+      var key = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -286,9 +311,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
-      var startDate = ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate) || ((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date);
-      var endDate = ((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.endDate) || ((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.end_date);
+      var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend13;
+      var startDate = ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.startDate) || ((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.start_date);
+      var endDate = ((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.endDate) || ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -351,8 +376,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend10;
-    return !((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.holder_id);
+    var _item$_extend14;
+    return !((_item$_extend14 = item._extend) !== null && _item$_extend14 !== void 0 && _item$_extend14.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {

package/es/components/booking/info/service/addService/index.js

@@ -292,6 +292,11 @@ var Info = function Info(props) {
   var handleSelectProduct = useMemoizedFn(function (item, type) {
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
     var isEject = type === 'detail' || item.bundle_group_count > 0;
+
+    // 跨日预约开启单规格 组合规格 套餐
+    if (isDay) {
+      isEject = type === 'detail' || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
+    }
     var lock = false;
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -299,14 +304,15 @@ var Info = function Info(props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: isDay ? true : false,
           session: false,
-          variant: false,
+          variant: isDay ? true : false,
           package: true
         },
         is_eject: isEject ? 1 : 0
       },
       callback: function callback(e) {
+        var _cacheItem$_extend, _cacheItem$_extend$ot;
         // 防止选择商品弹窗多次触发callback
         if (lock) {
           return;
@@ -338,6 +344,13 @@ var Info = function Info(props) {
           cacheItem._extend.sub_type = 'days';
         }
         var _total = getProductTotalPrice(cacheItem);
+
+        // 如果有多规格，则更新商品的单价
+        if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend$ot = _cacheItem$_extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.product_variant_id) {
+          var _cacheItem$_extend2, _cacheItem$_extend2$o;
+          cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : (_cacheItem$_extend2$o = _cacheItem$_extend2.other) === null || _cacheItem$_extend2$o === void 0 ? void 0 : _cacheItem$_extend2$o.price);
+        }
+
         // 用于折扣 可修改
         cacheItem._extend.total = _total;
         // 用于储存原价

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

@@ -640,6 +640,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = useMemoizedFn(function (e) {
+    var _item$_extend, _item$_extend$other, _item$_extend2, _item$_extend2$other;
     // 当前商品
     var item = state.service.cacheItem;
 
@@ -653,14 +654,18 @@ var Info = function Info(_, ref) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: isDay ? true : false,
           session: false,
-          variant: false,
+          variant: isDay ? true : false,
           package: true
         },
-        value: item._extend.other
+        value: _objectSpread(_objectSpread({}, item._extend.other), {}, {
+          product_variant: ((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.product_variant_id) || 0,
+          product_option: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.option) || []
+        })
       },
       callback: function callback(e) {
+        var _cacheItem$_extend, _cacheItem$_extend$ot;
         // 重新生成商品
         var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
           product_id: item.id,
@@ -676,6 +681,12 @@ var Info = function Info(_, ref) {
         // 获取商品总价
         var _total = getProductTotalPrice(cacheItem);
 
+        // 如果有多规格，则更新商品的单价
+        if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend$ot = _cacheItem$_extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.product_variant_id) {
+          var _cacheItem$_extend2, _cacheItem$_extend2$o;
+          cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : (_cacheItem$_extend2$o = _cacheItem$_extend2.other) === null || _cacheItem$_extend2$o === void 0 ? void 0 : _cacheItem$_extend2$o.price);
+        }
+
         // 用于折扣 可修改
         cacheItem._extend.total = _total;
 

package/es/components/booking/info/service2/utils.js

@@ -163,9 +163,10 @@ export var isAppointment = function isAppointment(item, state) {
  */
 export var formatProducts = function formatProducts(lists, state) {
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
+  console.log(lists, 'wh_lists');
   try {
     return lists.map(function (item) {
-      var _item$_extend, _item$_extend3, _item$_extend3$other, _item$_extend4, _item$_extend4$other, _resourceItem, _item$_extend5;
+      var _item$_extend, _item$_extend3, _item$_extend3$other, _item$_extend4, _item$_extend4$other, _item$_extend5, _item$_extend5$other, _resourceItem, _item$_extend6;
       var _isAppointment = isAppointment(item, state);
       var clientTitle = getHolderName(state, item === null || item === void 0 ? void 0 : (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id);
       var resourceItem = {};
@@ -185,6 +186,7 @@ export var formatProducts = function formatProducts(lists, state) {
         num: item === null || item === void 0 ? void 0 : item._extend.quantity,
         bundle: item === null || item === void 0 ? void 0 : (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : (_item$_extend3$other = _item$_extend3.other) === null || _item$_extend3$other === void 0 ? void 0 : _item$_extend3$other.bundle,
         options: item === null || item === void 0 ? void 0 : (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : (_item$_extend4$other = _item$_extend4.other) === null || _item$_extend4$other === void 0 ? void 0 : _item$_extend4$other.option,
+        product_option_string: item === null || item === void 0 ? void 0 : (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : (_item$_extend5$other = _item$_extend5.other) === null || _item$_extend5$other === void 0 ? void 0 : _item$_extend5$other.product_option_string,
         _showAction: false,
         _actionText: locales.getText("page.booking.text.add-time"),
         _errorMessage: errorMessage,
@@ -192,7 +194,7 @@ export var formatProducts = function formatProducts(lists, state) {
           date: !_isAppointment ? null : state === null || state === void 0 ? void 0 : state.date,
           relation_form_name: !_isAppointment ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
           holder_title: clientTitle,
-          resource: !_isAppointment ? null : item === null || item === void 0 ? void 0 : (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.resource,
+          resource: !_isAppointment ? null : item === null || item === void 0 ? void 0 : (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.resource,
           relation_details: []
         })
       });
@@ -338,8 +340,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend6;
-        return ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.holder_id) == d.form_record_id && appointmentTypes.includes(item.extension_type);
+        var _item$_extend7;
+        return ((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id) == d.form_record_id && appointmentTypes.includes(item.extension_type);
       })
     });
   });

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

package/es/components/booking/utils.js

@@ -706,18 +706,30 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
-// 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量)  * 商品数量
+// 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
   var _item$_extend;
   var price = 0;
   price += Number(item._extend.price);
   var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    price = Number(other === null || other === void 0 ? void 0 : other.price);
+  }
   if (other !== null && other !== void 0 && other.bundle) {
     // bundle
     price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
+
+  // 单规格
+  if (other !== null && other !== void 0 && other.option) {
+    price = other === null || other === void 0 ? void 0 : other.option.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   price = price;
   return price;
 };

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<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"windcave" | "tyro" | "payo" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
 };
 /**

package/es/components/shoppingCart/components/Cart/Product.js

@@ -73,7 +73,7 @@ var Product = function Product(props) {
     className: "pisell-lowcode__shopping-cart-content"
   }, clearCart, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
     return /*#__PURE__*/React.createElement(ProductCard, _extends({
-      key: item.id,
+      key: item._id,
       dataSource: item,
       onAction: function onAction(e) {
         return _onAction === null || _onAction === void 0 ? void 0 : _onAction(e);

package/es/components/shoppingCart/components/Cart/index.js

@@ -39,7 +39,7 @@ var Cart = function Cart() {
       return _objectSpread(_objectSpread({}, item), {}, {
         label: /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__shopping-cart-label"
-        }, "".concat(item === null || item === void 0 ? void 0 : item.label, " ").concat((item === null || item === void 0 ? void 0 : item.key) > 0 ? locales.getText('pisell2.text.shopping-cart.item')(item === null || item === void 0 ? void 0 : (_item$products = item.products) === null || _item$products === void 0 ? void 0 : _item$products.length) : '')),
+        }, "".concat(item === null || item === void 0 ? void 0 : item.label, " ").concat(locales.getText('pisell2.text.shopping-cart.item')(item === null || item === void 0 ? void 0 : (_item$products = item.products) === null || _item$products === void 0 ? void 0 : _item$products.length))),
         children: (item === null || item === void 0 ? void 0 : (_item$products2 = item.products) === null || _item$products2 === void 0 ? void 0 : _item$products2.length) > 0 ? /*#__PURE__*/React.createElement(Product, {
           id: item === null || item === void 0 ? void 0 : item.key,
           lists: item === null || item === void 0 ? void 0 : item.products

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

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

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

@@ -140,15 +140,26 @@ var formatHolders = (state, item, values) => {
   }
   return obj;
 };
+var formatProductPrice = (item) => {
+  var _a, _b, _c;
+  const other = (_a = item._extend) == null ? void 0 : _a.other;
+  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  if (other == null ? void 0 : other.option) {
+    price = (_c = other == null ? void 0 : other.option) == null ? void 0 : _c.reduce((pre, cur) => {
+      return pre + Number(cur.price) * Number(cur.num);
+    }, price);
+  }
+  return price;
+};
 var formatProducts = (item) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   return {
     "num": item._extend.quantity,
-    "price": item._extend.price,
+    "price": formatProductPrice(item),
     "product_id": (item == null ? void 0 : item.product_id) || item.id,
     "discount_amount": discount_amount,
     "product_discount_reason": item._extend.discount_reason || "",
@@ -159,7 +170,9 @@ var formatProducts = (item) => {
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
     "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
-    "bundle_edit": item._extend.bundle_edit
+    "bundle_edit": item._extend.bundle_edit,
+    "product_option_item": formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
+    "product_variant_id": ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0
   };
 };
 var formatDayRelationProducts = (data, booking_item) => {

package/lib/components/booking/info/service/addService/index.js

@@ -215,7 +215,10 @@ var Info = (props) => {
   };
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type) => {
-      const isEject = type === "detail" || item.bundle_group_count > 0;
+      let isEject = type === "detail" || item.bundle_group_count > 0;
+      if (isDay) {
+        isEject = type === "detail" || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
+      }
       let lock = false;
       state.action({
         type: "pisell1.handleOpenProductModal",
@@ -223,15 +226,15 @@ var Info = (props) => {
           id: item.id,
           date: state.date.value.format("YYYY-MM-DD"),
           showConfig: {
-            option: false,
+            option: isDay ? true : false,
             session: false,
-            variant: false,
+            variant: isDay ? true : false,
             package: true
           },
           is_eject: isEject ? 1 : 0
         },
         callback: (e) => {
-          var _a2, _b2;
+          var _a2, _b2, _c2, _d2, _e, _f;
           if (lock) {
             return;
           }
@@ -259,11 +262,14 @@ var Info = (props) => {
             cacheItem._extend.sub_type = "days";
           }
           let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
+          if ((_b2 = (_a2 = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.product_variant_id) {
+            cacheItem._extend.price = Number((_d2 = (_c2 = cacheItem._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.price);
+          }
           cacheItem._extend.total = _total;
           cacheItem._extend.origin_total = _total;
           const _isEdit = !!state.service.cacheItem;
           if (_isEdit) {
-            cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
+            cacheItem._id = (_e = state.service.cacheItem) == null ? void 0 : _e._id;
             cacheItem.new = 0;
           }
           if (renderMode === "current") {
@@ -275,7 +281,7 @@ var Info = (props) => {
           } else if (state.renderType === "eventBooking") {
             cacheItem.autoClose = false;
           } else {
-            cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_b2 = state.service) == null ? void 0 : _b2.resourcesOrigin) || []).length === 1);
+            cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_f = state.service) == null ? void 0 : _f.resourcesOrigin) || []).length === 1);
           }
           dispatch({
             type: "setService",

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

@@ -399,6 +399,7 @@ var Info = (_, ref) => {
     useEndDate
   ]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
+    var _a2, _b2, _c2, _d2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     state.action({
@@ -407,14 +408,19 @@ var Info = (_, ref) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: isDay ? true : false,
           session: false,
-          variant: false,
+          variant: isDay ? true : false,
           package: true
         },
-        value: item._extend.other
+        value: {
+          ...item._extend.other,
+          product_variant: ((_b2 = (_a2 = item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.product_variant_id) || 0,
+          product_option: ((_d2 = (_c2 = item._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.option) || []
+        }
       },
       callback: (e2) => {
+        var _a3, _b3, _c3, _d3;
         let cacheItem = {
           ...item,
           product_id: item.id,
@@ -430,6 +436,9 @@ var Info = (_, ref) => {
           new: 0
         };
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
+        if ((_b3 = (_a3 = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a3.other) == null ? void 0 : _b3.product_variant_id) {
+          cacheItem._extend.price = Number((_d3 = (_c3 = cacheItem._extend) == null ? void 0 : _c3.other) == null ? void 0 : _d3.price);
+        }
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
         dispatch({

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

@@ -137,9 +137,10 @@ var isAppointment = (item, state) => {
 var formatProducts = (lists, state) => {
   if (!(lists == null ? void 0 : lists.length))
     return [];
+  console.log(lists, "wh_lists");
   try {
     return lists.map((item) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const _isAppointment = isAppointment(item, state);
       const clientTitle = getHolderName(state, (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.holder_id);
       let resourceItem = {};
@@ -159,6 +160,7 @@ var formatProducts = (lists, state) => {
         num: item == null ? void 0 : item._extend.quantity,
         bundle: (_d = (_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle,
         options: (_f = (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
+        product_option_string: (_h = (_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.product_option_string,
         _showAction: false,
         _actionText: import_utils2.locales.getText("page.booking.text.add-time"),
         _errorMessage: errorMessage,
@@ -167,7 +169,7 @@ var formatProducts = (lists, state) => {
           date: !_isAppointment ? null : state == null ? void 0 : state.date,
           relation_form_name: !_isAppointment ? "" : (resourceItem == null ? void 0 : resourceItem.labelText) || item.relation_form_name,
           holder_title: clientTitle,
-          resource: !_isAppointment ? null : (_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.resource,
+          resource: !_isAppointment ? null : (_i = item == null ? void 0 : item._extend) == null ? void 0 : _i.resource,
           relation_details: []
         }
       };

package/lib/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

package/lib/components/booking/utils.js

@@ -571,11 +571,19 @@ var getProductTotalPrice = (item) => {
   let price = 0;
   price += Number(item._extend.price);
   let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    price = Number(other == null ? void 0 : other.price);
+  }
   if (other == null ? void 0 : other.bundle) {
     price = other == null ? void 0 : other.bundle.reduce((accumulator, currentValue) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
+  if (other == null ? void 0 : other.option) {
+    price = other == null ? void 0 : other.option.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   price = price;
   return price;
 };

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<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"windcave" | "tyro" | "payo" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
 };
 /**

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -74,7 +74,7 @@ var Product = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.ProductCard,
       {
-        key: item.id,
+        key: item._id,
         dataSource: item,
         onAction: (e) => onAction == null ? void 0 : onAction(e),
         onDelete: (e) => handleChange(e, "delete"),

package/lib/components/shoppingCart/components/Cart/index.js

@@ -50,9 +50,9 @@ var Cart = () => {
       var _a, _b;
       return {
         ...item,
-        label: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-label" }, `${item == null ? void 0 : item.label} ${(item == null ? void 0 : item.key) > 0 ? import_utils.locales.getText("pisell2.text.shopping-cart.item")(
-          (_a = item == null ? void 0 : item.products) == null ? void 0 : _a.length
-        ) : ""}`),
+        label: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-label" }, `${item == null ? void 0 : item.label} ${import_utils.locales.getText(
+          "pisell2.text.shopping-cart.item"
+        )((_a = item == null ? void 0 : item.products) == null ? void 0 : _a.length)}`),
         children: ((_b = item == null ? void 0 : item.products) == null ? void 0 : _b.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_Product.default, { id: item == null ? void 0 : item.key, lists: item == null ? void 0 : item.products }) : /* @__PURE__ */ import_react.default.createElement(import_Empty.default, { id: item == null ? void 0 : item.key }),
         showArrow: platform === "shop"
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.198",
+  "version": "3.0.200",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.0.58",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.1"
+    "@pisell/date-picker": "3.0.1",
+    "@pisell/materials": "3.0.60"
   },
   "peerDependencies": {
     "react": "^18.0.0",