@pisell/private-materials 3.0.60 → 3.0.62

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

@@ -60,12 +60,43 @@ var Forms = (0, import_model.Provider)((props) => {
       geForms();
     }
   }, [(_f = (_e = state.bookingDetail) == null ? void 0 : _e.bookings) == null ? void 0 : _f.id, (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.id]);
+  const getFranchiseeCompositeData = async ({ request, params: params2 }) => {
+    let arr = [];
+    arr.push(request(params2));
+    if (state.isFranchisee) {
+      arr.push(request({ ...params2, source_shop_customer: 1 }));
+    }
+    const res = await Promise.all(arr);
+    return res;
+  };
+  const getFranchiseeForms = async (params2) => {
+    const res = await getFranchiseeCompositeData({
+      request: state.apis.getForms,
+      params: params2
+    });
+    if (state.isFranchisee) {
+      let arr = [];
+      res.forEach((item, index) => {
+        arr = arr.concat(
+          item.map((d) => {
+            return {
+              ...d,
+              is_franchisor: index === 1 ? 1 : 0
+            };
+          })
+        );
+      });
+      return arr;
+    }
+    return res[0];
+  };
   const getFormDataById = async (item) => {
     var _a2, _b2;
     let _params = {
       form_id: item.form_id,
       skip: 1,
-      num: 999
+      num: 999,
+      source_shop_customer: item.is_franchisor ? 1 : 0
     };
     let options = [];
     const isCustomerForm = item.data_range === "customer" && !(0, import_utils2.isWalkIn)((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
@@ -96,7 +127,7 @@ var Forms = (0, import_model.Provider)((props) => {
   const geForms = async () => {
     setLoading(true);
     try {
-      let data = await state.apis.getForms({
+      let data = await getFranchiseeForms({
         relation_type,
         relation_id: state.bookingDetail.bookings.id
         // _config: { useCache: true },
@@ -105,6 +136,7 @@ var Forms = (0, import_model.Provider)((props) => {
       if (params.type === "form") {
         data = data.filter((d) => d.form_id !== (params == null ? void 0 : params.form_id));
       }
+      console.log("datadata", data);
       const formData = await getFormData(data);
       dispatch({
         type: "setForm",
@@ -131,10 +163,13 @@ var Forms = (0, import_model.Provider)((props) => {
     });
   }, []);
   (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d2;
+    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");
     dispatch({
       type: "setState",
       payload: {
-        ...globalState
+        ...globalState,
+        isFranchisee
       }
     });
   }, [globalState]);

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/forms/single/index.js

@@ -122,7 +122,7 @@ var Single = ({
     if (optionRender) {
       return optionRender(item);
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, item["main_field"] || "-");
+    return /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, item["main_field"] || item[form.option_key] || "-");
   };
   const _addButtonProps = (0, import_react.useMemo)(() => {
     var _a2, _b2;

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/client/index.js

@@ -42,20 +42,20 @@ var import_customSelect = __toESM(require("../../components/customSelect"));
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../utils");
-var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_serve = require("./serve");
 var Info = () => {
   var _a, _b, _c, _d, _e, _f;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
     num: 50,
     total: 0,
     search: ""
   });
-  const context = (0, import_useEngineContext.default)();
   const menus = (0, import_react.useMemo)(() => {
     let list = [
       { key: "view", label: import_utils.locales.getText("pisell2.text.view-profile") },
@@ -73,11 +73,17 @@ var Info = () => {
   }) => {
     let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
     _setLoading(true);
-    const data = await state.apis.getClients({
+    const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
+    const data = await api({
       ...resetParams,
-      _config: { abort: true }
+      ...!state.isFranchisee ? { _config: { abort: true } } : {}
+    });
+    const list = ((data == null ? void 0 : data.list) || []).map((d) => {
+      return {
+        ...d,
+        id: d.franchisee_customer_id || d.id
+      };
     });
-    const list = (data == null ? void 0 : data.list) || [];
     let _payload = {
       clients: list
     };
@@ -124,11 +130,35 @@ var Info = () => {
     },
     [import_utils.locales.localeMap]
   );
-  const handleSelectClient = (value) => {
+  const _getFranchiseeCustomerInfo = async (customer) => {
+    try {
+      setFranchiseeLoading(customer.id);
+      const res = await (0, import_serve.getFranchiseeCustomerInfo)({
+        franchisor_customer_id: customer.id
+      });
+      setFranchiseeLoading(0);
+      return {
+        ...customer,
+        id: res.franchisee_customer_id
+      };
+    } catch (err) {
+      setFranchiseeLoading(0);
+    }
+  };
+  const handleSelectClient = async (value) => {
     let _value = (value == null ? void 0 : value[value.length - 1]) || import_model.walkInData;
     if (_value.loading) {
       return;
     }
+    if (state.isFranchisee && _value.franchisee_customer_id === 0) {
+      try {
+        _value = await _getFranchiseeCustomerInfo(_value);
+      } catch (err) {
+      }
+      if (!_value) {
+        return;
+      }
+    }
     dispatch({
       type: "setClient",
       payload: {
@@ -139,6 +169,9 @@ var Info = () => {
         edit: true
       }
     });
+    return new Promise((resolve) => {
+      resolve(0);
+    });
   };
   const handleViewClient = () => {
     state.action({
@@ -195,8 +228,6 @@ var Info = () => {
     var _a2;
     return (0, import_utils2.isWalkIn)((_a2 = state.client.value) == null ? void 0 : _a2.id);
   }, [(_a = state.client.value) == null ? void 0 : _a.id]);
-  (0, import_react.useEffect)(() => {
-  }, []);
   (0, import_react.useEffect)(() => {
     if (state.action) {
       state.action({
@@ -296,7 +327,7 @@ var Info = () => {
             src: import_utils.image.ali(item.cover, 100) || void 0,
             icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
           }
-        ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, item.email ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.email) : null, item.phone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.phone) : null)));
+        ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, item.email ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.email) : null, item.phone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.phone) : null)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
       },
       searchChange,
       searchValue: params.search,

package/lib/components/booking/info/client/serve.d.ts

@@ -0,0 +1,2 @@
+export declare const getFranchiseeCustomerInfo: (params: any) => Promise<any>;
+export declare const getFranchiseeCustomerList: (params: any) => Promise<any>;

package/lib/components/booking/info/client/serve.js

@@ -0,0 +1,39 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info/client/serve.ts
+var serve_exports = {};
+__export(serve_exports, {
+  getFranchiseeCustomerInfo: () => getFranchiseeCustomerInfo,
+  getFranchiseeCustomerList: () => getFranchiseeCustomerList
+});
+module.exports = __toCommonJS(serve_exports);
+var import_utils = require("../../utils");
+var getFranchiseeCustomerInfo = async (params) => {
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
+  return data;
+};
+var getFranchiseeCustomerList = async (params) => {
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, { abort: true });
+  return data;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getFranchiseeCustomerInfo,
+  getFranchiseeCustomerList
+});

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/index.js

@@ -62,6 +62,7 @@ var Info = (0, import_model.Provider)((props) => {
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
+  import_utils2.request.setRequest(context.appHelper.utils.request);
   const params = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.config) == null ? void 0 : _c2.basic) == null ? void 0 : _d2.appointment_subject) || {};
@@ -82,13 +83,15 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    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",
       payload: {
         setGlobalState: props.setGlobalState,
         ...globalState,
-        isTerminal: (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.isTerminal) == null ? void 0 : _c2.call(_b2)
+        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
       }
     });
   }, [globalState]);

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/info/pet/index.js

@@ -85,7 +85,8 @@ var Pet = () => {
     if (!noClient) {
       let _values = {
         form_id: boardParams.form_id,
-        ..._params
+        ..._params,
+        source_shop_customer: petForm == null ? void 0 : petForm.is_franchisor
       };
       if (formData.data_range === "customer") {
         _values.customer_id = (_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.id;

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

@@ -277,7 +277,6 @@ var Info = () => {
     state.service.value,
     loading
   ]);
-  console.log(state.service.addModal, "state.service.addModal");
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = (_b = state.service) == null ? void 0 : _b.cacheItem) == null ? void 0 : _c.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -73,6 +74,7 @@ export interface FormState {
     renderType?: "eventBooking";
     modalOpen?: boolean;
     isTerminal?: boolean;
+    isFranchisee?: boolean;
     eventOtherParams?: {
         relation_id: number;
         number: number;
@@ -88,7 +90,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.60",
+  "version": "3.0.62",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,9 +58,9 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/date-picker": "1.0.69",
     "@pisell/icon": "0.0.8",
-    "@pisell/utils": "1.0.24"
+    "@pisell/utils": "1.0.24",
+    "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {
     "react": "^18.0.0",