@pisell/private-materials 3.0.134 → 3.0.136

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) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -237,7 +237,8 @@ var Footer = function Footer(props) {
               module: 'booking',
               key: 'booking_checkout',
               data: {
-                order_id: order_id
+                order_id: order_id,
+                callbackType: "pisell2"
               }
             }));
           case 2:

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

@@ -228,7 +228,8 @@ var header = function header(_ref) {
               module: 'booking',
               key: 'booking_checkout',
               data: {
-                order_id: state.bookingId
+                order_id: state.bookingId,
+                callbackType: "pisell2"
               }
             }));
           case 2:

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

@@ -461,7 +461,8 @@ var AddTimeModal = function AddTimeModal() {
               module: 'booking',
               key: 'booking_checkout',
               data: {
-                order_id: state.bookingId
+                order_id: state.bookingId,
+                callbackType: "pisell2"
               }
             }));
           case 2:

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+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/eftposPay/device.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
 import { PayProps, PosProps } from './const';
 import './device.less';
-declare const _default: ({ api, onChange, onClose, className, isIpad, net, }: {
+declare const _default: ({ api, onChange, onClose, className, device_number, isIpad, net, }: {
     api: PayProps['api'];
     className?: string | undefined;
     onChange?: ((status: "page" | "success" | "fail", params?: string | {
         [keys: string]: unknown;
     } | undefined) => void) | undefined;
     onClose: () => void;
+    device_number?: string | number | undefined;
     isIpad: boolean;
     net: boolean;
 }) => React.JSX.Element;

package/es/components/eftposPay/device.js

@@ -18,6 +18,7 @@ export default (function (_ref) {
     onClose = _ref.onClose,
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? '' : _ref$className,
+    device_number = _ref.device_number,
     isIpad = _ref.isIpad,
     net = _ref.net;
   var _useContextData = useContextData(),
@@ -63,6 +64,30 @@ export default (function (_ref) {
     }).then(function (res) {
       setLoading(false);
       if (res && Array.isArray(res.list) && res.list.length > 0) {
+        if (device_number) {
+          var hostDeviceList = res.list.filter(function (item) {
+            var _item$setting, _item$setting$devices;
+            return item === null || item === void 0 ? void 0 : (_item$setting = item.setting) === null || _item$setting === void 0 ? void 0 : (_item$setting$devices = _item$setting.devices) === null || _item$setting$devices === void 0 ? void 0 : _item$setting$devices.some(function (i) {
+              return i.number === device_number;
+            });
+          });
+          if (hostDeviceList.length >= 1) {
+            setDataStaus(true);
+            setList(hostDeviceList);
+            if (hostDeviceList.length === 1) {
+              dispatch(updateDevice({
+                device: hostDeviceList[0]
+              }));
+              if (typeof api.selectDevice === 'function') {
+                api.selectDevice(hostDeviceList[0]);
+              }
+              if (typeof onChange === 'function') {
+                onChange('page', mode === ModeEnum.Pay ? 'amount' : 'pay');
+              }
+            }
+            return;
+          }
+        }
         setDataStaus(true);
         setList(res.list);
         if (res.list.length === 1) {

package/es/components/eftposPay/index.js

@@ -1,5 +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", "terminal"];
+var _excluded = ["action", "getApi", "device_number", "terminal"];
 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; }
@@ -31,6 +31,7 @@ var App = function App(_ref) {
   var _context$appHelper;
   var action = _ref.action,
     getApi = _ref.getApi,
+    device_number = _ref.device_number,
     terminal = _ref.terminal,
     props = _objectWithoutProperties(_ref, _excluded);
   var data = useContextData();
@@ -109,7 +110,8 @@ var App = function App(_ref) {
       onClose: onClose,
       isIpad: isIpad,
       className: isIpad ? 'pisell-lowcode__eft-pay-terminal' : '',
-      net: net
+      net: net,
+      device_number: device_number
     });
   }
   if (current === RouteEnum.Amount) {
@@ -132,7 +134,7 @@ var App = function App(_ref) {
   });
 };
 export default (function (props) {
-  var _context$appHelper2, _store$getState, _store$getState$call, _store$getState$call$;
+  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) || {
       store: {}
@@ -175,6 +177,7 @@ export default (function (props) {
   useEffect(function () {
     document.body.id = 'body';
   }, []);
+  console.log('props?.params?.device_number = ', props === null || props === void 0 ? void 0 : (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.device_number);
   return /*#__PURE__*/React.createElement(Provider, {
     state: state
   }, /*#__PURE__*/React.createElement(App, {
@@ -182,6 +185,7 @@ export default (function (props) {
     params: props.params,
     onChangeStatus: onChangeStatus,
     terminal: props.terminal,
-    action: action
+    action: action,
+    device_number: props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number
   }));
 });

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) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -187,7 +187,8 @@ var Footer = (props) => {
         module: "booking",
         key: "booking_checkout",
         data: {
-          order_id
+          order_id,
+          callbackType: "pisell2"
         }
       });
     }

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

@@ -138,7 +138,8 @@ var header = ({ state, dispatch }) => {
         module: "booking",
         key: "booking_checkout",
         data: {
-          order_id: state.bookingId
+          order_id: state.bookingId,
+          callbackType: "pisell2"
         }
       });
     }

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

@@ -362,7 +362,8 @@ var AddTimeModal = () => {
         module: "booking",
         key: "booking_checkout",
         data: {
-          order_id: state.bookingId
+          order_id: state.bookingId,
+          callbackType: "pisell2"
         }
       });
     }

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+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/eftposPay/device.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
 import { PayProps, PosProps } from './const';
 import './device.less';
-declare const _default: ({ api, onChange, onClose, className, isIpad, net, }: {
+declare const _default: ({ api, onChange, onClose, className, device_number, isIpad, net, }: {
     api: PayProps['api'];
     className?: string | undefined;
     onChange?: ((status: "page" | "success" | "fail", params?: string | {
         [keys: string]: unknown;
     } | undefined) => void) | undefined;
     onClose: () => void;
+    device_number?: string | number | undefined;
     isIpad: boolean;
     net: boolean;
 }) => React.JSX.Element;

package/lib/components/eftposPay/device.js

@@ -45,6 +45,7 @@ var device_default = ({
   onChange,
   onClose,
   className = "",
+  device_number,
   isIpad,
   net
 }) => {
@@ -74,6 +75,30 @@ var device_default = ({
       (res) => {
         setLoading(false);
         if (res && Array.isArray(res.list) && res.list.length > 0) {
+          if (device_number) {
+            const hostDeviceList = res.list.filter(
+              (item) => {
+                var _a, _b;
+                return (_b = (_a = item == null ? void 0 : item.setting) == null ? void 0 : _a.devices) == null ? void 0 : _b.some(
+                  (i) => i.number === device_number
+                );
+              }
+            );
+            if (hostDeviceList.length >= 1) {
+              setDataStaus(true);
+              setList(hostDeviceList);
+              if (hostDeviceList.length === 1) {
+                dispatch((0, import_store.updateDevice)({ device: hostDeviceList[0] }));
+                if (typeof api.selectDevice === "function") {
+                  api.selectDevice(hostDeviceList[0]);
+                }
+                if (typeof onChange === "function") {
+                  onChange("page", mode === import_const.ModeEnum.Pay ? "amount" : "pay");
+                }
+              }
+              return;
+            }
+          }
           setDataStaus(true);
           setList(res.list);
           if (res.list.length === 1) {

package/lib/components/eftposPay/index.js

@@ -48,6 +48,7 @@ import_utils.locales.init(import_locales.default, localStorage.getItem("umi_loca
 var App = ({
   action,
   getApi,
+  device_number,
   terminal,
   ...props
 }) => {
@@ -114,7 +115,8 @@ var App = ({
         onClose,
         isIpad,
         className: isIpad ? "pisell-lowcode__eft-pay-terminal" : "",
-        net
+        net,
+        device_number
       }
     );
   }
@@ -144,7 +146,7 @@ var App = ({
   );
 };
 var eftposPay_default = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
   const mode = (0, import_react.useMemo)(() => {
@@ -180,6 +182,7 @@ var eftposPay_default = (props) => {
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
+  console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   return /* @__PURE__ */ import_react.default.createElement(import_store.Provider, { state }, /* @__PURE__ */ import_react.default.createElement(
     App,
     {
@@ -187,7 +190,8 @@ var eftposPay_default = (props) => {
       params: props.params,
       onChangeStatus,
       terminal: props.terminal,
-      action
+      action,
+      device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));
 };

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: {

package/package.json

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