@pisell/private-materials 3.0.170 → 3.0.172

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

@@ -35,7 +35,7 @@ var translationOriginal = function translationOriginal(text) {
 var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
   var map = {};
   data.forEach(function (item) {
-    var name = translationOriginal(item.name) || "default";
+    var name = translationOriginal(item.name) || 'default';
     if (!map[name]) {
       map[name] = {
         label: !item.id ? locales.getText('pisell2.booking.dashboard.default') : translationOriginal(item.name) || '',
@@ -44,7 +44,9 @@ var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
     }
     map[name].value = (map[name].value || 0) + (item.value || 0);
   });
-  return Object.values(map).sort(function (a, b) {
+  return Object.values(map).filter(function (item) {
+    return !!item.value;
+  }).sort(function (a, b) {
     return b.label.localeCompare(a.label);
   });
 };

package/es/components/booking/forms/single/index.js

@@ -125,6 +125,9 @@ var Single = function Single(_ref) {
         disable: true
       }) : val;
     }
+    if (field.filed_type === 'agreement') {
+      return val === 1 ? locales.getText('pisell2.booking.info.text.form-agreement-yes') : locales.getText('pisell2.booking.info.text.form-agreement-no');
+    }
     if (queryValueById.includes(field === null || field === void 0 ? void 0 : field.filed_type)) {
       return /*#__PURE__*/React.createElement(RenderValueById, {
         field: field,

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

@@ -23,7 +23,7 @@ import { formatAmount, locales } from '@pisell/utils';
 import Duration from "../../../materiels/duration";
 import Capacity from "./Capacity";
 import Resources from "./Resources";
-import { Input, Button, Select, Row, Col, Form, InputNumber } from 'antd';
+import { Input, Button, Row, Col, Form, InputNumber } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
@@ -32,9 +32,10 @@ import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
+import { PisellAdjustPriceInputNumber } 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$cacheI6, _state$service$cacheI7, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI8, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8, _state$service$resour;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI6, _state$service$cacheI7, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI8, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$service$cacheI13, _state$service$cacheI14, _state$service$cacheI15, _state$service$cacheI16, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8, _state$service$resour;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -520,39 +521,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$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 ? void 0 : (_state$service$cacheI10 = _state$service$cacheI9._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_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, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
+  }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
     style: {
       width: '100%'
     },
     min: 0,
-    max: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 ? void 0 : (_state$service$cacheI10 = _state$service$cacheI9._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || 0,
-    placeholder: ((_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'
-  }))), /*#__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$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,
+    placeholder: ((_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'
   }))), isReason ? /*#__PURE__*/React.createElement(Col, {
     span: 24
   }, /*#__PURE__*/React.createElement(Form.Item, {

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

@@ -216,6 +216,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -434,6 +436,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -652,6 +656,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -248,7 +248,9 @@ export default {
     'pisell2.booking.dashboard.default': "Default",
     'pisell2.booking.info.text.clear-cart': "Clear cart",
     'pisell2.booking.info.text.clear-all': "Clear all",
-    'pisell2.booking.info.text.create-new': "Create new"
+    'pisell2.booking.info.text.create-new': "Create new",
+    'pisell2.booking.info.text.form-agreement-yes': "Yes",
+    'pisell2.booking.info.text.form-agreement-no': "No"
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -503,7 +505,9 @@ export default {
     'pisell2.booking.dashboard.default': "默认",
     'pisell2.booking.info.text.clear-cart': "清空购物车",
     'pisell2.booking.info.text.clear-all': "清空",
-    'pisell2.booking.info.text.create-new': "新建"
+    'pisell2.booking.info.text.create-new': "新建",
+    'pisell2.booking.info.text.form-agreement-yes': "是",
+    'pisell2.booking.info.text.form-agreement-no': "否"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -758,6 +762,8 @@ export default {
     'pisell2.booking.dashboard.default': "默认",
     'pisell2.booking.info.text.clear-cart': "清空購物車",
     'pisell2.booking.info.text.clear-all': "清空",
-    'pisell2.booking.info.text.create-new': "新建"
+    'pisell2.booking.info.text.create-new': "新建",
+    'pisell2.booking.info.text.form-agreement-yes': "是",
+    'pisell2.booking.info.text.form-agreement-no': "否"
   }
 };

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

@@ -53,7 +53,7 @@ var formatCapacityToChildrenData = (data) => {
     }
     map[name].value = (map[name].value || 0) + (item.value || 0);
   });
-  return Object.values(map).sort((a, b) => b.label.localeCompare(a.label));
+  return Object.values(map).filter((item) => !!item.value).sort((a, b) => b.label.localeCompare(a.label));
 };
 import_utils.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
 var BookingDashboard = (props) => {

package/lib/components/booking/forms/single/index.js

@@ -111,6 +111,9 @@ var Single = ({
     if (field.filed_type === "body_hotspot_image") {
       return HumanBodySelector ? /* @__PURE__ */ import_react.default.createElement(HumanBodySelector, { value: val, disable: true }) : val;
     }
+    if (field.filed_type === "agreement") {
+      return val === 1 ? import_utils.locales.getText("pisell2.booking.info.text.form-agreement-yes") : import_utils.locales.getText("pisell2.booking.info.text.form-agreement-no");
+    }
     if (queryValueById.includes(field == null ? void 0 : field.filed_type)) {
       return /* @__PURE__ */ import_react.default.createElement(import_RenderValueById.default, { field, value: val });
     }

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

@@ -48,9 +48,10 @@ var import_ahooks = require("ahooks");
 var import_utils3 = require("../../../utils");
 var import_utilsByBooking = require("../../utilsByBooking");
 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;
+  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, _C, _D, _E;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -380,44 +381,31 @@ var Info = (_, ref) => {
         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 !== ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) && import_utils.locales.getText("page.booking.text.price-extra")(
+          (0, import_utils.formatAmount)(
+            (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.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: ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) || 0,
-          placeholder: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.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: ((_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total) || 0,
+          placeholder: ((_z = (_y = state.service.cacheItem) == null ? void 0 : _y._extend) == null ? void 0 : _z.origin_total) || "0"
         }
       )
     )), isReason ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
@@ -437,7 +425,7 @@ var Info = (_, ref) => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value,
+          slice: (_D = (_C = (_B = (_A = state.bookingConfig) == null ? void 0 : _A.config) == null ? void 0 : _B.basic) == null ? void 0 : _C.service_time) == null ? void 0 : _D.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -482,7 +470,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_A = state.service.resourcesOrigin) == null ? void 0 : _A.length),
+        disabled: !((_E = state.service.resourcesOrigin) == null ? void 0 : _E.length),
         onClick: () => {
           form.submit();
         }

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

@@ -216,6 +216,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -434,6 +436,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -652,6 +656,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
+        'pisell2.booking.info.text.form-agreement-yes': string;
+        'pisell2.booking.info.text.form-agreement-no': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -271,7 +271,9 @@ var locales_default = {
     "pisell2.booking.dashboard.default": "Default",
     "pisell2.booking.info.text.clear-cart": "Clear cart",
     "pisell2.booking.info.text.clear-all": "Clear all",
-    "pisell2.booking.info.text.create-new": "Create new"
+    "pisell2.booking.info.text.create-new": "Create new",
+    "pisell2.booking.info.text.form-agreement-yes": "Yes",
+    "pisell2.booking.info.text.form-agreement-no": "No"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -515,7 +517,9 @@ var locales_default = {
     "pisell2.booking.dashboard.default": "默认",
     "pisell2.booking.info.text.clear-cart": "清空购物车",
     "pisell2.booking.info.text.clear-all": "清空",
-    "pisell2.booking.info.text.create-new": "新建"
+    "pisell2.booking.info.text.create-new": "新建",
+    "pisell2.booking.info.text.form-agreement-yes": "是",
+    "pisell2.booking.info.text.form-agreement-no": "否"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -759,6 +763,8 @@ var locales_default = {
     "pisell2.booking.dashboard.default": "默认",
     "pisell2.booking.info.text.clear-cart": "清空購物車",
     "pisell2.booking.info.text.clear-all": "清空",
-    "pisell2.booking.info.text.create-new": "新建"
+    "pisell2.booking.info.text.create-new": "新建",
+    "pisell2.booking.info.text.form-agreement-yes": "是",
+    "pisell2.booking.info.text.form-agreement-no": "否"
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.170",
+  "version": "3.0.172",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/date-picker": "1.0.100",
     "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "3.0.50",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/materials": "3.0.50"
   },
   "peerDependencies": {
     "react": "^18.0.0",