@pisell/private-materials 3.0.198 → 3.0.199

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

@@ -9,6 +9,7 @@ import React from 'react';
 import { Input, InputNumber, Checkbox, Radio, Cascader, DatePicker, Select, Slider, Switch, TimePicker, Transfer, TreeSelect, Upload, Form } from 'antd';
 import { CheckboxGroup, RadioGroup } from "../group";
 import Surcharge, { getCommName, getCommDefaultVal } from "../surcharge";
+import Receipt, { getCommName as getCommNameReceipt, getCommDefaultVal as getCommDefaultValReceipt } from "../receipt";
 import DeviceList from "../deviceList";
 
 // 通用表单配置
@@ -32,7 +33,8 @@ var Mapping = {
 };
 var CustomMapping = {
   Surcharge: Surcharge,
-  DeviceList: DeviceList
+  DeviceList: DeviceList,
+  Receipt: Receipt
 };
 
 /**
@@ -53,13 +55,13 @@ var CustomFormItem = function CustomFormItem(_ref) {
       return /*#__PURE__*/React.createElement(CustomFormItem, {
         formItemList: item.children,
         onChange: onChange,
-        key: item.name ? item.name + level : Component + index + level,
+        key: item.name ? "".concat(item.name).concat(level) : "".concat(Component).concat(index).concat(level),
         level: level + 1
       });
     }
     if (_typeof(Component) === 'object') {
       return /*#__PURE__*/React.createElement(Component, _extends({}, item, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }));
     }
     if (Mapping[Component]) {
@@ -67,7 +69,7 @@ var CustomFormItem = function CustomFormItem(_ref) {
       var input = item.input,
         formItemProps = _objectWithoutProperties(item, _excluded2);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, formItemProps, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }), /*#__PURE__*/React.createElement(Comm, input));
     }
     if (Mapping[Component]) {
@@ -75,13 +77,13 @@ var CustomFormItem = function CustomFormItem(_ref) {
       var _input = item.input,
         _formItemProps = _objectWithoutProperties(item, _excluded3);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, _formItemProps, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }), /*#__PURE__*/React.createElement(_Comm, _input));
     }
     if (CustomMapping[Component]) {
       var _Comm2 = CustomMapping[Component];
       return /*#__PURE__*/React.createElement(_Comm2, _extends({}, item, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }));
     }
     throw TypeError("pos\u7269\u6599\u5E93 \u8F93\u5165\u7EC4\u4EF6\u7C7B\u578B ".concat(Component, " \u65E0\u6CD5\u6620\u5C04,\u8BF7\u6B63\u786E\u4F20\u5165\u7EC4\u4EF6\u7C7B\u578B"));
@@ -92,5 +94,9 @@ export var helpMapping = {
   Surcharge: {
     getCommName: getCommName,
     getCommDefaultVal: getCommDefaultVal
+  },
+  Receipt: {
+    getCommName: getCommNameReceipt,
+    getCommDefaultVal: getCommDefaultValReceipt
   }
 };

package/es/components/eftpos/group/index.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => React.JSX.Element;
-export declare const RadioGroup: ({ direction, options, component, ...props }: RadioGroupProps & {
+export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {
     direction?: "vertical" | undefined;
-    component: string;
 }) => React.JSX.Element;

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

@@ -1,6 +1,6 @@
 var _excluded = ["direction", "options"],
   _excluded2 = ["label", "value"],
-  _excluded3 = ["direction", "options", "component"],
+  _excluded3 = ["direction", "options"],
   _excluded4 = ["label", "value"];
 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); }
 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); }
@@ -38,7 +38,6 @@ export var CheckboxGroup = function CheckboxGroup(_ref) {
 export var RadioGroup = function RadioGroup(_ref2) {
   var direction = _ref2.direction,
     options = _ref2.options,
-    component = _ref2.component,
     props = _objectWithoutProperties(_ref2, _excluded3);
   if (direction === 'vertical') {
     return /*#__PURE__*/React.createElement(Radio.Group, props, /*#__PURE__*/React.createElement(Space, {

package/es/components/eftpos/index.js

@@ -24,8 +24,8 @@ import Drawer from "../booking/components/drawer";
 import Log from "./log";
 import localeTexts from "./locales";
 import { usePairTerminalo } from "./hooks";
-import ApiKeyIcon from "./icon/apiKey";
-import DeviceIcon from "./icon/device";
+import DeviceIcon from "./icon/apiKey";
+import ApiKeyIcon from "./icon/device";
 import { Eftpos, getCommByFields, DeviceEnum, getDefaultValue } from "./const";
 import "./index.less";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');

package/es/components/eftpos/receipt/index.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+/**
+ * @title: 自定义组件设置
+ * @description: 自定义组件设置
+ * @param {any} commConfig 当前组件配置
+ * @param {string} name 上游name(用于嵌套 xxx:{yyy:''})
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:10
+ */
+export declare const getCommName: (commConfig: any, name: string[]) => any;
+/**
+ * @title: 自定义组件结果设置
+ * @description: 自定义组件结果设置
+ * @param {any} commConfig 当前组件配置
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:11
+ */
+export declare const getCommDefaultVal: (commConfig: any) => {
+    [x: number]: any;
+};
+declare const _default: (props: any) => React.JSX.Element;
+export default _default;

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

@@ -0,0 +1,96 @@
+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 = ["input"],
+  _excluded2 = ["input"];
+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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React, { useMemo, useState } from 'react';
+import { Form } from 'antd';
+import { CheckboxGroup, RadioGroup } from "../group";
+
+/**
+ * @title: 自定义组件设置
+ * @description: 自定义组件设置
+ * @param {any} commConfig 当前组件配置
+ * @param {string} name 上游name(用于嵌套 xxx:{yyy:''})
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:10
+ */
+export var getCommName = function getCommName(commConfig, name) {
+  commConfig.receipts.__sourceName = commConfig.receipts.name;
+  commConfig.receiptList.__sourceName = commConfig.receiptList.name;
+  commConfig.receipts.name = name.length > 0 ? [].concat(_toConsumableArray(name), [commConfig.receipts.name]) : commConfig.receipts.name;
+  commConfig.receiptList.name = name.length > 0 ? [].concat(_toConsumableArray(name), [commConfig.receiptList.name]) : commConfig.receiptList.name;
+  return commConfig;
+};
+
+/**
+ * @title: 自定义组件结果设置
+ * @description: 自定义组件结果设置
+ * @param {any} commConfig 当前组件配置
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:11
+ */
+export var getCommDefaultVal = function getCommDefaultVal(commConfig) {
+  var _ref;
+  var receipts = commConfig.receipts.input.defaultValue;
+  var receiptList = commConfig.receiptList.input.defaultValue;
+  console.log('receipts = ', receipts);
+  return _ref = {}, _defineProperty(_ref, commConfig.receipts.__sourceName, typeof receipts === 'undefined' ? true : receipts), _defineProperty(_ref, commConfig.receiptList.__sourceName, typeof receiptList === 'undefined' ? ['merchant', 'customer'] : receiptList), _ref;
+};
+export default (function (props) {
+  var receipts = props.receipts,
+    receiptList = props.receiptList;
+  // const {input:receiptsInput,...receiptsOther} = receipts
+  var _useMemo = useMemo(function () {
+      var input = receipts.input,
+        other = _objectWithoutProperties(receipts, _excluded);
+      return [input, other];
+    }, [receipts]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    receiptsInput = _useMemo2[0],
+    receiptsOther = _useMemo2[1];
+  var _useMemo3 = useMemo(function () {
+      var input = receiptList.input,
+        other = _objectWithoutProperties(receiptList, _excluded2);
+      return [input, other];
+    }, [receipts]),
+    _useMemo4 = _slicedToArray(_useMemo3, 2),
+    receiptListInput = _useMemo4[0],
+    receiptListOther = _useMemo4[1];
+  var _useState = useState(receiptsInput.defaultValue),
+    _useState2 = _slicedToArray(_useState, 2),
+    type = _useState2[0],
+    setType = _useState2[1];
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, _extends({
+    style: {
+      marginBottom: '12px'
+    }
+  }, receiptsOther), /*#__PURE__*/React.createElement(RadioGroup, _extends({}, receiptsInput, {
+    onChange: function onChange(event) {
+      setType(event.target.value);
+    }
+  }))), /*#__PURE__*/React.createElement(Form.Item, _extends({}, receiptListOther, {
+    style: type ? {
+      marginLeft: '24px',
+      display: 'none'
+    } : {
+      marginLeft: '24px'
+    }
+  }), /*#__PURE__*/React.createElement(CheckboxGroup, receiptListInput)));
+});

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

@@ -74,4 +74,5 @@ export declare function getPayAmonunt({ money, amount, surRate, surMoney }: Amou
     surRateMoney: string;
     totalUnit: string;
 };
+export declare function getBrowserVersion(): string;
 export {};

package/es/components/eftposPay/helper.js

@@ -216,4 +216,18 @@ export function getPayAmonunt(_ref, formatAmount) {
     surRateMoney: "".concat(surRateMoney),
     totalUnit: formatAmount(total)
   };
+}
+export function getBrowserVersion() {
+  var Sys = {};
+  var ua = navigator.userAgent.toLowerCase();
+  var s;
+  (s = ua.match(/rv:([\d.]+)\) like gecko/)) ? Sys.ie = s[1] : (s = ua.match(/msie ([\d\.]+)/)) ? Sys.ie = s[1] : (s = ua.match(/edge\/([\d\.]+)/)) ? Sys.edge = s[1] : (s = ua.match(/firefox\/([\d\.]+)/)) ? Sys.firefox = s[1] : (s = ua.match(/(?:opera|opr).([\d\.]+)/)) ? Sys.opera = s[1] : (s = ua.match(/chrome\/([\d\.]+)/)) ? Sys.chrome = s[1] : (s = ua.match(/version\/([\d\.]+).*safari/)) ? Sys.safari = s[1] : 0;
+  // 根据关系进行判断
+  if (Sys.ie) return 'IE: ' + Sys.ie;
+  if (Sys.edge) return 'EDGE: ' + Sys.edge;
+  if (Sys.firefox) return 'Firefox: ' + Sys.firefox;
+  if (Sys.chrome) return 'Chrome: ' + Sys.chrome;
+  if (Sys.opera) return 'Opera: ' + Sys.opera;
+  if (Sys.safari) return 'Safari: ' + Sys.safari;
+  return 'Unkonwn';
 }

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/eftposPay/tyro/index.js

@@ -21,7 +21,7 @@ import { Button } from 'antd';
 import { useDispatch, useContextData, updateState, updateCustom, updateComponent } from "../store";
 import { ModeEnum, ClientEnum } from "../const";
 import { Decimal } from 'decimal.js';
-import { getUuid, getPayParams } from "../helper";
+import { getUuid, getPayParams, getBrowserVersion } from "../helper";
 import Step from "../component/step/step";
 import { useStoreRef } from "../hooks";
 var Minute = 1000 * 60;
@@ -68,6 +68,22 @@ export default (function (_ref) {
   var requestIdRef = useRef((custom === null || custom === void 0 ? void 0 : custom.requestId) || '');
   var unloadRef = useRef(false);
   var clearRef = useRef();
+  var isPrint = function isPrint(key) {
+    var _deviceRef$current, _deviceRef$current$se, _deviceRef$current2, _deviceRef$current2$s;
+    if ((_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current$se = _deviceRef$current.setting) !== null && _deviceRef$current$se !== void 0 && _deviceRef$current$se.receipts) {
+      return false;
+    }
+    var receiptList = (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : (_deviceRef$current2$s = _deviceRef$current2.setting) === null || _deviceRef$current2$s === void 0 ? void 0 : _deviceRef$current2$s.receiptList;
+    if (!Array.isArray(receiptList)) {
+      return true;
+    }
+    if (Array.isArray(receiptList) && receiptList.some(function (item) {
+      return item === key;
+    })) {
+      return true;
+    }
+    return false;
+  };
   useEffect(function () {
     listRef.current = (custom === null || custom === void 0 ? void 0 : custom.list) || [];
   }, [custom === null || custom === void 0 ? void 0 : custom.list]);
@@ -117,7 +133,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:32
    */
   var refundOrder = function refundOrder() {
-    var _deviceRef$current, _deviceRef$current$se, _deviceRef$current2;
+    var _deviceRef$current3, _deviceRef$current3$s, _deviceRef$current4;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -135,12 +151,16 @@ export default (function (_ref) {
     }));
     requestParams.current = {
       amount: new Decimal(amountRef.current || 0).mul(100).toFixed(0, Decimal.ROUND_HALF_UP),
-      // 打印小票 true 打印到系统上 false 打印到pos机上
-      integratedReceipt: !((_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current$se = _deviceRef$current.setting) !== null && _deviceRef$current$se !== void 0 && _deviceRef$current$se.receipts),
+      // 打印小票 true 打印到Pisell系统上 false 打印到pos机上
+      integratedReceipt: !((_deviceRef$current3 = deviceRef.current) !== null && _deviceRef$current3 !== void 0 && (_deviceRef$current3$s = _deviceRef$current3.setting) !== null && _deviceRef$current3$s !== void 0 && _deviceRef$current3$s.receipts),
       integrationKey: integrationKey,
       transactionId: numRef.current,
       mid: mid,
-      tid: tid
+      tid: tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint('merchant'),
+      isPrintCustomer: isPrint('customer'),
+      browserVersion: getBrowserVersion()
     };
     dispatch(updateCustom({
       requestParams: requestParams.current
@@ -151,7 +171,7 @@ export default (function (_ref) {
     api.addTransaction({
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.id,
+      card_reader_id: (_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : _deviceRef$current4.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -183,7 +203,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:33
    */
   var payOrder = function payOrder() {
-    var _deviceRef$current3, _deviceRef$current3$s, _payRef$current, _deviceRef$current4, _deviceRef$current4$s, _deviceRef$current5, _deviceRef$current5$s, _deviceRef$current6;
+    var _deviceRef$current5, _deviceRef$current5$s, _payRef$current, _deviceRef$current6, _deviceRef$current6$s, _deviceRef$current7, _deviceRef$current7$s, _deviceRef$current8;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -199,18 +219,22 @@ export default (function (_ref) {
     dispatch(updateState({
       number: numRef.current
     }));
-    console.log('deviceRef.current?.settings?.useOriginSurcharge = ', (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : (_deviceRef$current3$s = _deviceRef$current3.setting) === null || _deviceRef$current3$s === void 0 ? void 0 : _deviceRef$current3$s.useOriginSurcharge);
+    console.log('deviceRef.current?.settings?.useOriginSurcharge = ', (_deviceRef$current5 = deviceRef.current) === null || _deviceRef$current5 === void 0 ? void 0 : (_deviceRef$current5$s = _deviceRef$current5.setting) === null || _deviceRef$current5$s === void 0 ? void 0 : _deviceRef$current5$s.useOriginSurcharge);
     // (deviceRef.current?.setting as { receipts?: boolean })
     requestParams.current = {
       amount: new Decimal((_payRef$current = payRef.current) === null || _payRef$current === void 0 ? void 0 : _payRef$current.total).mul(100).toFixed(0, Decimal.ROUND_HALF_UP),
       // 手续费 true tyro 手续费, false 系统手续费
-      enableSurcharge: ((_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : (_deviceRef$current4$s = _deviceRef$current4.setting) === null || _deviceRef$current4$s === void 0 ? void 0 : _deviceRef$current4$s.useOriginSurcharge) || false,
+      enableSurcharge: ((_deviceRef$current6 = deviceRef.current) === null || _deviceRef$current6 === void 0 ? void 0 : (_deviceRef$current6$s = _deviceRef$current6.setting) === null || _deviceRef$current6$s === void 0 ? void 0 : _deviceRef$current6$s.useOriginSurcharge) || false,
       // 打印小票 true 打印到系统上 false 打印到pos机上
-      integratedReceipt: !((_deviceRef$current5 = deviceRef.current) !== null && _deviceRef$current5 !== void 0 && (_deviceRef$current5$s = _deviceRef$current5.setting) !== null && _deviceRef$current5$s !== void 0 && _deviceRef$current5$s.receipts),
+      integratedReceipt: !((_deviceRef$current7 = deviceRef.current) !== null && _deviceRef$current7 !== void 0 && (_deviceRef$current7$s = _deviceRef$current7.setting) !== null && _deviceRef$current7$s !== void 0 && _deviceRef$current7$s.receipts),
       integrationKey: integrationKey,
       transactionId: numRef.current,
       mid: mid,
-      tid: tid
+      tid: tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint('merchant'),
+      isPrintCustomer: isPrint('customer'),
+      browserVersion: getBrowserVersion()
     };
     dispatch(updateCustom({
       requestParams: requestParams.current
@@ -221,7 +245,7 @@ export default (function (_ref) {
     api.addTransaction({
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current6 = deviceRef.current) === null || _deviceRef$current6 === void 0 ? void 0 : _deviceRef$current6.id,
+      card_reader_id: (_deviceRef$current8 = deviceRef.current) === null || _deviceRef$current8 === void 0 ? void 0 : _deviceRef$current8.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -284,11 +308,17 @@ export default (function (_ref) {
     var receipt = [merchantReceipt].filter(function (item) {
       return typeof item === 'string';
     }).filter(Boolean);
-    onChange('print', receipt);
     merchantReceiptRef.current = {
       signatureRequired: signatureRequired,
       merchantReceipt: merchantReceipt
     };
+    if (signatureRequired) {
+      onChange('print', receipt);
+      return;
+    }
+    if (isPrint('merchant')) {
+      onChange('print', receipt);
+    }
   };
 
   /**
@@ -373,7 +403,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:35
    */
   var transactionCompleteCallbackImpl = function transactionCompleteCallbackImpl(response) {
-    var _deviceRef$current7;
+    var _deviceRef$current9;
     setStatus(-1);
     setManually(false);
     console.log('Response = ' + JSON.stringify(response), ', Request =  ', JSON.stringify(requestParams.current));
@@ -385,7 +415,7 @@ export default (function (_ref) {
     api.editTransaction(requestIdRef.current, {
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current7 = deviceRef.current) === null || _deviceRef$current7 === void 0 ? void 0 : _deviceRef$current7.id,
+      card_reader_id: (_deviceRef$current9 = deviceRef.current) === null || _deviceRef$current9 === void 0 ? void 0 : _deviceRef$current9.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -413,7 +443,6 @@ export default (function (_ref) {
         card_reader_surcharge: response.surchargeAmount || 0
       }));
       clearRef.current = setTimeout(function () {
-        var _deviceRef$current8;
         var params = getPayParams({
           mode: modeRef.current,
           amount: amountRef.current,
@@ -426,15 +455,17 @@ export default (function (_ref) {
           }
         }, 'success');
         onChange('success', _objectSpread(_objectSpread({}, params), {}, {
-          receipt: (_deviceRef$current8 = deviceRef.current) !== null && _deviceRef$current8 !== void 0 && _deviceRef$current8.setting.receipts ? [] : receipt
+          receipt: isPrint('customer') ? receipt : []
         }));
       }, 1000);
       return;
     } else {
-      var _deviceRef$current9;
-      var current = (_deviceRef$current9 = deviceRef.current) !== null && _deviceRef$current9 !== void 0 && _deviceRef$current9.setting.receipts ? [] : receipt;
+      var _deviceRef$current10;
+      var current = (_deviceRef$current10 = deviceRef.current) !== null && _deviceRef$current10 !== void 0 && _deviceRef$current10.setting.receipts ? [] : receipt;
       if (current.length > 0) {
-        onChange('print', current);
+        if (isPrint('customer')) {
+          onChange('print', receipt);
+        }
       }
     }
     if (response.result === 'UNKNOWN') {

package/es/index.d.ts

@@ -22,4 +22,3 @@ export { default as Eftpos } from './components/eftpos';
 export { default as EftposPay } from './components/eftposPay';
 export { default as BookingDashboard } from './components/booking/dashboard';
 export { default as PisellSelectCustomerModal } from './components/pisellSelectCustomerModal';
-export { default as ShoppingCart } from './components/shoppingCart';

package/es/index.js

@@ -25,5 +25,4 @@ export { default as ToCPay } from "./components/pay/toC";
 export { default as Eftpos } from "./components/eftpos";
 export { default as EftposPay } from "./components/eftposPay";
 export { default as BookingDashboard } from "./components/booking/dashboard";
-export { default as PisellSelectCustomerModal } from "./components/pisellSelectCustomerModal";
-export { default as ShoppingCart } from "./components/shoppingCart";
+export { default as PisellSelectCustomerModal } from "./components/pisellSelectCustomerModal";

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/customSelect/index.d.ts

@@ -32,7 +32,6 @@ interface CustomSelectProps {
     autoFocus?: boolean;
     showDropDown?: boolean;
     handleOpenModal?: () => void;
-    handleDayChange?: (value: any) => void;
 }
 declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -75,8 +75,7 @@ var CustomSelect = (props, ref) => {
     closeCallback,
     autoFocus,
     showDropDown = true,
-    handleOpenModal: propsHandleOpenModal,
-    handleDayChange
+    handleOpenModal: propsHandleOpenModal
   } = props;
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
@@ -112,7 +111,7 @@ var CustomSelect = (props, ref) => {
     }
     closeCallback == null ? void 0 : closeCallback();
   };
-  const handleOpenModal = (item) => {
+  const handleOpenModal = () => {
     if (disabled) {
       return;
     }
@@ -146,9 +145,6 @@ var CustomSelect = (props, ref) => {
     handleViewItem == null ? void 0 : handleViewItem(item);
   };
   const handleRemoveItem = (item) => {
-    if (handleDayChange) {
-      handleDayChange(item);
-    }
     let _arr = (0, import_utils.changeArray)(_value, item, rowKey);
     _onValueChange(_arr);
     set_value(_arr);

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

@@ -25,7 +25,6 @@ __export(amount_exports, {
 module.exports = __toCommonJS(amount_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
-var import_utils3 = require("../../info/service2/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = 0;
   for (let item of relation_details) {
@@ -39,44 +38,27 @@ var getProductAmount = (state, isEdit) => {
   var _a, _b;
   let price = 0;
   let duration = 0;
-  const isDay = (0, import_utils3.isDayBooking)(state);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        if (isDay) {
-          price += Number(item._extend.total) * Number(item._extend.quantity);
-          const _duration = (0, import_utils3.isAppointment)(item, state) ? item._extend.duration : 0;
-          duration += _duration;
-        } else {
-          price += Number(item._extend.total);
-          price += getRelationDetailsTotal(item._extend.relation_details || []);
-          duration += import_utils.flexibleObj.getValue(item._extend.duration);
-        }
+        price += Number(item._extend.total);
+        price += getRelationDetailsTotal(item._extend.relation_details || []);
+        duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
-      if (!isDay) {
-        for (let item of state.addons.value) {
-          price += Number(item._extend.total) * item._extend.quantity;
-        }
+      for (let item of state.addons.value) {
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
     price = Number((_a = state.bookingDetail) == null ? void 0 : _a.product_expect_amount);
-    let services = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
-    duration = services.reduce((pre, cur) => {
+    duration = (((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || []).reduce((pre, cur) => {
       var _a2;
-      let current = 0;
-      if (isDay) {
-        const _duration = (0, import_utils3.isAppointment)(cur, state) ? cur._extend.duration : 0;
-        current = _duration || 0;
-      } else {
-        current = import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
-      }
-      return pre + current;
+      return pre + import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
     }, 0);
   }
   return {
     price: Number(price),
-    duration: (0, import_utils.getDiscountTime)(duration, isDay)
+    duration: (0, import_utils.getDiscountTime)(duration)
   };
 };
 var getProductItemTax = (item, bookingDetail) => {