@pisell/private-materials 3.0.69 → 3.0.70

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

@@ -34,7 +34,7 @@ import { locales, getUniqueId } from "@pisell/utils";
 import { useUpdateEffect } from "ahooks";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080];
 var Info = function Info() {
-  var _state$service3, _state$service4, _state$service4$cache;
+  var _state$service3, _state$service5, _state$service6, _state$service6$cache;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -275,17 +275,18 @@ var Info = function Info() {
     return state.service.value.length > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
     // Salonip 不要这个
 
     if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id)) {
       return;
     }
+
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking") {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) === 0) {
       handleSelectService();
     }
-  }, [state.modalOpen, state.bookingId]);
+  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -325,7 +326,7 @@ var Info = function Info() {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : _state$service4$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : _state$service6$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true

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

@@ -29,12 +29,13 @@ import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn } from "ahooks";
+// import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getErrorList, getServiceTimes, deleteCacheParams } from "../../../utils";
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -540,6 +541,7 @@ var Info = function Info() {
   useEffect(function () {
     getResourcesData();
   }, [state.date.value]);
+  var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     zIndex: 1000,
     forceRender: true,
@@ -642,9 +644,22 @@ var Info = function Info() {
     rules: [{
       required: true
     }]
-  }, /*#__PURE__*/React.createElement(Select, {
-    size: "large"
-  }, renderOptions(timeObj.timeSlices)))), /*#__PURE__*/React.createElement(Col, {
+  }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
+    slice: (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 ? void 0 : (_state$bookingConfig6 = _state$bookingConfig5.config) === null || _state$bookingConfig6 === void 0 ? void 0 : (_state$bookingConfig7 = _state$bookingConfig6.basic) === null || _state$bookingConfig7 === void 0 ? void 0 : (_state$bookingConfig8 = _state$bookingConfig7.service_time) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.value,
+    onChange: function onChange(e) {
+      console.log("eeee", e);
+    },
+    timePickerProps: {
+      style: {
+        width: "100%"
+      }
+    },
+    timeProps: {
+      style: {
+        zoom: 0.8
+      }
+    }
+  }) : null)), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText("pisell2.text.duration"),

package/es/components/booking/locales.js

@@ -131,23 +131,23 @@ export default {
     'pisell2.text.add-contacts': 'Add contact',
     'pisell2.text.edit-profile': 'Edit profile',
     'pisell2.text.remove-contact': 'Remove contact',
-    'pisell2.text.order.sales.channel.online': "Online Store",
-    'pisell2.text.order.sales.channel.pos-terminal': "Pisell Terminal",
+    'pisell2.text.order.sales.channel.online': "Online store",
+    'pisell2.text.order.sales.channel.pos-terminal': "Pisell terminal",
     'pisell2.text.order.sales.channel.boxcocal': "Boxlocal",
-    'pisell2.text.order.sales.channel.tableorder': "Table Order",
-    'pisell2.text.order.sales.channel.reserve': "Google Reservation",
+    'pisell2.text.order.sales.channel.tableorder': "Table order",
+    'pisell2.text.order.sales.channel.reserve': "Google reservation",
     'pisell2.text.rebook': "Rebook",
     'pisell2.text.now': 'Now',
-    'pisell2.text.deposit-list': "Deposit List",
+    'pisell2.text.deposit-list': "Deposit list",
     'pisell2.text.deposit-item-status-paid': "Paid",
     'pisell2.text.deposit-item-status-unpaid': "Unpaid",
-    'pisell2.text.deposit-order-total': "Order Total",
-    'pisell2.text.deposit-order-detail': "Order Details",
-    'pisell2.text.deposit-collect-deposit': "Collect Deposit",
+    'pisell2.text.deposit-order-total': "Order total",
+    'pisell2.text.deposit-order-detail': "Order details",
+    'pisell2.text.deposit-collect-deposit': "Collect deposit",
     'pisell2.text.deposit-order-no': "Order No",
     'pisell2.text.deposit-amount': "Amount",
-    'pisell2.text.deposit-deposit-amount': "Deposit Amount",
-    'pisell2.text.deposit-generate-payment-link': "Generate Payment Link",
+    'pisell2.text.deposit-deposit-amount': "Deposit amount",
+    'pisell2.text.deposit-generate-payment-link': "Generate payment link",
     'pisell2.text.deposit-list-empty': "Please add a deposit",
     'pisell2.text.deposit-amount-message': "Amount must be greater than 0",
     'pisell2.text.deposit-amount-message2': "The deposit amount cannot be greater than the total order amount",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -91,7 +90,7 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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: (props: any) => JSX.Element;
 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/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: (props: any) => JSX.Element;
 export default Payments;

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

@@ -87,12 +87,6 @@ var Payments = Provider(function (props) {
   useEffect(function () {
     if (state.bookingDetail) {
       init();
-      state.action({
-        type: "pisell1.registerPlugin",
-        data: {
-          pluginList: ["RefundPlugin"]
-        }
-      });
     }
   }, [state.bookingDetail]);
   var getRefundInfo = /*#__PURE__*/function () {

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/booking/utils.js

@@ -576,7 +576,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
       // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
-      _extend.start_time = 'now';
+      _extend.start_time = dayjs().format('HH:mm');
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);

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

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => any;
+declare const Addons: (props: any) => JSX.Element;
 export default Addons;

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) => (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/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, source }: any) => React.JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => React.JSX.Element | null;
 export default FooterMenus;

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

@@ -35,27 +35,7 @@ module.exports = __toCommonJS(FooterMenus_exports);
 var import_react = __toESM(require("react"));
 var import_menuButton = __toESM(require("../../../components/menuButton"));
 var import_index = require("./index.less");
-var import_utils = require("@pisell/utils");
-var FooterMenus = ({ state, source }) => {
-  const items = (0, import_react.useMemo)(() => {
-    let list = [];
-    if (source === "info" && state.bookingId && state.renderType !== "eventBooking") {
-      list.push({
-        label: import_utils.locales.getText("pisell2.text.rebook"),
-        key: "rebook"
-      });
-    }
-    return list;
-  }, [state, source]);
-  const handleRebook = () => {
-    var _a;
-    (_a = state.onRebook) == null ? void 0 : _a.call(state);
-  };
-  const menuChange = (e) => {
-    if (e.key === "rebook") {
-      handleRebook();
-    }
-  };
+var FooterMenus = ({ state, menuChange, items }) => {
   return items.length ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-buttons-item-rebook" }, /* @__PURE__ */ import_react.default.createElement(
     import_menuButton.default,
     {
@@ -63,6 +43,9 @@ var FooterMenus = ({ state, source }) => {
       dropdownProps: {
         placement: "bottomLeft",
         menu: {
+          style: {
+            minWidth: 200
+          },
           items,
           onClick: menuChange
         }