@pisell/private-materials 3.0.159 → 3.0.161

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

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, 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

@@ -142,6 +142,9 @@ var formatBookings = function formatBookings(data) {
     var total = Number(item._extend.total);
     var origin_total = Number(item._extend.origin_total);
     var discount_amount = origin_total - total;
+
+    // 加价时type使用change_price
+    var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
     return _objectSpread({
       "product": {
         "num": item._extend.quantity,
@@ -153,7 +156,7 @@ var formatBookings = function formatBookings(data) {
         "note": "",
         "discountway": item._extend.discountway || "num",
         "discount_per": item._extend.discount_per,
-        "discount_type": item._extend.discount_type || "discount",
+        "discount_type": item._extend.discount_type || discount_type,
         "order_detail_id": item._extend.order_detail_id || 0,
         "product_bundle": formatProductBundle((_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.bundle),
         "bundle_edit": item._extend.bundle_edit

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

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

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

@@ -34,9 +34,10 @@ import { getErrorList, getServiceTimes, deleteCacheParams, getProductTotalPrice
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
+import { PisellAdjustPriceInputNumber, Page } from '@pisell/materials';
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$date, _state$date$value, _state$date$value$for, _window$BaseMaterials, _state$service$cacheI15, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI16, _state$service$cacheI17, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$date, _state$date$value, _state$date$value$for, _window$BaseMaterials, _state$service$cacheI19, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI20, _state$service$cacheI21, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -661,7 +662,7 @@ var Info = function Info(_, ref) {
   });
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return useMemo(function () {
-    var _state$service$cacheI10, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI11, _state$service$cacheI12, _state$service$cacheI13, _state$service$cacheI14, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
+    var _state$service$cacheI10, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI11, _state$service$cacheI12, _state$service$cacheI13, _state$service$cacheI14, _state$service$cacheI15, _state$service$cacheI16, _state$service$cacheI17, _state$service$cacheI18, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
     , {
@@ -682,7 +683,7 @@ var Info = function Info(_, ref) {
       }
     }, /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-body-edit"
-    }, /*#__PURE__*/React.createElement(Form, {
+    }, /*#__PURE__*/React.createElement(Page, null, /*#__PURE__*/React.createElement(Form, {
       layout: "vertical",
       form: form,
       onFinish: onFinish
@@ -714,39 +715,24 @@ var Info = function Info(_, ref) {
         return renderBundles(item, state.amountSymbol);
       }
     })))), /*#__PURE__*/React.createElement(Col, {
-      span: 12
+      span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: locales.getText('pisell2.text.price'),
       name: "total",
       rules: [{
         required: true
-      }]
-    }, /*#__PURE__*/React.createElement(InputNumber, {
-      disabled: state.channelDisabledEdit,
-      prefix: state.amountSymbol,
-      size: "large",
-      precision: 2,
+      }],
+      extra: useTotal !== ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 ? void 0 : (_state$service$cacheI12 = _state$service$cacheI11._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 ? void 0 : (_state$service$cacheI14 = _state$service$cacheI13._extend) === null || _state$service$cacheI14 === void 0 ? void 0 : _state$service$cacheI14.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
+    }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
       style: {
         width: '100%'
       },
       min: 0,
-      max: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 ? void 0 : (_state$service$cacheI12 = _state$service$cacheI11._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total) || 0,
-      placeholder: ((_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 ? void 0 : (_state$service$cacheI14 = _state$service$cacheI13._extend) === null || _state$service$cacheI14 === void 0 ? void 0 : _state$service$cacheI14.origin_total) || '0'
-    }))), /*#__PURE__*/React.createElement(Col, {
-      span: 12
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.discount'),
-      name: "discount"
-    }, /*#__PURE__*/React.createElement(Select, {
+      precision: 2,
+      prefix: state.amountSymbol,
       disabled: state.channelDisabledEdit,
-      size: "large",
-      open: false,
-      allowClear: isDiscount,
-      onChange: function onChange(e) {
-        form.setFieldsValue({
-          total: state.service.cacheItem._extend.origin_total
-        });
-      }
+      originValue: ((_state$service$cacheI15 = state.service.cacheItem) === null || _state$service$cacheI15 === void 0 ? void 0 : (_state$service$cacheI16 = _state$service$cacheI15._extend) === null || _state$service$cacheI16 === void 0 ? void 0 : _state$service$cacheI16.origin_total) || 0,
+      placeholder: ((_state$service$cacheI17 = state.service.cacheItem) === null || _state$service$cacheI17 === void 0 ? void 0 : (_state$service$cacheI18 = _state$service$cacheI17._extend) === null || _state$service$cacheI18 === void 0 ? void 0 : _state$service$cacheI18.origin_total) || '0'
     }))), isReason ? /*#__PURE__*/React.createElement(Col, {
       span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -824,7 +810,7 @@ var Info = function Info(_, ref) {
     }, /*#__PURE__*/React.createElement(InputNumber, null)), /*#__PURE__*/React.createElement(Form.Item, {
       hidden: true,
       name: "like_status"
-    }, /*#__PURE__*/React.createElement(Input, null))))), state.renderType !== 'eventBooking' && errorList.map(function (d, i) {
+    }, /*#__PURE__*/React.createElement(Input, null)))))), state.renderType !== 'eventBooking' && errorList.map(function (d, i) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,
@@ -849,6 +835,6 @@ var Info = function Info(_, ref) {
         form.submit();
       }
     }, locales.getText('pisell2.text.apply'))))));
-  }, [state.service.changeService, state.service.editModal, (_state$service$cacheI15 = state.service.cacheItem) === null || _state$service$cacheI15 === void 0 ? void 0 : _state$service$cacheI15.autoClose, locales, (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : (_state$service7$cache2 = _state$service7$cache._extend) === null || _state$service7$cache2 === void 0 ? void 0 : _state$service7$cache2.product_name, bundles, state.amountSymbol, state.channelDisabledEdit, (_state$service$cacheI16 = state.service.cacheItem) === null || _state$service$cacheI16 === void 0 ? void 0 : (_state$service$cacheI17 = _state$service$cacheI16._extend) === null || _state$service$cacheI17 === void 0 ? void 0 : _state$service$cacheI17.origin_total, isDiscount, isReason, state.renderType, (_state$bookingConfig9 = state.bookingConfig) === null || _state$bookingConfig9 === void 0 ? void 0 : (_state$bookingConfig10 = _state$bookingConfig9.config) === null || _state$bookingConfig10 === void 0 ? void 0 : (_state$bookingConfig11 = _state$bookingConfig10.basic) === null || _state$bookingConfig11 === void 0 ? void 0 : (_state$bookingConfig12 = _state$bookingConfig11.service_time) === null || _state$bookingConfig12 === void 0 ? void 0 : _state$bookingConfig12.value, SelectTime, durationProps, timeObj, useResource, useLikeStatus, resourceLoading, selectOpen, state.service.resources, errorList]);
+  }, [state.service.changeService, state.service.editModal, (_state$service$cacheI19 = state.service.cacheItem) === null || _state$service$cacheI19 === void 0 ? void 0 : _state$service$cacheI19.autoClose, locales, (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : (_state$service7$cache2 = _state$service7$cache._extend) === null || _state$service7$cache2 === void 0 ? void 0 : _state$service7$cache2.product_name, bundles, state.amountSymbol, state.channelDisabledEdit, (_state$service$cacheI20 = state.service.cacheItem) === null || _state$service$cacheI20 === void 0 ? void 0 : (_state$service$cacheI21 = _state$service$cacheI20._extend) === null || _state$service$cacheI21 === void 0 ? void 0 : _state$service$cacheI21.origin_total, isDiscount, isReason, state.renderType, (_state$bookingConfig9 = state.bookingConfig) === null || _state$bookingConfig9 === void 0 ? void 0 : (_state$bookingConfig10 = _state$bookingConfig9.config) === null || _state$bookingConfig10 === void 0 ? void 0 : (_state$bookingConfig11 = _state$bookingConfig10.basic) === null || _state$bookingConfig11 === void 0 ? void 0 : (_state$bookingConfig12 = _state$bookingConfig11.service_time) === null || _state$bookingConfig12 === void 0 ? void 0 : _state$bookingConfig12.value, SelectTime, durationProps, timeObj, useResource, useLikeStatus, resourceLoading, selectOpen, state.service.resources, errorList, useTotal]);
 };
 export default /*#__PURE__*/forwardRef(Info);

package/es/components/booking/info2/utilsByBooking.js

@@ -95,45 +95,46 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     }
   }
   // 如果 预约人数超过总容量, 则不可用
-  if (totalCount < currentCount) {
-    isCountRange = false;
-  } else {
-    /**
-    * 从这里判断预约量
-    */
-
-    // 取出已预约列表和当前预约重叠的时间段
-    var conflict = (time.event_list || []).filter(function (d) {
-      return isConflict({
-        start_at: d.start_at,
-        end_at: d.end_at
-      }, {
-        start_at: startDate,
-        end_at: endDate
-      });
+  // if (totalCount < currentCount) {
+  // isCountRange = false;
+  // } else {
+  /**
+  * 从这里判断预约量
+  */
+
+  // 取出已预约列表和当前预约重叠的时间段
+  var conflict = (time.event_list || []).filter(function (d) {
+    return isConflict({
+      start_at: d.start_at,
+      end_at: d.end_at
+    }, {
+      start_at: startDate,
+      end_at: endDate
     });
+  });
 
-    // 同一时间段内只能进行一个预约，无论容量是否已满。
-    if (resourceItem.resourceType === 'single') {
-      // 0代表着不重叠,则满足条件
-      if (conflict.length === 0) {
-        isCountRange = true;
-      } else {
-        isCountRange = false;
-      }
+  // 同一时间段内只能进行一个预约，无论容量是否已满。
+  if (resourceItem.resourceType === 'single') {
+    // 0代表着不重叠,则满足条件
+    if (conflict.length === 0) {
+      isCountRange = true;
     } else {
-      // 减去重叠的总量
-      var conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
-
-      // 当前预约量 <= 总剩余容量
-      if (currentCount <= conflictCount) {
-        isCountRange = true;
-      } else {
-        isCountRange = false;
-      }
+      isCountRange = false;
+    }
+  } else {
+    // 减去重叠的总量
+    var conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+
+    // 当前预约量 <= 总剩余容量
+    if (currentCount <= conflictCount) {
+      isCountRange = true;
+    } else {
+      isCountRange = false;
     }
   }
 
+  // }
+
   // 是否可用  只判断是否在日期范围内, 
   var isUsable = isDateRange && isCountRange;
 

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

@@ -195,6 +195,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -392,6 +393,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -589,6 +591,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -225,6 +225,9 @@ export default {
     'page.booking.text.please-choose-an-option-2': "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)",
     'page.booking.text.resource.min-length-error': function pageBookingTextResourceMinLengthError(x, y) {
       return "Select at least ".concat(x, " ").concat(y);
+    },
+    'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
+      return "Original price of the item:".concat(origin, ",Current price of the item:").concat(current);
     }
   },
   'zh-CN': {
@@ -457,6 +460,9 @@ export default {
     'page.booking.text.please-choose-an-option-2': "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）",
     'page.booking.text.resource.min-length-error': function pageBookingTextResourceMinLengthError(x, y) {
       return "\u81F3\u5C11\u9009\u62E9".concat(x, "\u9879").concat(y);
+    },
+    'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
+      return "\u5546\u54C1\u539F\u4EF7:".concat(origin, ",\u5546\u54C1\u73B0\u4EF7:").concat(current);
     }
   },
   'zh-HK': {
@@ -689,6 +695,9 @@ export default {
     'page.booking.text.please-choose-an-option-2': '僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）',
     'page.booking.text.resource.min-length-error': function pageBookingTextResourceMinLengthError(x, y) {
       return "\u81F3\u5C11\u9078\u64C7".concat(x, "\u9805").concat(y);
+    },
+    'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
+      return "\u5546\u54C1\u539F\u50F9:".concat(origin, ",\u5546\u54C1\u73FE\u50F9:").concat(current);
     }
   }
 };

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

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

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

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

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

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

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

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

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

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

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, 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

@@ -129,6 +129,7 @@ var formatBookings = (data) => {
     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 {
       "product": {
         "num": item._extend.quantity,
@@ -140,7 +141,7 @@ var formatBookings = (data) => {
         "note": "",
         "discountway": item._extend.discountway || "num",
         "discount_per": item._extend.discount_per,
-        "discount_type": item._extend.discount_type || "discount",
+        "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

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

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

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

@@ -47,6 +47,7 @@ var import_utils3 = require("../../../utils");
 var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
 var import_utils4 = require("../addService/utils");
+var import_materials = require("@pisell/materials");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
@@ -414,7 +415,7 @@ var Info = (_, ref) => {
   });
   const SelectTime = (_r = window.BaseMaterials) == null ? void 0 : _r.SelectTime;
   return (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2;
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
@@ -434,51 +435,38 @@ var Info = (_, ref) => {
           });
         }
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_d2 = (_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend) == null ? void 0 : _d2.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Page, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_d2 = (_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend) == null ? void 0 : _d2.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
         import_collapsibleList.default,
         {
           style: { marginTop: bundles.length ? "8px" : 0 },
           list: bundles,
           renderItem: (item) => (0, import_utils2.renderBundles)(item, state.amountSymbol)
         }
-      )))), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
+      )))), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Form.Item,
         {
           label: import_utils.locales.getText("pisell2.text.price"),
           name: "total",
-          rules: [{ required: true }]
+          rules: [{ required: true }],
+          extra: useTotal !== ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) && import_utils.locales.getText("page.booking.text.price-extra")(
+            (0, import_utils.formatAmount)(
+              (_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total,
+              2,
+              state.amountSymbol
+            ),
+            (0, import_utils.formatAmount)(useTotal, 2, state.amountSymbol)
+          )
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_antd.InputNumber,
+          import_materials.PisellAdjustPriceInputNumber,
           {
-            disabled: state.channelDisabledEdit,
-            prefix: state.amountSymbol,
-            size: "large",
-            precision: 2,
             style: { width: "100%" },
             min: 0,
-            max: ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) || 0,
-            placeholder: ((_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total) || "0"
-          }
-        )
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          label: import_utils.locales.getText("pisell2.text.discount"),
-          name: "discount"
-        },
-        /* @__PURE__ */ import_react.default.createElement(
-          import_antd.Select,
-          {
+            precision: 2,
+            prefix: state.amountSymbol,
             disabled: state.channelDisabledEdit,
-            size: "large",
-            open: false,
-            allowClear: isDiscount,
-            onChange: (e) => {
-              form.setFieldsValue({
-                total: state.service.cacheItem._extend.origin_total
-              });
-            }
+            originValue: ((_j2 = (_i2 = state.service.cacheItem) == null ? void 0 : _i2._extend) == null ? void 0 : _j2.origin_total) || 0,
+            placeholder: ((_l2 = (_k2 = state.service.cacheItem) == null ? void 0 : _k2._extend) == null ? void 0 : _l2.origin_total) || "0"
           }
         )
       )), isReason ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
@@ -498,7 +486,7 @@ var Info = (_, ref) => {
         SelectTime ? /* @__PURE__ */ import_react.default.createElement(
           SelectTime,
           {
-            slice: (_l2 = (_k2 = (_j2 = (_i2 = state.bookingConfig) == null ? void 0 : _i2.config) == null ? void 0 : _j2.basic) == null ? void 0 : _k2.service_time) == null ? void 0 : _l2.value,
+            slice: (_p2 = (_o2 = (_n2 = (_m2 = state.bookingConfig) == null ? void 0 : _m2.config) == null ? void 0 : _n2.basic) == null ? void 0 : _o2.service_time) == null ? void 0 : _p2.value,
             timePickerProps: {
               style: { width: "100%" }
             },
@@ -566,7 +554,7 @@ var Info = (_, ref) => {
             )
           )
         ))
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null)), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "like_status" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null))))), state.renderType !== "eventBooking" && errorList.map((d, i) => {
+      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null)), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "like_status" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)))))), state.renderType !== "eventBooking" && errorList.map((d, i) => {
         return /* @__PURE__ */ import_react.default.createElement(
           import_antd.Alert,
           {
@@ -619,7 +607,8 @@ var Info = (_, ref) => {
     resourceLoading,
     selectOpen,
     state.service.resources,
-    errorList
+    errorList,
+    useTotal
   ]);
 };
 var editService_default = (0, import_react.forwardRef)(Info);

package/lib/components/booking/info2/utilsByBooking.js

@@ -85,25 +85,21 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       isDateRange = true;
     }
   }
-  if (totalCount < currentCount) {
-    isCountRange = false;
+  let conflict = (time.event_list || []).filter((d) => {
+    return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
+  });
+  if (resourceItem.resourceType === "single") {
+    if (conflict.length === 0) {
+      isCountRange = true;
+    } else {
+      isCountRange = false;
+    }
   } else {
-    let conflict = (time.event_list || []).filter((d) => {
-      return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
-    });
-    if (resourceItem.resourceType === "single") {
-      if (conflict.length === 0) {
-        isCountRange = true;
-      } else {
-        isCountRange = false;
-      }
+    let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+    if (currentCount <= conflictCount) {
+      isCountRange = true;
     } else {
-      let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
-      if (currentCount <= conflictCount) {
-        isCountRange = true;
-      } else {
-        isCountRange = false;
-      }
+      isCountRange = false;
     }
   }
   const isUsable = isDateRange && isCountRange;

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

@@ -195,6 +195,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -392,6 +393,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -589,6 +591,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.price-extra': (origin: string, current: string) => string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -250,7 +250,8 @@ var locales_default = {
     "page.booking.text.please-choose-an-option": "Please choose an option:",
     "page.booking.text.please-choose-an-option-1": "Refund: Cancel the appointment and process a refund.",
     "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)",
-    "page.booking.text.resource.min-length-error": (x, y) => `Select at least ${x} ${y}`
+    "page.booking.text.resource.min-length-error": (x, y) => `Select at least ${x} ${y}`,
+    "page.booking.text.price-extra": (origin, current) => `Original price of the item:${origin},Current price of the item:${current}`
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -473,7 +474,8 @@ var locales_default = {
     "page.booking.text.please-choose-an-option": "请选择：",
     "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
     "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）",
-    "page.booking.text.resource.min-length-error": (x, y) => `至少选择${x}项${y}`
+    "page.booking.text.resource.min-length-error": (x, y) => `至少选择${x}项${y}`,
+    "page.booking.text.price-extra": (origin, current) => `商品原价:${origin},商品现价:${current}`
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -696,6 +698,7 @@ var locales_default = {
     "page.booking.text.please-choose-an-option": "請選擇：",
     "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
     "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）",
-    "page.booking.text.resource.min-length-error": (x, y) => `至少選擇${x}項${y}`
+    "page.booking.text.resource.min-length-error": (x, y) => `至少選擇${x}項${y}`,
+    "page.booking.text.price-extra": (origin, current) => `商品原價:${origin},商品現價:${current}`
   }
 };

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

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

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

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

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

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

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

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

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