@pisell/private-materials 3.0.186 → 3.0.187

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

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

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -186,9 +186,15 @@ export var checkEnrollment = /*#__PURE__*/function () {
           _yield$request$getReq = _context2.sent;
           data = _yield$request$getReq.data;
           setPayNumber(orderId, data === null || data === void 0 ? void 0 : data.pay_number);
+          if (data !== null && data !== void 0 && data.pay_info) {
+            _context2.next = 8;
+            break;
+          }
+          return _context2.abrupt("return", null);
+        case 8:
           return _context2.abrupt("return", data);
-        case 9:
-          _context2.prev = 9;
+        case 11:
+          _context2.prev = 11;
           _context2.t0 = _context2["catch"](0);
           // 记录卡失败的原因
           log({
@@ -208,11 +214,11 @@ export var checkEnrollment = /*#__PURE__*/function () {
           });
           console.log('error', _context2.t0);
           return _context2.abrupt("return", 0);
-        case 17:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 9]]);
+    }, _callee2, null, [[0, 11]]);
   }));
   return function checkEnrollment(_x3, _x4, _x5) {
     return _ref3.apply(this, arguments);

package/es/components/pisellSelectCustomerModal/RightPanel/index.js

@@ -80,12 +80,14 @@ var RightPanel = function RightPanel(props) {
     if (page === 'list') {
       return /*#__PURE__*/React.createElement("div", {
         className: "select-customer-right-panel-header"
-      }, /*#__PURE__*/React.createElement("span", null, phone ? locales.getText('pisell2.text.result-found') : locales.getText('pisell2.text.personnel-list')), /*#__PURE__*/React.createElement(PlusCircle, {
-        className: "select-customer-right-panel-header-icon",
+      }, /*#__PURE__*/React.createElement("span", null, phone ? locales.getText('pisell2.text.result-found') : locales.getText('pisell2.text.personnel-list')), /*#__PURE__*/React.createElement("span", {
+        className: "select-customer-right-panel-header-create-btn",
         onClick: function onClick() {
           setPage('create');
         }
-      }));
+      }, /*#__PURE__*/React.createElement(PlusCircle, {
+        className: "select-customer-right-panel-header-icon"
+      }), locales.getText('pisell2.text.create')));
     }
     return /*#__PURE__*/React.createElement("div", {
       className: classNames('select-customer-right-panel-header', {

package/es/components/pisellSelectCustomerModal/RightPanel/index.less

@@ -25,6 +25,13 @@
       justify-content: flex-start;
     }
 
+    .select-customer-right-panel-header-create-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+    }
+
     .select-customer-right-panel-header-icon {
       display: flex;
       align-items: center;

package/es/components/pisellSelectCustomerModal/index.js

@@ -146,6 +146,10 @@ var PisellSelectCustomerModal = function PisellSelectCustomerModal(props) {
 
   // 动态计算input的字体大小
   var adjustFontSize = useMemo(function () {
+    // 没有内容固定位30px,  因为placeholder的字体大小是30px 太大会展示不全
+    if (!phone) {
+      return 30;
+    }
     var maxFontSize = 60; // 最大字体大小
     var minFontSize = 10; // 最小字体大小
     var defaultFontSize = maxFontSize;
@@ -194,10 +198,12 @@ var PisellSelectCustomerModal = function PisellSelectCustomerModal(props) {
         onChange: function onChange(e) {
           setPhone(e.target.value);
         },
+        placeholder: locales.getText('pisell2.text.search-customer-by-phone-number'),
         style: {
           textAlign: 'left',
           fontSize: adjustFontSize
-        }
+        },
+        className: 'pisell-select-customer-modal-input'
       }, virtualKeyInputProps),
       rightPanel: /*#__PURE__*/React.createElement(RightPanel, {
         value: _value,

package/es/components/pisellSelectCustomerModal/index.less

@@ -13,4 +13,10 @@ body {
       display: none;
     }
   }
+}
+
+.pisell-select-customer-modal-input {
+  &::placeholder {
+    font-size: 30px;
+  }
 }

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

@@ -22,6 +22,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.load-more': string;
         'pisell2.text.add-client.confirm': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -46,6 +48,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -70,6 +74,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
 };
 export default _default;

package/es/components/pisellSelectCustomerModal/locales.js

@@ -21,7 +21,9 @@ export default {
     'pisell2.text.result-found': 'Result found',
     'pisell2.text.personnel-list': 'Personnel list',
     'pisell2.text.load-more': 'Load more',
-    'pisell2.text.add-client.confirm': 'Fill in at least one name, phone number and email address'
+    'pisell2.text.add-client.confirm': 'Fill in at least one name, phone number and email address',
+    'pisell2.text.search-customer-by-phone-number': 'Search by phone number',
+    'pisell2.text.create': 'Create'
   },
   'zh-CN': {
     'pisell2.text.leave-empty-for-walk-in': '未选择表示 Walk-In',
@@ -45,7 +47,9 @@ export default {
     'pisell2.text.result-found': '搜索结果',
     'pisell2.text.personnel-list': '客户列表',
     'pisell2.text.add-client.confirm': '姓名,电话,邮箱至少填一个',
-    'pisell2.text.load-more': '加载更多'
+    'pisell2.text.load-more': '加载更多',
+    'pisell2.text.search-customer-by-phone-number': '输入手机号搜索客户',
+    'pisell2.text.create': '创建'
   },
   'zh-HK': {
     'pisell2.text.leave-empty-for-walk-in': '未選擇表示 Walk-In',
@@ -69,6 +73,8 @@ export default {
     'pisell2.text.result-found': '搜索結果',
     'pisell2.text.personnel-list': '客戶列表',
     'pisell2.text.add-client.confirm': '姓名，電話，郵箱至少填一個',
-    'pisell2.text.load-more': '加載更多'
+    'pisell2.text.load-more': '加載更多',
+    'pisell2.text.search-customer-by-phone-number': '輸入手機號搜索客戶',
+    'pisell2.text.create': '創建'
   }
 };

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/addons/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/forms/model.d.ts

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

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

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -134,6 +134,9 @@ var checkEnrollment = async (orderId, cardInfo, callback) => {
       ...cardInfo
     });
     (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    if (!(data == null ? void 0 : data.pay_info)) {
+      return null;
+    }
     return data;
   } catch (err) {
     log({

package/lib/components/pisellSelectCustomerModal/RightPanel/index.js

@@ -87,13 +87,15 @@ var RightPanel = (props) => {
   const header = (0, import_react.useMemo)(() => {
     if (page === "list") {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "select-customer-right-panel-header" }, /* @__PURE__ */ import_react.default.createElement("span", null, phone ? import_utils2.locales.getText("pisell2.text.result-found") : import_utils2.locales.getText("pisell2.text.personnel-list")), /* @__PURE__ */ import_react.default.createElement(
-        import_PlusCircle.default,
+        "span",
         {
-          className: "select-customer-right-panel-header-icon",
+          className: "select-customer-right-panel-header-create-btn",
           onClick: () => {
             setPage("create");
           }
-        }
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "select-customer-right-panel-header-icon" }),
+        import_utils2.locales.getText("pisell2.text.create")
       ));
     }
     return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pisellSelectCustomerModal/RightPanel/index.less

@@ -25,6 +25,13 @@
       justify-content: flex-start;
     }
 
+    .select-customer-right-panel-header-create-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+    }
+
     .select-customer-right-panel-header-icon {
       display: flex;
       align-items: center;

package/lib/components/pisellSelectCustomerModal/index.js

@@ -154,6 +154,9 @@ var PisellSelectCustomerModal = (props) => {
     document.body.id = "body";
   }, []);
   const adjustFontSize = (0, import_react.useMemo)(() => {
+    if (!phone) {
+      return 30;
+    }
     const maxFontSize = 60;
     const minFontSize = 10;
     const defaultFontSize = maxFontSize;
@@ -197,10 +200,14 @@ var PisellSelectCustomerModal = (props) => {
             onChange: (e) => {
               setPhone(e.target.value);
             },
+            placeholder: import_utils.locales.getText(
+              "pisell2.text.search-customer-by-phone-number"
+            ),
             style: {
               textAlign: "left",
               fontSize: adjustFontSize
             },
+            className: "pisell-select-customer-modal-input",
             ...virtualKeyInputProps
           },
           rightPanel: /* @__PURE__ */ import_react.default.createElement(import_RightPanel.default, { value: _value, phone, onChange: _onChange }),

package/lib/components/pisellSelectCustomerModal/index.less

@@ -13,4 +13,10 @@ body {
       display: none;
     }
   }
+}
+
+.pisell-select-customer-modal-input {
+  &::placeholder {
+    font-size: 30px;
+  }
 }

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

@@ -22,6 +22,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.load-more': string;
         'pisell2.text.add-client.confirm': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -46,6 +48,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -70,6 +74,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
 };
 export default _default;

package/lib/components/pisellSelectCustomerModal/locales.js

@@ -45,7 +45,9 @@ var locales_default = {
     "pisell2.text.result-found": "Result found",
     "pisell2.text.personnel-list": "Personnel list",
     "pisell2.text.load-more": "Load more",
-    "pisell2.text.add-client.confirm": "Fill in at least one name, phone number and email address"
+    "pisell2.text.add-client.confirm": "Fill in at least one name, phone number and email address",
+    "pisell2.text.search-customer-by-phone-number": "Search by phone number",
+    "pisell2.text.create": "Create"
   },
   "zh-CN": {
     "pisell2.text.leave-empty-for-walk-in": "未选择表示 Walk-In",
@@ -69,7 +71,9 @@ var locales_default = {
     "pisell2.text.result-found": "搜索结果",
     "pisell2.text.personnel-list": "客户列表",
     "pisell2.text.add-client.confirm": "姓名,电话,邮箱至少填一个",
-    "pisell2.text.load-more": "加载更多"
+    "pisell2.text.load-more": "加载更多",
+    "pisell2.text.search-customer-by-phone-number": "输入手机号搜索客户",
+    "pisell2.text.create": "创建"
   },
   "zh-HK": {
     "pisell2.text.leave-empty-for-walk-in": "未選擇表示 Walk-In",
@@ -93,6 +97,8 @@ var locales_default = {
     "pisell2.text.result-found": "搜索結果",
     "pisell2.text.personnel-list": "客戶列表",
     "pisell2.text.add-client.confirm": "姓名，電話，郵箱至少填一個",
-    "pisell2.text.load-more": "加載更多"
+    "pisell2.text.load-more": "加載更多",
+    "pisell2.text.search-customer-by-phone-number": "輸入手機號搜索客戶",
+    "pisell2.text.create": "創建"
   }
 };

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

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