@pisell/private-materials 6.1.1 → 6.2.1

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

@@ -110,6 +110,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -227,6 +228,9 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
+        'pisell2.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;
@@ -389,6 +393,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -498,6 +503,9 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
+        'pisell2.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;
@@ -660,6 +668,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -769,6 +778,9 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
+        'pisell2.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;

package/es/components/booking/locales.js

@@ -128,6 +128,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, " is fully booked between ").concat(y, " and ").concat(z, ", but your team member can still book appointments.");
     },
+    'pisell1.text.resource-error-message-unbound': 'This booking product is not associated with the target resource.',
     'pisell1.text.no-addons': 'No addons',
     'pisell1.text.no-resource': 'No resource',
     'pisell1.text.no-payments': 'No payments',
@@ -262,6 +263,9 @@ export default {
     'pisell2.booking.info.text.create-new': "Create new",
     'pisell2.booking.info.text.form-agreement-yes': "Yes",
     'pisell2.booking.info.text.form-agreement-no': "No",
+    'pisell2.booking.info.resource.warning-title': "Resource Loading Failed",
+    'pisell2.booking.info.resource.warning-content': "Failed to load resources due to network issues. You may click 'Retry' to attempt reloading. Otherwise, only normal products can be checkout.",
+    'pisell2.booking.info.resource.retry': "Retry",
     'pisell2.text.open.items': 'Open items',
     'pisell2.text.cart.of': function pisell2TextCartOf(val) {
       return "Cart of ".concat(val);
@@ -454,6 +458,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u95F4\u5DF2\u7EA6\u6EE1\uFF0C\u4F46\u60A8\u7684\u56E2\u961F\u6210\u5458\u4ECD\u7136\u53EF\u4EE5\u9884\u7EA6\u3002");
     },
+    'pisell1.text.resource-error-message-unbound': '该预约商品未关联目标资源。',
     'pisell2.text.flexible': "灵活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',
@@ -580,6 +585,9 @@ export default {
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
+    'pisell2.booking.info.resource.warning-title': "资源加载失败",
+    'pisell2.booking.info.resource.warning-content': "由于网络原因, 获取资源失败! 您可以点击“重试”尝试重新加载, 否则只可以下单普通商品。",
+    'pisell2.booking.info.resource.retry': "重试",
     'pisell2.text.open.items': '公共购物车',
     'pisell2.text.cart.of': function pisell2TextCartOf(val) {
       return "".concat(val, "\u7684\u8D2D\u7269\u8F66");
@@ -772,6 +780,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u9593\u5DF2\u7D04\u6EFF\uFF0C\u4F46\u60A8\u7684\u5718\u968A\u6210\u54E1\u4ECD\u7136\u53EF\u4EE5\u9810\u7D04\u3002");
     },
+    'pisell1.text.resource-error-message-unbound': '該預約商品未關聯目標資源。',
     'pisell2.text.flexible': "靈活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',
@@ -898,6 +907,9 @@ export default {
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
+    'pisell2.booking.info.resource.warning-title': "資源載入失敗",
+    'pisell2.booking.info.resource.warning-content': "由於網路問題，無法取得資源！您可以點擊「重試」重新載入，否則僅能訂購一般商品。",
+    'pisell2.booking.info.resource.retry': "重試",
     'pisell2.text.open.items': '公共購物車',
     'pisell2.text.cart.of': function pisell2TextCartOf(val) {
       return "".concat(val, "\u7684\u8CFC\u7269\u8ECA");

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -38,6 +38,7 @@ export interface FormState {
         services: any[];
         resources: any[];
         resourcesOrigin: any[];
+        reloadResourceModal: false;
         value: any[];
         cacheItem: any;
         edit: boolean;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/es/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -5,7 +5,8 @@ export declare enum EftposEnum {
     Tyro = "tyro",
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
-    Stripe = "stripe"
+    Stripe = "stripe",
+    Linkly = "linkly"
 }
 export declare enum StatusEnum {
     Loading = "loading",
@@ -147,6 +148,8 @@ export declare enum PayStatus {
     'Success' = "200",
     /** 未生成交易记录 */
     'NoPay' = "4004",
+    /** 配对失效 */
+    'PairingFailure' = "606020",
     /** 支付失败 */
     'Unknown' = "701000",
     /** 交易请求超时 */

package/es/components/eftposPay/const.js

@@ -3,8 +3,9 @@ export var EftposEnum = /*#__PURE__*/function (EftposEnum) {
   EftposEnum["Tyro"] = "tyro";
   EftposEnum["Windcave"] = "windcave";
   EftposEnum["Stripe"] = "stripe";
+  EftposEnum["Linkly"] = "linkly";
   return EftposEnum;
-}({}); // Eftpos = 'eftpos',
+}({});
 export var StatusEnum = /*#__PURE__*/function (StatusEnum) {
   StatusEnum["Loading"] = "loading";
   StatusEnum["Warn"] = "warn";
@@ -64,6 +65,7 @@ export var PayRouteEnum = /*#__PURE__*/function (PayRouteEnum) {
 export var PayStatus = /*#__PURE__*/function (PayStatus) {
   PayStatus["Success"] = "200";
   PayStatus["NoPay"] = "4004";
+  PayStatus["PairingFailure"] = "606020";
   PayStatus["Unknown"] = "701000";
   PayStatus["Timeout"] = "701001";
   PayStatus["PayOtherEftposFailed"] = "701003";

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/hooks.js

@@ -139,6 +139,7 @@ export var useFail = function useFail(index) {
       return;
     }
     var code = "".concat(res.code);
+    console.log('code---->>>>>>>', code);
     if (code === PayStatus.Unknown) {
       // 前往报错页 不可标记
       steps[index].title = locales.getText('page.eftpos-pay.text.failed')(modeRef.current);
@@ -224,6 +225,7 @@ export var useFail = function useFail(index) {
         dispatch(updateComponent('Fail'));
         return;
       }
+
       // 重新支付 最多到重新发起2次
       ref.current += 1;
       dispatch(updateState({
@@ -300,7 +302,7 @@ export var useFail = function useFail(index) {
       }));
       return;
     }
-    if (code === PayStatus.UserConfigError) {
+    if (code === PayStatus.UserConfigError || code === PayStatus.PairingFailure) {
       // 前往错误页  不可标记状态
       steps[index].title = locales.getText('page.eftpos-pay.text.transaction.user.config.title');
       steps[index].fail = locales.getText('page.eftpos-pay.text.transaction.user.config.text');

package/es/components/eftposPay/index.js

@@ -163,7 +163,7 @@ export default (function (props) {
   }, [mode, state]);
   useEffect(function () {
     document.body.id = 'body';
-    console.log('初始化 ........11221801');
+    console.log('初始化 ........112218017777');
   }, []);
 
   // console.log('action = ', action);

package/es/components/eftposPay/linkly/const.d.ts

@@ -0,0 +1,23 @@
+import { State } from '../store';
+import { ModeEnum } from '../const';
+export declare const getStep: (mode?: ModeEnum) => State['steps'];
+declare const _default: (params: any) => State;
+export default _default;
+export declare enum EVisibleButtonType {
+    /** 取消按钮 */
+    CancelButton = "CancelButton",
+    /** 等待按钮 */
+    WaitButton = "WaitButton"
+}
+export declare enum LinklyActionStatus {
+    /** 空 */
+    Empty = "Empty",
+    /** 取消 */
+    Cancel = "Cancel",
+    /** 取消中 */
+    CancelWaiting = "CancelWaiting",
+    /** 签名 */
+    Signature = "Signature",
+    /** 签名等待中 */
+    SignatureWaiting = "SignatureWaiting"
+}

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

@@ -0,0 +1,82 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net", "client"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; }
+import { locales } from '@pisell/utils';
+import { ClientEnum, EftposEnum, ModeEnum, PayRouteEnum, StatusEnum } from "../const";
+export var getStep = function getStep() {
+  var mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ModeEnum.Pay;
+  return [{
+    key: Date.now(),
+    title: locales.getText('page.eftpos-pay.text.loading')(mode),
+    // 'Payment in  process...',
+    text: locales.getText('page.eftpos-pay.text.waiting.processing'),
+    // 'Waiting for the processing...',
+    warn: '',
+    tip: locales.getText('page.eftpos-pay.text.processing'),
+    // 'processing...',
+    status: StatusEnum.Loading
+  }];
+};
+export default (function (params) {
+  var _ref = params || {
+      mode: ModeEnum.Pay
+    },
+    order_id = _ref.order_id,
+    name = _ref.name,
+    symbol = _ref.symbol,
+    amount = _ref.amount,
+    mode = _ref.mode,
+    number = _ref.number,
+    pay = _ref.pay,
+    device = _ref.device,
+    net = _ref.net,
+    client = _ref.client,
+    other = _objectWithoutProperties(_ref, _excluded);
+  console.log('params =>>>>>> ', params);
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    order_id: order_id,
+    name: name,
+    symbol: symbol,
+    amount: amount,
+    mode: mode,
+    eftpos: EftposEnum.Linkly,
+    key: Date.now(),
+    step: 0,
+    type: PayRouteEnum.Step,
+    title: locales.getText('page.eftpos-pay.text.loading')(mode),
+    component: '',
+    status: StatusEnum.Loading,
+    steps: getStep(mode),
+    render: true,
+    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    warn: '',
+    custom: other || {}
+  }, typeof net !== 'undefined' ? {
+    net: net
+  } : {}), typeof number !== 'undefined' ? {
+    number: number
+  } : {}), typeof pay !== 'undefined' ? {
+    pay: pay
+  } : {}), typeof device !== 'undefined' ? {
+    device: device
+  } : {});
+});
+export var EVisibleButtonType = /*#__PURE__*/function (EVisibleButtonType) {
+  EVisibleButtonType["CancelButton"] = "CancelButton";
+  EVisibleButtonType["WaitButton"] = "WaitButton";
+  return EVisibleButtonType;
+}({});
+export var LinklyActionStatus = /*#__PURE__*/function (LinklyActionStatus) {
+  LinklyActionStatus["Empty"] = "Empty";
+  LinklyActionStatus["Cancel"] = "Cancel";
+  LinklyActionStatus["CancelWaiting"] = "CancelWaiting";
+  LinklyActionStatus["Signature"] = "Signature";
+  LinklyActionStatus["SignatureWaiting"] = "SignatureWaiting";
+  return LinklyActionStatus;
+}({});

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

@@ -0,0 +1,2 @@
+export * from './normal';
+export * from './useTimeQuery';

package/es/components/eftposPay/linkly/hooks/index.js

@@ -0,0 +1,2 @@
+export * from "./normal";
+export * from "./useTimeQuery";

package/es/components/eftposPay/linkly/hooks/normal.d.ts

@@ -0,0 +1,30 @@
+/**
+ * 支付或退款
+ * @param failAction 失败回调
+ */
+export declare const useLinklyPayOrRefund: (handleCheck: () => boolean) => {
+    action: {
+        pay: import("ahooks/lib/useRequest/src/types").Result<any, [data: any]>;
+    };
+    payOrRefund: (resultQuery: any, handleLinklySuccess: any) => void;
+};
+/**
+ * @title: 取消支付或退款
+ * @description: 取消支付或退款调用接口后不管成功还是失败都需要调用支付查询接口
+ */
+export declare const useLinklyCancel: (handleCheck: () => boolean) => {
+    action: {
+        cancel: import("ahooks/lib/useRequest/src/types").Result<any, [param: any]>;
+    };
+    linklyCancel: (resultQuery: any) => void;
+};
+/**
+ * @title: 支付或退款签名
+ * @description: 支付或退款签名调用接口后不管成功还是失败都需要调用支付查询接口
+ */
+export declare const useLinklySignature: (handleCheck: () => boolean) => {
+    action: {
+        signature: import("ahooks/lib/useRequest/src/types").Result<any, [param: any]>;
+    };
+    linklySignature: (status: number, resultQuery: any) => void;
+};