@pisell/private-materials 3.3.23 → 3.3.25

package/lib/components/booking/info2/service/editService/index.js

@@ -49,6 +49,7 @@ var import_utils3 = require("../../../utils");
 var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils4 = require("../addService/utils");
 var import_materials = require("@pisell/materials");
+var import_utils5 = require("../../../info/utils");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E;
@@ -293,9 +294,18 @@ var Info = (_, ref) => {
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
   }, [(_m = (_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle]);
   const handleEdit = (e) => {
+    var _a2, _b2, _c2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     const isSession = (0, import_utils3.isSessionProduct)(item);
+    const sessionValue = {};
+    if (isSession) {
+      sessionValue.startEndTime = {
+        startDate: (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.start_date,
+        endDate: (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.end_date,
+        duration: (_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.duration
+      };
+    }
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -308,11 +318,16 @@ var Info = (_, ref) => {
           package: true
         },
         isOS: isSession,
-        value: item._extend.other
+        value: {
+          ...item._extend.other,
+          ...sessionValue
+        }
       },
       callback: (e2, extension_type, detail) => {
-        var _a2;
+        var _a3;
         const _detail = detail || item;
+        const other = JSON.parse(JSON.stringify(e2));
+        other.session = e2.session;
         let cacheItem = {
           ...item,
           ..._detail,
@@ -324,7 +339,7 @@ var Info = (_, ref) => {
             // 将当前表单的值覆盖进去
             ...values,
             // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e2))
+            other
           },
           new: 0
         };
@@ -337,6 +352,15 @@ var Info = (_, ref) => {
           });
         } catch (err) {
         }
+        const sessionDetail = (0, import_utils5.editSessionProduct)(cacheItem, e2.session);
+        if (sessionDetail) {
+          setTimeout(() => {
+            form.setFieldsValue({
+              start_time: sessionDetail.start_time,
+              duration: sessionDetail.duration
+            });
+          }, 200);
+        }
         cacheItem._extend.origin_total = _total;
         dispatch({
           type: "setService",
@@ -346,7 +370,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_a2 = cacheItem._extend) == null ? void 0 : _a2.capacity
+          capacity: (_a3 = cacheItem._extend) == null ? void 0 : _a3.capacity
         });
       }
     });

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -104,4 +105,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/utils.js

@@ -397,6 +397,7 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
+  var _a, _b;
   const startDate = (0, import_dayjs.default)(
     (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
   );
@@ -404,6 +405,13 @@ var getServiceTimes = (service) => {
     flexibleObj.getValue(service._extend.duration),
     "minute"
   );
+  const session = (_b = (_a = service == null ? void 0 : service._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.session;
+  if (isSessionProduct(service) && session) {
+    return {
+      startDate: (0, import_dayjs.default)(session.start_at),
+      endDate: (0, import_dayjs.default)(session.end_at)
+    };
+  }
   return {
     startDate,
     endDate

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
 declare const _default: (props: PosProps) => JSX.Element | null;

package/lib/components/eftposPay/pay.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/store/index.d.ts

@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -24,4 +25,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/productSelect/components/productGroup/index.less

@@ -11,7 +11,7 @@
   .group-row {
     .product-card {
       min-width: 363px;
-      max-width: 737px;
+      max-width: unset;
       box-sizing: border-box;
       margin-top: 12px;
     }

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

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

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
-  request = {};
   constructor() {
+    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/wallet/Detail/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    addWalletCard: any;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    walletDetailState: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/DiscountCard/model.d.ts

@@ -1 +1,14 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+    setup?: 'menu' | 'list' | 'detail' | string;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/PointCard/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/RechargeableCard/model.d.ts

@@ -1 +1,29 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    selectedGiftOptionId: string | null;
+    cardList: Array<{
+        id: string;
+        name: string;
+        price: number;
+    }>;
+    selectedItem: {
+        id?: string;
+        gift_price?: number;
+        price?: number;
+        name?: string;
+        variant_id?: string;
+    };
+    productId?: string;
+    detailId?: string;
+    total: string | number;
+    rechargeModalOpen: boolean;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/Voucher/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: 0;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -26,4 +27,11 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    global_wallet: WalletListProps;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/utils/date.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @title: 格式化时间
+ * @description:
+ * @param {Moment} date 时间
+ * @param {string} cnFormat 中文
+ * @param {string} enFormat 英文
+ * @return {*}
+ * @Author: Wzw
+ * @Date: 2022-07-28 11:57
+ */
+export declare const formatDate: (date: any, cnFormat?: string, enFormat?: string) => string;

package/lib/utils/date.js

@@ -0,0 +1,57 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/date.ts
+var date_exports = {};
+__export(date_exports, {
+  formatDate: () => formatDate
+});
+module.exports = __toCommonJS(date_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_locales = require("./locales");
+var formatDate = (date, cnFormat, enFormat) => {
+  let _cnFormat = cnFormat || "LL";
+  let _enFormat = enFormat || _cnFormat;
+  let format = _cnFormat;
+  let dayjs_local = "zh-cn";
+  const umi_locale = (0, import_locales.getLocale)();
+  if (umi_locale !== "zh-CN" && umi_locale !== "zh-HK") {
+    dayjs_local = "en-au";
+    format = _enFormat;
+  }
+  if (umi_locale === "zh-TW") {
+    dayjs_local = "zh-tw";
+    format = _cnFormat;
+  }
+  import_dayjs.default.locale(dayjs_local);
+  return (0, import_dayjs.default)(date).format(format);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatDate
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.23",
+  "version": "3.3.25",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.3.7",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/materials": "3.3.7"
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",