@pisell/private-materials 3.0.54 → 3.0.55

package/es/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) => JSX.Element;
+declare const Addons: (props: any) => any;
 export default Addons;

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

@@ -40,7 +40,7 @@ import { DownOutlined } from "@ant-design/icons";
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _store$getState, _store$getState$call, _store$getState$call$, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$addons2, _state$addons4, _state$bookingDetail8;
+  var _context$appHelper, _store$getState, _store$getState$call, _store$getState$call$, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$addons2, _state$addons4, _state$bookingDetail10;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -340,7 +340,7 @@ var Footer = function Footer(props) {
             _setLoading(false);
 
             // return数据  checkout时需要
-            return _context4.abrupt("return", callbackData);
+            return _context4.abrupt("return", callbackData || values);
           case 30:
             _context4.prev = 30;
             _context4.t1 = _context4["catch"](13);
@@ -444,29 +444,36 @@ var Footer = function Footer(props) {
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   var handleMenuClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(e) {
-      var id, res;
+      var id, customer, res, _state$bookingDetail;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             id = state.bookingId;
+            customer = state.bookingDetail.customer;
             if (!isEdit) {
-              _context6.next = 6;
+              _context6.next = 8;
               break;
             }
-            _context6.next = 4;
+            _context6.next = 5;
             return handleSave({
               type: "checkout",
               messageShow: false
             });
-          case 4:
+          case 5:
             res = _context6.sent;
             id = (res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId;
-          case 6:
+            customer = res !== null && res !== void 0 && res.customer_id ? {
+              id: res === null || res === void 0 ? void 0 : res.customer_id
+            } : state.bookingDetail.customer;
+          case 8:
             if (e.key === 'sendMail') {
               state.action({
                 type: 'pisell1.sendPayLinkEmail',
                 data: {
-                  id: id
+                  id: id,
+                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.deposit_amount),
+                  deposit_payment_time: state.bookingDetail.deposit_payment_time,
+                  customer: customer
                 },
                 callback: function callback() {}
               });
@@ -480,7 +487,7 @@ var Footer = function Footer(props) {
                 callback: function callback() {}
               });
             }
-          case 8:
+          case 10:
           case "end":
             return _context6.stop();
         }
@@ -579,10 +586,10 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:58
    */
   var isCheckout = useMemo(function () {
-    var _state$bookingDetail, _state$bookingDetail$, _state$bookingDetail2;
+    var _state$bookingDetail2, _state$bookingDetail3, _state$bookingDetail4;
     var list = ["unfulfilled", "partially_paid", "unpaid", "payment_processing"];
     // (支付状态 = 已支付 || 部分付款 || 未付款 || 支付处理中) && 预约状态 !== 已取消
-    if (!state.bookingId || ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : (_state$bookingDetail$ = _state$bookingDetail.bookings) === null || _state$bookingDetail$ === void 0 ? void 0 : _state$bookingDetail$.appointment_status) !== "cancelled" && list.includes(state === null || state === void 0 ? void 0 : (_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.payment_status) && !state.disabledEdit) {
+    if (!state.bookingId || ((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : (_state$bookingDetail3 = _state$bookingDetail2.bookings) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.appointment_status) !== "cancelled" && list.includes(state === null || state === void 0 ? void 0 : (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.payment_status) && !state.disabledEdit) {
       return true;
     } else {
       if (total.notPaidAmount > 0) {
@@ -657,8 +664,8 @@ var Footer = function Footer(props) {
    * 是否只有定金支付
    */
   var isOnlyDeposit = useMemo(function () {
-    var _state$bookingDetail3, _state$bookingDetail4, _state$bookingDetail5, _state$bookingDetail6;
-    if (state !== null && state !== void 0 && (_state$bookingDetail3 = state.bookingDetail) !== null && _state$bookingDetail3 !== void 0 && _state$bookingDetail3.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail4 = state.bookingDetail) !== null && _state$bookingDetail4 !== void 0 && (_state$bookingDetail5 = _state$bookingDetail4.payment_types) !== null && _state$bookingDetail5 !== void 0 && (_state$bookingDetail6 = _state$bookingDetail5.every) !== null && _state$bookingDetail6 !== void 0 && _state$bookingDetail6.call(_state$bookingDetail5, function (item) {
+    var _state$bookingDetail5, _state$bookingDetail6, _state$bookingDetail7, _state$bookingDetail8;
+    if (state !== null && state !== void 0 && (_state$bookingDetail5 = state.bookingDetail) !== null && _state$bookingDetail5 !== void 0 && _state$bookingDetail5.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail6 = state.bookingDetail) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail7 = _state$bookingDetail6.payment_types) !== null && _state$bookingDetail7 !== void 0 && (_state$bookingDetail8 = _state$bookingDetail7.every) !== null && _state$bookingDetail8 !== void 0 && _state$bookingDetail8.call(_state$bookingDetail7, function (item) {
       return item === 'deposit';
     })) {
       return true;
@@ -679,8 +686,8 @@ var Footer = function Footer(props) {
 
     // 只有定金支付时，直接展示
     if (isOnlyDeposit) {
-      var _state$bookingDetail7;
-      return "".concat(locales.getText("pisell2.text.deposit-paid"), " ").concat(formatAmount(state === null || state === void 0 ? void 0 : (_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.deposit_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), " ").concat(total.duration ? "(".concat(total.duration, ")") : "");
+      var _state$bookingDetail9;
+      return "".concat(locales.getText("pisell2.text.deposit-paid"), " ").concat(formatAmount(state === null || state === void 0 ? void 0 : (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.deposit_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), " ").concat(total.duration ? "(".concat(total.duration, ")") : "");
     }
 
     // 有退款金额时, 直接展示 退款:$8.00
@@ -804,7 +811,7 @@ var Footer = function Footer(props) {
     className: "order-total-item-label"
   }, locales.getText("pisell1.text.subtotal")), /*#__PURE__*/React.createElement("span", {
     className: "order-total-item-value"
-  }, formatAmount(total.productAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"))), (((_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.surcharge) || []).map(function (d) {
+  }, formatAmount(total.productAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"))), (((_state$bookingDetail10 = state.bookingDetail) === null || _state$bookingDetail10 === void 0 ? void 0 : _state$bookingDetail10.surcharge) || []).map(function (d) {
     return /*#__PURE__*/React.createElement("div", {
       className: "order-total-item",
       key: d.id

package/es/components/booking/deposit/DepositItem/index.js

@@ -41,7 +41,7 @@ var DepositItem = function DepositItem(props) {
   }, {
     key: "1",
     disabled: isPaid || isBookingCancelled,
-    label: /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.deposit-generate-payment-link"))
+    label: /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.copy-to-clipboard"))
   }];
   var onClick = function onClick(_ref) {
     var key = _ref.key;

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

@@ -51,7 +51,10 @@ var Deposit = function Deposit(props) {
     action({
       type: 'pisell1.sendPayLinkEmail',
       data: {
-        id: id
+        id: id,
+        is_deposit: 1,
+        deposit_payment_time: bookingDetail.deposit_payment_time,
+        customer: bookingDetail.customer
       },
       callback: function callback() {}
     });

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

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

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

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

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

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

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/locales.js

@@ -158,7 +158,7 @@ export default {
     'pisell2.text.deposit-paid': "Deposit paid",
     "pisell2.text.stock": "Stock",
     'pisell2.text.payment-link': "Payment link",
-    'pisell2.text.send-mail': "Send mail",
+    'pisell2.text.send-mail': "Send email",
     'pisell2.text.copy-to-clipboard': "Copy to clipboard",
     'pisell2.text.ok': "OK",
     'pisell2.text.terminal-edit-message': "This operation cannot be performed. To proceed, please use the Pisell Terminal."

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

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

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

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

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

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

@@ -190,7 +190,7 @@ var Footer = (props) => {
       }
       state == null ? void 0 : state.callback(callbackData);
       _setLoading(false);
-      return callbackData;
+      return callbackData || values;
     } catch (err) {
       console.log(err);
       if ((err == null ? void 0 : err.code) === 70101) {
@@ -238,16 +238,22 @@ var Footer = (props) => {
     );
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   const handleMenuClick = async (e) => {
+    var _a2;
     let id = state.bookingId;
+    let customer = state.bookingDetail.customer;
     if (isEdit) {
       const res = await handleSave({ type: "checkout", messageShow: false });
       id = (res == null ? void 0 : res.order_id) || state.bookingId;
+      customer = (res == null ? void 0 : res.customer_id) ? { id: res == null ? void 0 : res.customer_id } : state.bookingDetail.customer;
     }
     if (e.key === "sendMail") {
       state.action({
         type: "pisell1.sendPayLinkEmail",
         data: {
-          id
+          id,
+          is_deposit: state.bookingDetail.is_deposit || Number((_a2 = state.bookingDetail) == null ? void 0 : _a2.deposit_amount),
+          deposit_payment_time: state.bookingDetail.deposit_payment_time,
+          customer
         },
         callback: () => {
         }

package/lib/components/booking/deposit/DepositItem/index.js

@@ -79,7 +79,7 @@ var DepositItem = (props) => {
     {
       key: "1",
       disabled: isPaid || isBookingCancelled,
-      label: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.deposit-generate-payment-link"))
+      label: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.copy-to-clipboard"))
     }
   ];
   const onClick = ({ key }) => {

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

@@ -58,7 +58,10 @@ var Deposit = (props) => {
     action({
       type: "pisell1.sendPayLinkEmail",
       data: {
-        id
+        id,
+        is_deposit: 1,
+        deposit_payment_time: bookingDetail.deposit_payment_time,
+        customer: bookingDetail.customer
       },
       callback: () => {
       }

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

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

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

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

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

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

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/locales.js

@@ -176,7 +176,7 @@ var locales_default = {
     "pisell2.text.deposit-paid": "Deposit paid",
     "pisell2.text.stock": "Stock",
     "pisell2.text.payment-link": "Payment link",
-    "pisell2.text.send-mail": "Send mail",
+    "pisell2.text.send-mail": "Send email",
     "pisell2.text.copy-to-clipboard": "Copy to clipboard",
     "pisell2.text.ok": "OK",
     "pisell2.text.terminal-edit-message": "This operation cannot be performed. To proceed, please use the Pisell Terminal."

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

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

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

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/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.54",
+  "version": "3.0.55",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/utils": "1.0.24",
     "@pisell/icon": "0.0.8",
+    "@pisell/utils": "1.0.24",
     "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {