@pisell/private-materials 6.4.19 → 6.4.21

package/es/components/booking/info/main.js

@@ -36,7 +36,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _context$appHelper4, _modal$state4;
+  var _modal$state2, _modal$state3, _modal$state4;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -128,7 +128,7 @@ var Info = Provider(function (props) {
   }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
     style: _objectSpread(_objectSpread({}, style), {}, {
-      height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
+      height: '100%'
     }),
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/PaymentModal.js

@@ -1048,25 +1048,35 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
     var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
-      var isCurrentOrderSynced, res;
+      var order, stateAmount, isCurrentOrderSynced, res;
       return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             // 先检测订单是否同步过，如果没有，需要先手动下单
+            // 如果是定金模式，则需要设置当前待付金额至 os 的 deposit_amount
+            order = checkoutModule.getCurrentOrderInfo();
+            if (!order.isDeposit) {
+              _context12.next = 5;
+              break;
+            }
+            stateAmount = checkoutModule.getStateAmount();
+            _context12.next = 5;
+            return checkoutModule.setDepositAmountAsync(stateAmount);
+          case 5:
             isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
             if (isCurrentOrderSynced) {
-              _context12.next = 4;
+              _context12.next = 9;
               break;
             }
-            _context12.next = 4;
+            _context12.next = 9;
             return checkoutModule.manualSyncOrderAsync();
-          case 4:
-            _context12.next = 6;
+          case 9:
+            _context12.next = 11;
             return checkoutModule.sendCustomerPayLinkAsync({
               emails: data.emails,
               order_ids: [checkoutModule.getCurrentOrderId()]
             });
-          case 6:
+          case 11:
             res = _context12.sent;
             // 支付链接发送成功 转 toC，这边可以关掉了
             if (res.success) {
@@ -1075,7 +1085,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             } else {
               Toast === null || Toast === void 0 || Toast.error(res.message || locales.getText('pisell2.checkout.send-payment-link.error'));
             }
-          case 8:
+          case 13:
           case "end":
             return _context12.stop();
         }

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/lib/components/booking/info/main.js

@@ -64,7 +64,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -90,7 +90,7 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h, _i, _j, _k, _l, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -99,7 +99,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
+        timezone: (_m = (_l = (_k = (_j = (_i = (_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) == null ? void 0 : _i.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
         isDayBooking: (globalState == null ? void 0 : globalState.renderType) === "dayBooking"
       }
     });
@@ -152,7 +152,7 @@ var Info = (0, import_model.Provider)((props) => {
     {
       style: {
         ...style,
-        height: ((_h = (_g = context == null ? void 0 : context.appHelper) == null ? void 0 : _g.utils) == null ? void 0 : _h.isMobile) ? "100%" : "100vh"
+        height: "100%"
       },
       header,
       footer: /* @__PURE__ */ import_react.default.createElement(
@@ -171,7 +171,7 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_i = modal.state) == null ? void 0 : _i.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_g = modal.state) == null ? void 0 : _g.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/PaymentModal.js

@@ -744,6 +744,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       };
     };
     const handleSendCustomerPaymentLink = async (data) => {
+      const order = checkoutModule.getCurrentOrderInfo();
+      if (order.isDeposit) {
+        const stateAmount = checkoutModule.getStateAmount();
+        await checkoutModule.setDepositAmountAsync(stateAmount);
+      }
       const isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
       if (!isCurrentOrderSynced) {
         await checkoutModule.manualSyncOrderAsync();

package/lib/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/package.json

@@ -1,12 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.19",
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
-  },
+  "version": "6.4.21",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -56,10 +50,6 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@pisell/date-picker": "workspace:*",
-    "@pisell/icon": "workspace:*",
-    "@pisell/materials": "workspace:*",
-    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -68,7 +58,11 @@
     "rc-virtual-list": "^3.11.3",
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
-    "styled-components": "^6.0.0-rc.3"
+    "styled-components": "^6.0.0-rc.3",
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.4.3",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -76,5 +70,11 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
+  },
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
 }

package/es/hooks/useEngineContext.d.ts

@@ -1,3 +0,0 @@
-declare const useEngineContext: () => any;
-export declare const usePisellOS: () => any;
-export default useEngineContext;

package/lib/hooks/useEngineContext.d.ts

@@ -1,3 +0,0 @@
-declare const useEngineContext: () => any;
-export declare const usePisellOS: () => any;
-export default useEngineContext;