@pisell/private-materials 3.0.143 → 3.0.145

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

@@ -188,6 +188,7 @@ var formatHolder = function formatHolder(state, values) {
 
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
+  var _values, _values$bookings, _values$bookings$;
   var values = {
     type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -219,5 +220,11 @@ export var formatValues = function formatValues(state) {
 
   // 服务
   values.bookings = formatBookings(state);
+
+  // 日期
+  if ((_values = values) !== null && _values !== void 0 && (_values$bookings = _values.bookings) !== null && _values$bookings !== void 0 && (_values$bookings$ = _values$bookings[0]) !== null && _values$bookings$ !== void 0 && _values$bookings$.select_date && !(state !== null && state !== void 0 && state.bookingId)) {
+    // 默认用第一个预约的选择日期并且是新建，编辑目前先不处理，用于解决附加费问题
+    values.schedule_date = values.bookings[0].select_date;
+  }
   return values;
 };

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

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

package/es/components/eftpos/surcharge/index.js

@@ -55,7 +55,7 @@ export var getCommDefaultVal = function getCommDefaultVal(commConfig) {
   var _ref;
   var top = commConfig.top.input.defaultValue;
   var origin = commConfig.origin.input.defaultValue;
-  return _ref = {}, _defineProperty(_ref, commConfig.origin.__sourceName, typeof origin === 'undefined' ? true : origin), _defineProperty(_ref, commConfig.top.__sourceName, typeof top === 'undefined' ? true : top), _defineProperty(_ref, commConfig.left.__sourceName, commConfig.left.input.defaultValue || 0), _defineProperty(_ref, commConfig.right.__sourceName, commConfig.right.input.defaultValue || 0), _ref;
+  return _ref = {}, _defineProperty(_ref, commConfig.origin.__sourceName, typeof origin === 'undefined' ? false : origin), _defineProperty(_ref, commConfig.top.__sourceName, typeof top === 'undefined' ? true : top), _defineProperty(_ref, commConfig.left.__sourceName, commConfig.left.input.defaultValue || 0), _defineProperty(_ref, commConfig.right.__sourceName, commConfig.right.input.defaultValue || 0), _ref;
 };
 
 /**

package/es/components/eftposPay/amount.js

@@ -196,6 +196,7 @@ export default (function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-money-title"
   }, locales.getText('page.eftpos-pay.text.input.title')(name)), /*#__PURE__*/React.createElement(InputNumber, {
+    type: "number",
     addonBefore: symbol || '$',
     max: money,
     precision: 2,
@@ -236,6 +237,7 @@ export default (function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-amount-item-title"
   }, locales.getText('page.eftpos-pay.text.surcharge.percentage')), /*#__PURE__*/React.createElement(InputNumber, {
+    type: "number",
     value: tempSurRate,
     min: 0,
     max: 100,
@@ -252,6 +254,7 @@ export default (function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-amount-item-title"
   }, locales.getText('page.eftpos-pay.text.surcharge.fixed')), /*#__PURE__*/React.createElement(InputNumber, {
+    type: "number",
     value: tempSurMoney,
     min: 0,
     max: 100000,

package/es/components/eftposPay/component/manual/index.js

@@ -179,6 +179,7 @@ export default (function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-manual-edit-text"
   }, locales.getText('page.eftpos-pay.text.manual.tip')), /*#__PURE__*/React.createElement(InputNumber, {
+    type: "number",
     addonBefore: symbol || '$',
     min: pay === null || pay === void 0 ? void 0 : pay.total,
     precision: 2,

package/es/components/eftposPay/helper.js

@@ -5,7 +5,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { Decimal } from 'decimal.js';
-import { ModeEnum } from "./const";
+import { ModeEnum, EftposEnum } from "./const";
 /* eslint-disable no-bitwise */
 export function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -138,7 +138,8 @@ export function getAmonunt(store) {
     pay = store.pay,
     name = store.name,
     symbol = store.symbol,
-    amount = store.amount;
+    amount = store.amount,
+    eftpos = store.eftpos;
   if (!device) {
     throw Error('device is not defined');
   }
@@ -173,7 +174,7 @@ export function getAmonunt(store) {
     };
   }
   // 原始手续费 是指 各个pos机厂商跟银行合作直接收取的手续费,一旦设置则清空,配置中设置的手续费
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
+  var useOriginSurcharge = eftpos === EftposEnum.Tyro ? setting.useOriginSurcharge || false : false;
 
   // 直接设备中手续费金额
   var surRate = setting.constant_rate || 0;

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<"windcave" | "tyro" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
 };
 /**
  * @title: 通用失败处理

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

@@ -1,8 +1,5 @@
 import React from 'react';
 import { PosProps } from './const';
 import './index.less';
-export declare const Root: (props: PosProps) => React.JSX.Element;
-declare const _default: ({ key, ...props }: PosProps & {
-    key: string | number;
-}) => React.JSX.Element;
+declare const _default: (props: PosProps) => React.JSX.Element;
 export default _default;

package/es/components/eftposPay/index.js

@@ -1,7 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["action", "getApi", "device_number", "terminal", "tyroUrl", "tyroVersion", "onChangeParams"],
-  _excluded2 = ["key"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+var _excluded = ["action", "getApi", "device_number", "terminal", "tyroUrl", "tyroVersion", "onChangeParams"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -47,6 +45,7 @@ var App = function App(_ref) {
     setCurrent = _useState2[1];
   var statusRef = useRef(data.status);
   var context = useEngineContext();
+  console.log('context = ', context);
   var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {
       formatAmount: function formatAmount(number, precision, symbol) {
         return "".concat(symbol).concat(number);
@@ -183,7 +182,7 @@ var App = function App(_ref) {
     formatAmount: formatAmount
   });
 };
-export var Root = function Root(props) {
+export default (function (props) {
   var _context$appHelper2, _store$getState, _store$getState$call, _store$getState$call$, _props$params, _props$params2;
   var context = useEngineContext();
   var _ref3 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {
@@ -280,11 +279,4 @@ export var Root = function Root(props) {
     source: props.source,
     device_number: props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number
   }));
-};
-export default (function (_ref4) {
-  var key = _ref4.key,
-    props = _objectWithoutProperties(_ref4, _excluded2);
-  return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
-    key: key
-  }));
 });

package/es/components/eftposPay/payo/const.js

@@ -126,7 +126,7 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
+  var useOriginSurcharge = false;
 
   // 直接设备中手续费金额 + 原始支付总额
 

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

@@ -281,9 +281,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "windcave" | "tyro" | "payo" | "stripe" | undefined;
+        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/components/eftposPay/windcave/const.js

@@ -111,7 +111,7 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
+  var useOriginSurcharge = false;
 
   // 直接设备中手续费金额 + 原始支付总额
   var surRate = setting.constant_rate || 0;

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

@@ -162,7 +162,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a;
+  var _a, _b, _c;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -189,6 +189,9 @@ var formatValues = (state) => {
   };
   values.holder = formatHolder(state, values);
   values.bookings = formatBookings(state);
+  if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
+    values.schedule_date = values.bookings[0].select_date;
+  }
   return values;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

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

package/lib/components/eftpos/surcharge/index.js

@@ -53,7 +53,7 @@ var getCommDefaultVal = (commConfig) => {
   const top = commConfig.top.input.defaultValue;
   const origin = commConfig.origin.input.defaultValue;
   return {
-    [commConfig.origin.__sourceName]: typeof origin === "undefined" ? true : origin,
+    [commConfig.origin.__sourceName]: typeof origin === "undefined" ? false : origin,
     [commConfig.top.__sourceName]: typeof top === "undefined" ? true : top,
     [commConfig.left.__sourceName]: commConfig.left.input.defaultValue || 0,
     [commConfig.right.__sourceName]: commConfig.right.input.defaultValue || 0

package/lib/components/eftposPay/amount.js

@@ -141,6 +141,7 @@ var amount_default = ({
   ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-money" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-money-title" }, import_utils.locales.getText("page.eftpos-pay.text.input.title")(name)), /* @__PURE__ */ import_react.default.createElement(
     import_antd.InputNumber,
     {
+      type: "number",
       addonBefore: symbol || "$",
       max: money,
       precision: 2,
@@ -166,6 +167,7 @@ var amount_default = ({
   ), ": ", formatAmount(`${totalSurMoney}`, 2, symbol), " (", import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.rate"), ":", curSurRate, "% + ", formatAmount(`${curSurMoney}`, 2, symbol), ")")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: onEdit, disabled: useOriginSurcharge }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.surcharge")))) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(import_alert.default, null, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage-fixed")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-form" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item-title" }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage")), /* @__PURE__ */ import_react.default.createElement(
     import_antd.InputNumber,
     {
+      type: "number",
       value: tempSurRate,
       min: 0,
       max: 100,
@@ -179,6 +181,7 @@ var amount_default = ({
   )), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item-title" }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.fixed")), /* @__PURE__ */ import_react.default.createElement(
     import_antd.InputNumber,
     {
+      type: "number",
       value: tempSurMoney,
       min: 0,
       max: 1e5,

package/lib/components/eftposPay/component/manual/index.js

@@ -125,6 +125,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
   return /* @__PURE__ */ import_react.default.createElement("div", { className: `pisell-lowcode__eft-pay-manual ${className}` }, isUpdateAmount ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-manual-edit-title" }, import_utils.locales.getText("page.eftpos-pay.text.manual.title")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-manual-edit-body" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-manual-edit-text" }, import_utils.locales.getText("page.eftpos-pay.text.manual.subtitle")(formatAmount(pay == null ? void 0 : pay.total, 2, symbol)), " ", /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText("page.eftpos-pay.text.manual.confirm"), /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText("page.eftpos-pay.text.manual.diff")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-manual-edit-act" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-manual-edit-text" }, import_utils.locales.getText("page.eftpos-pay.text.manual.tip")), /* @__PURE__ */ import_react.default.createElement(
     import_antd.InputNumber,
     {
+      type: "number",
       addonBefore: symbol || "$",
       min: pay == null ? void 0 : pay.total,
       precision: 2,

package/lib/components/eftposPay/helper.js

@@ -119,7 +119,7 @@ var limitDecimals = (value) => {
   return "";
 };
 function getAmonunt(store) {
-  const { device, pay, name, symbol, amount } = store;
+  const { device, pay, name, symbol, amount, eftpos } = store;
   if (!device) {
     throw Error("device is not defined");
   }
@@ -150,7 +150,7 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const useOriginSurcharge = eftpos === import_const.EftposEnum.Tyro ? setting.useOriginSurcharge || false : false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;

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<"windcave" | "tyro" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
 };
 /**
  * @title: 通用失败处理

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

@@ -1,8 +1,5 @@
 import React from 'react';
 import { PosProps } from './const';
 import './index.less';
-export declare const Root: (props: PosProps) => React.JSX.Element;
-declare const _default: ({ key, ...props }: PosProps & {
-    key: string | number;
-}) => React.JSX.Element;
+declare const _default: (props: PosProps) => React.JSX.Element;
 export default _default;

package/lib/components/eftposPay/index.js

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/eftposPay/index.tsx
 var eftposPay_exports = {};
 __export(eftposPay_exports, {
-  Root: () => Root,
   default: () => eftposPay_default
 });
 module.exports = __toCommonJS(eftposPay_exports);
@@ -62,6 +61,7 @@ var App = ({
   const [current, setCurrent] = (0, import_react.useState)(action);
   const statusRef = (0, import_react.useRef)(data.status);
   const context = (0, import_useEngineContext.default)();
+  console.log("context = ", context);
   const { formatAmount, isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {
     formatAmount: (number, precision, symbol) => `${symbol}${number}`,
     isTerminal: () => false
@@ -164,7 +164,7 @@ var App = ({
     }
   );
 };
-var Root = (props) => {
+var eftposPay_default = (props) => {
   var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
@@ -245,10 +245,3 @@ var Root = (props) => {
     }
   ));
 };
-var eftposPay_default = ({ key, ...props }) => {
-  return /* @__PURE__ */ import_react.default.createElement(Root, { ...props, key });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Root
-});

package/lib/components/eftposPay/payo/const.js

@@ -109,7 +109,7 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const useOriginSurcharge = false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;

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

@@ -281,9 +281,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "windcave" | "tyro" | "payo" | "stripe" | undefined;
+        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/lib/components/eftposPay/windcave/const.js

@@ -98,7 +98,7 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const useOriginSurcharge = false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;

package/lowcode/eftpos-pay/meta.ts

@@ -27,17 +27,17 @@ const PayMeta: ComponentMetadata = {
         name: 'type',
         setter: ['JsonSetter', 'VariableSetter'],
       },
-      {
-        title: {
-          label: {
-            type: 'i18n',
-            'en-US': 'key',
-            'zh-CN': 'key',
-          },
-        },
-        name: 'key',
-        setter: ['JsonSetter', 'VariableSetter'],
-      },
+      // {
+      //   title: {
+      //     label: {
+      //       type: 'i18n',
+      //       'en-US': 'key',
+      //       'zh-CN': 'key',
+      //     },
+      //   },
+      //   name: 'key',
+      //   setter: ['JsonSetter', 'VariableSetter'],
+      // },
       {
         title: {
           label: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.143",
+  "version": "3.0.145",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",