@pisell/private-materials 3.0.117 → 3.0.119

package/lib/components/booking/info/service/editService/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-body-edit {
-  padding: 24px 32px;
+  padding: 24px 32px 100px !important;
 }
 
 
@@ -14,6 +14,7 @@
   align-items: center;
   justify-content: center;
   gap: 12px;
+  background-color: #fff;
 
   .pisell-lowcode__booking-service-delete-wrap {
     height: 48px;
@@ -96,10 +97,19 @@
   overflow: hidden;
   padding: 11px;
 
-  .current-service-info-name {
-    font-size: 16px;
-    color: #101828;
-    font-weight: 650;
+  .current-service-info-name-wrap {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    .current-service-info-name {
+      font-size: 16px;
+      color: #101828;
+      font-weight: 650;
+      flex: 1;
+    }
+
+    .current-service-info-change-btn {}
   }
 
   &:hover {

package/lib/components/booking/info/service/index.js

@@ -42,6 +42,7 @@ var import_addTimeModal = __toESM(require("./addTimeModal"));
 var Service = () => {
   var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const detailRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
@@ -63,6 +64,12 @@ var Service = () => {
     }
     return true;
   }, [state, appointment_card.quick_time]);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, null), /* @__PURE__ */ import_react.default.createElement(import_addService.default, null)), /* @__PURE__ */ import_react.default.createElement(import_editService.default, null), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
+  const handleEdit = (cacheItem) => {
+    setTimeout(() => {
+      var _a2, _b2;
+      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem);
+    }, 100);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
 };
 var service_default = Service;

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

@@ -1,4 +1,6 @@
-import React from "react";
-import "./index.less";
-declare const ServiceList: () => React.JSX.Element;
+import React from 'react';
+import './index.less';
+declare const ServiceList: ({ onEdit }: {
+    onEdit: any;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/info/service/serviceList/index.js

@@ -39,7 +39,7 @@ var import_model = require("../../model");
 var import_mock = require("../../../mock");
 var import_utils2 = require("../../../utils");
 var import_serviceItem = __toESM(require("../serviceItem"));
-var ServiceList = () => {
+var ServiceList = ({ onEdit }) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const errorTypes = {
     product: import_utils.locales.getText("pisell2.text.status.service-error-1"),
@@ -57,6 +57,7 @@ var ServiceList = () => {
         cacheItem: { ...item, new: 0 }
       }
     });
+    onEdit == null ? void 0 : onEdit({ ...item, new: 0 });
   };
   const getResourceItem = (0, import_react.useCallback)(
     (id) => {

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

@@ -55,7 +55,7 @@ var moveItemToFront = (arr, targetId) => {
   return arr;
 };
 var isInterval = (time1, time2, interval = 1e3) => {
-  return time2 - time1 < interval;
+  return Math.abs(time2 - time1) < interval;
 };
 var formatServiceListByTime = (list) => {
   var _a, _b;

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

@@ -165,6 +165,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -332,6 +339,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -499,6 +513,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/components/booking/locales.ts
@@ -22,6 +32,7 @@ __export(locales_exports, {
   default: () => locales_default
 });
 module.exports = __toCommonJS(locales_exports);
+var import_dayjs = __toESM(require("dayjs"));
 var locales_default = {
   "en": {
     "pisell2.text.select-addons": "Select addons",
@@ -197,7 +208,25 @@ var locales_default = {
     "pisell2.text.actions": "Actions",
     "pisell2.text.add-client": "Add customer",
     "pisell2.text.variant-client-change": "Change",
-    "pisell2.text.variant-client-no-data": "No record"
+    "pisell2.text.variant-client-no-data": "No record",
+    "page.event.booking.text.duplicate-enrollment": "Duplicate Enrollment",
+    "page.event.booking.text.duplicate-enrollment-content": ({
+      customerName,
+      title,
+      list
+    }) => {
+      const listStr = list.map((item) => {
+        if (item.registration_type === "single") {
+          return `(${item.start_time} ${(0, import_dayjs.default)(item.start_date).format("DD/MM/YYYY")})`;
+        } else if (item.registration_type === "extra_include") {
+          return `(${item.start_time} ${(0, import_dayjs.default)(item.start_date).format("DD/MM/YYYY")} this and all future events)`;
+        } else if (item.registration_type === "all") {
+          return `(All events)`;
+        }
+      });
+      return `${customerName || ""} has already enrolled in the ${title} ${listStr.join(",")}, Are you sure you want to enroll again？`;
+    },
+    "page.event.booking.text.duplicate-enrollment-confirm": "Confirm"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -378,7 +407,25 @@ var locales_default = {
     "pisell2.text.actions": "操作选项",
     "pisell2.text.add-client": "添加客户",
     "pisell2.text.variant-client-change": "更改客户",
-    "pisell2.text.variant-client-no-data": "暂无数据"
+    "pisell2.text.variant-client-no-data": "暂无数据",
+    "page.event.booking.text.duplicate-enrollment": "重复报名",
+    "page.event.booking.text.duplicate-enrollment-content": ({
+      customerName,
+      title,
+      list
+    }) => {
+      const listStr = list.map((item) => {
+        if (item.registration_type === "single") {
+          return `(${item.start_date} ${item.start_time})`;
+        } else if (item.registration_type === "extra_include") {
+          return `(${item.start_date} ${item.start_time} 此次及后续活动)`;
+        } else if (item.registration_type === "all") {
+          return `(所有活动)`;
+        }
+      });
+      return `${customerName || ""}已报名${title} ${listStr.join(",")}, 确定要再次报名吗？`;
+    },
+    "page.event.booking.text.duplicate-enrollment-confirm": "确认"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -559,6 +606,24 @@ var locales_default = {
     "pisell2.text.actions": "操作選項",
     "pisell2.text.add-client": "添加客戶",
     "pisell2.text.variant-client-change": "更改客戶",
-    "pisell2.text.variant-client-no-data": "暫無數據"
+    "pisell2.text.variant-client-no-data": "暫無數據",
+    "page.event.booking.text.duplicate-enrollment": "重複報名",
+    "page.event.booking.text.duplicate-enrollment-content": ({
+      customerName,
+      title,
+      list
+    }) => {
+      const listStr = list.map((item) => {
+        if (item.registration_type === "single") {
+          return `(${item.start_date} ${item.start_time})`;
+        } else if (item.registration_type === "extra_include") {
+          return `(${item.start_date} ${item.start_time} 此次及後續活動)`;
+        } else if (item.registration_type === "all") {
+          return `(所有活動)`;
+        }
+      });
+      return `${customerName || ""}已報名${title} ${listStr.join(",")}, 確定要再次報名嗎？`;
+    },
+    "page.event.booking.text.duplicate-enrollment-confirm": "確認"
   }
 };

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

@@ -40,6 +40,7 @@ export interface FormState {
         cacheItem: any;
         edit: boolean;
         addTimeModal: boolean;
+        changeService: any;
     };
     pet: {
         showModal: boolean;
@@ -73,7 +74,7 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: "eventBooking";
+    renderType?: 'eventBooking';
     modalOpen?: boolean;
     isTerminal?: boolean;
     isFranchisee?: boolean;
@@ -81,7 +82,7 @@ export interface FormState {
     eventOtherParams?: {
         relation_id: number;
         number: number;
-        registration_type: "single" | "all" | "extra_include";
+        registration_type: 'single' | 'all' | 'extra_include';
         start_date: string;
         start_time: string;
         end_date: string;
@@ -96,7 +97,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) => 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) => any;
+declare const Notes: (props: any) => JSX.Element;
 export default Notes;

package/lib/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/lib/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/lib/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/lib/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/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.117",
+  "version": "3.0.119",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.28",
-    "@pisell/materials": "3.0.38",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.97"
+    "@pisell/date-picker": "1.0.97",
+    "@pisell/utils": "1.0.28",
+    "@pisell/materials": "3.0.38"
   },
   "peerDependencies": {
     "react": "^18.0.0",