@pisell/private-materials 6.2.48 → 6.2.50

package/es/components/pinVerifyModal/index.less

@@ -0,0 +1,92 @@
+.pin-verify-modal-content {
+  width: 100%;
+  height: 100%;
+  padding-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 16px;
+
+  &-user {
+    min-width: 300px;
+    min-height: 60px;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    border-radius: 8px;
+    border: 1px solid #d0d5dd;
+
+    &-avatar {
+      width: 42px;
+      height: 42px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 50%;
+      overflow: hidden;
+
+      &-img {
+        width: 100%;
+      }
+    }
+
+    &-right {
+      display: flex;
+      flex-direction: column;
+      gap: 4px;
+
+      &-name {
+        font-size: 16px;
+        font-weight: 600;
+        color: #101828;
+      }
+
+      &-wallet {
+        color: #667085;
+        font-size: 14px;
+        font-weight: 400;
+      }
+    }
+  }
+
+  &-keyboard {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+
+    &-title {
+      text-align: center;
+      color: #101828;
+      font-size: 16px;
+      font-weight: 500;
+    }
+
+    &-desc {
+      color: #667085;
+      font-size: 16px;
+      font-weight: 400;
+    }
+  }
+
+  .virtual-keyboard-input-wrap {
+    height: 45px !important;
+  }
+
+  .virtual-keyboard-wrap .virtual-keyboard-content .virtual-keyboard-item {
+    padding-top: 50px !important;
+  }
+
+  .virtual-keyboard-wrap
+    .virtual-keyboard-content
+    .virtual-keyboard-item
+    .virtual-keyboard-item-button {
+    padding: 0 !important;
+  }
+
+  .virtual-keyboard-input-delete {
+    font-size: 30px;
+    color: #000;
+  }
+}

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

@@ -0,0 +1,24 @@
+declare const _default: {
+    en: {
+        'pisell2.pin.verify.modal.title': string;
+        'pisell2.pin.verify.modal.wallet': string;
+        'pisell2.pin.verify.modal.keyboard.title': string;
+        'pisell2.pin.verify.modal.keyboard.desc': string;
+        'pisell2.pin.verify.modal.keyboard.verify': string;
+    };
+    'zh-CN': {
+        'pisell2.pin.verify.modal.title': string;
+        'pisell2.pin.verify.modal.wallet': string;
+        'pisell2.pin.verify.modal.keyboard.title': string;
+        'pisell2.pin.verify.modal.keyboard.desc': string;
+        'pisell2.pin.verify.modal.keyboard.verify': string;
+    };
+    'zh-HK': {
+        'pisell2.pin.verify.modal.title': string;
+        'pisell2.pin.verify.modal.wallet': string;
+        'pisell2.pin.verify.modal.keyboard.title': string;
+        'pisell2.pin.verify.modal.keyboard.desc': string;
+        'pisell2.pin.verify.modal.keyboard.verify': string;
+    };
+};
+export default _default;

package/es/components/pinVerifyModal/locales.js

@@ -0,0 +1,23 @@
+export default {
+  en: {
+    'pisell2.pin.verify.modal.title': 'Wallet Verification',
+    'pisell2.pin.verify.modal.wallet': 'Wallet : ',
+    'pisell2.pin.verify.modal.keyboard.title': 'Enter the 4-digit PIN to continue',
+    'pisell2.pin.verify.modal.keyboard.desc': 'Remaining attempts : ',
+    'pisell2.pin.verify.modal.keyboard.verify': 'Verify'
+  },
+  'zh-CN': {
+    'pisell2.pin.verify.modal.title': '钱包验证',
+    'pisell2.pin.verify.modal.wallet': '钱包 : ',
+    'pisell2.pin.verify.modal.keyboard.title': '请输入该钱包的4位PIN码以继续',
+    'pisell2.pin.verify.modal.keyboard.desc': '剩余验证次数 : ',
+    'pisell2.pin.verify.modal.keyboard.verify': '验证'
+  },
+  'zh-HK': {
+    'pisell2.pin.verify.modal.title': '錢包驗證',
+    'pisell2.pin.verify.modal.wallet': '錢包 : ',
+    'pisell2.pin.verify.modal.keyboard.title': '請輸入該錢包的4位PIN碼以繼續',
+    'pisell2.pin.verify.modal.keyboard.desc': '剩餘驗證次數 : ',
+    'pisell2.pin.verify.modal.keyboard.verify': '驗證'
+  }
+};

package/es/components/pinVerifyModal/types.d.ts

@@ -0,0 +1,33 @@
+export interface PinVerifyModalProps {
+    onOpen?: () => void;
+    onClose?: () => void;
+    onSuccess?: (params?: VerifyPinSuccessParams) => void;
+}
+export interface PinVerifyModalRef {
+    open: (params: ModalParams) => void;
+    close: () => void;
+}
+export interface ModalParams {
+    wallet_code: string;
+    wallet_detail_id: string | number;
+    failed_count?: number;
+    check_max_count?: number;
+    customer?: {
+        display_name?: string;
+        nickname?: string;
+        cover?: string;
+    };
+}
+export interface VerifyInfo {
+    remaining_count?: number;
+    failed_count?: number;
+    check_max_count?: number;
+}
+export declare type TVerifyPin = (data: {
+    wallet_detail_id: string | number;
+    pin: string;
+}, onSuccess: (params: VerifyPinSuccessParams) => void) => void;
+export interface VerifyPinSuccessParams {
+    customer_id: string | number;
+    customer_pin_key: string;
+}

package/es/components/pinVerifyModal/types.js

@@ -0,0 +1 @@
+export {};

package/es/components/ruleSetting/locales.js

@@ -11,7 +11,7 @@ export default {
     'pisell2.text.rule-setting.sales_channel': "Operation platform",
     'pisell2.text.rule-setting.staff': "Staff",
     'pisell2.text.rule-setting.payment_method': "Payment method",
-    'pisell2.text.rule-setting.pisell_terminal_device': "Pisell terminal device",
+    'pisell2.text.rule-setting.pisell_terminal_device': "Terminal device",
     'pisell2.text.rule-setting.current_device': "Current device"
   },
   'zh-CN': {
@@ -26,7 +26,7 @@ export default {
     'pisell2.text.rule-setting.sales_channel': "操作平台",
     'pisell2.text.rule-setting.staff': "员工",
     'pisell2.text.rule-setting.payment_method': "支付方式",
-    'pisell2.text.rule-setting.pisell_terminal_device': "Pisell终端",
+    'pisell2.text.rule-setting.pisell_terminal_device': "终端",
     'pisell2.text.rule-setting.current_device': "当前设备"
   },
   'zh-HK': {
@@ -41,7 +41,7 @@ export default {
     'pisell2.text.rule-setting.sales_channel': "操作平台",
     'pisell2.text.rule-setting.staff': "員工",
     'pisell2.text.rule-setting.payment_method': "支付方式",
-    'pisell2.text.rule-setting.pisell_terminal_device': "Pisell終端",
+    'pisell2.text.rule-setting.pisell_terminal_device': "終端",
     'pisell2.text.rule-setting.current_device': "當前設備"
   }
 };

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,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -23,7 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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 React, { useEffect, useMemo, useRef, useState } from 'react';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { message } from 'antd';
 import { Iconfont } from '@pisell/materials';
 import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
@@ -48,6 +48,7 @@ import { getBookingType } from "../bookingDataPanel/bookingList/utils";
 import { useCustomer } from "../../hooks/pisellos";
 import useScanManager from "../../hooks/pisellos/useScanManager";
 import { useShopDiscount } from "../../../appointmentBooking/hooks";
+import { useDebounceFn } from 'ahooks';
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -266,8 +267,56 @@ var TicketBooking = function TicketBooking() {
       closeScan();
     };
   }, []);
+  var _useDebounceFn = useDebounceFn(function (type, orderId) {
+      // 支付成功后清空状态
+      try {
+        var _store$getState;
+        _initFn(function () {});
+        setState({
+          createCount: state.createCount + 1
+        });
+        sendWarningLog({
+          title: '清空购物车',
+          content: [{
+            key: '店铺id',
+            value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
+          }, {
+            key: '订单id',
+            value: orderId
+          }, {
+            key: '类型',
+            value: type
+          }]
+        });
+      } catch (err) {
+        var _store$getState2;
+        sendWarningLog({
+          title: '清空购物车失败',
+          content: [{
+            key: '店铺id',
+            value: store === null || store === void 0 || (_store$getState2 = store.getState) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.call(store)) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.global) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.globalConfig) === null || _store$getState2 === void 0 ? void 0 : _store$getState2.id
+          }, {
+            key: '订单id',
+            value: orderId
+          }, {
+            key: '类型',
+            value: type
+          }, {
+            key: 'error',
+            value: err === null || err === void 0 ? void 0 : err.message
+          }]
+        });
+      }
+    }, {
+      wait: 500,
+      leading: true,
+      trailing: false
+    }),
+    clearAllCart = _useDebounceFn.run;
   useEffect(function () {
-    var _store$getState, _interaction$utils, _interaction$utils2;
+    var _store$getState3, _interaction$utils, _interaction$utils2;
+    // bellaswonderland.mypisell.com localStorage可能满了
+    localStorage.removeItem('bookingResourceList');
     _persistentRef.current = storage.get("drawer-booking") === 'true' ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(_this);
@@ -293,7 +342,7 @@ var TicketBooking = function TicketBooking() {
       });
     });
     setState({
-      amountSymbol: (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 ? void 0 : _store$getState.symbol) || '$'
+      amountSymbol: (store === null || store === void 0 || (_store$getState3 = store.getState) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.call(store)) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.global) === null || _store$getState3 === void 0 ? void 0 : _store$getState3.symbol) || '$'
     }, function () {
       _initStateRef.current = JSON.parse(JSON.stringify(state));
       _getBoardConfig();
@@ -305,6 +354,7 @@ var TicketBooking = function TicketBooking() {
       console.log('bookingTicket.clearAllCart');
       // 支付成功后清空状态
       _initFn(function () {});
+      _setIntervalTime(true);
       selectCustomer(null);
       enableAllScanListeners();
       shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
@@ -511,8 +561,8 @@ var TicketBooking = function TicketBooking() {
     }, 100);
   };
   var _setShopOpeningHours = function _setShopOpeningHours() {
-    var _store$getState2;
-    var time = store === null || store === void 0 || (_store$getState2 = store.getState) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.call(store)) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.global) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.shopDetail) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.operating_day_boundary) === null || _store$getState2 === void 0 ? void 0 : _store$getState2.time;
+    var _store$getState4;
+    var time = store === null || store === void 0 || (_store$getState4 = store.getState) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.call(store)) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.global) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.shopDetail) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.operating_day_boundary) === null || _store$getState4 === void 0 ? void 0 : _store$getState4.time;
     if (time) {
       localStorage.setItem('shopOpeningHours', time);
     }
@@ -531,11 +581,10 @@ var TicketBooking = function TicketBooking() {
             });
           case 2:
             data = _context.sent;
-            console.log('wwww', data);
             setState({
               addTimeProducts: (data === null || data === void 0 ? void 0 : data.list) || []
             });
-          case 5:
+          case 4:
           case "end":
             return _context.stop();
         }
@@ -700,9 +749,9 @@ var TicketBooking = function TicketBooking() {
         // 储存参数, 添加服务商品时使用
         sessionStorage.setItem('pisell2.booking.serviceParams', JSON.stringify(data));
       } else {
-        var _store$getState3;
+        var _store$getState5;
         // 当前时区的时间
-        var timezone = store === null || store === void 0 || (_store$getState3 = store.getState) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.call(store)) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.global) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.globalConfig) === null || _store$getState3 === void 0 ? void 0 : _store$getState3.timezone;
+        var timezone = store === null || store === void 0 || (_store$getState5 = store.getState) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.call(store)) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.global) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.globalConfig) === null || _store$getState5 === void 0 ? void 0 : _store$getState5.timezone;
         initState.modalState.date.value = dayjs.tz(new Date(), timezone);
         // 兜底, 没有传递则清空下
         sessionStorage.removeItem('pisell2.booking.serviceParams');
@@ -901,7 +950,6 @@ var TicketBooking = function TicketBooking() {
       isShowDeposit: state.isShowDeposit,
       disableEventBookingEdit: state.disableEventBookingEdit,
       list: state.list,
-      intervalSetTime: state.intervalSetTime,
       createCount: state.createCount,
       bookingFunctions: state.bookingFunctions,
       isParallelResourcesBooking: state.isParallelResourcesBooking

package/es/components/ticketBooking/components/timeBar/index.js

@@ -9,6 +9,7 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
 import { useMemoizedFn } from 'ahooks';
 import { Button } from 'antd';
+import dayjs from 'dayjs';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
@@ -54,7 +55,7 @@ var TimeBar = function TimeBar(props) {
     setGlobalState({
       isTimeChange: true
     });
-    (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, false);
+    (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, timeString === dayjs().format('HH:mm'));
   });
   return useMemo(function () {
     var _state$modalState4, _state$modalState5;

package/es/components/ticketBooking/utils/index.d.ts

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "wallet" | "walletPass" | "product" | "local_product" | "customer";
     data: any;
     scanCode: string;
 } | null;