@pisell/private-materials 3.3.33 → 3.3.35

package/lib/components/appointmentBooking/utils.js

@@ -20,11 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   Toast: () => Toast,
-  checkAndGoNext: () => checkAndGoNext,
-  checkAndMarkCartRenderError: () => checkAndMarkCartRenderError,
   checkHasFormStep: () => checkHasFormStep,
-  currentAppointmentBoard: () => currentAppointmentBoard,
-  currentRenderLists: () => currentRenderLists,
   formatCarts: () => formatCarts,
   formatCartsResources: () => formatCartsResources,
   formatCurrentUser: () => formatCurrentUser,
@@ -32,19 +28,13 @@ __export(utils_exports, {
   formatForms: () => formatForms,
   formatGuest: () => formatGuest,
   formatHolder: () => formatHolder,
-  getCartCurrentResourceData: () => getCartCurrentResourceData,
-  getCurrentBoard: () => getCurrentBoard,
   getCustomer: () => getCustomer,
-  getFormInsertBeforeKey: () => getFormInsertBeforeKey,
   getMeAccount: () => getMeAccount,
-  getMultiResources: () => getMultiResources,
   getPunctuationMark: () => getPunctuationMark,
-  getResourceTitle: () => getResourceTitle,
   hasResourceFormId: () => hasResourceFormId,
   openForm: () => openForm,
   sortResources: () => sortResources,
   updateBookingFormStorage: () => updateBookingFormStorage,
-  updateCartResources: () => updateCartResources,
   updateLists: () => updateLists
 });
 module.exports = __toCommonJS(utils_exports);
@@ -286,192 +276,68 @@ var Toast = (text) => {
 var checkHasFormStep = ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
   var _a, _b, _c;
   let isNext = false;
-  const stepLists = (_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList;
-};
-var getCartCurrentResourceData = (cart, currentKey, resources) => {
-  var _a, _b, _c, _d, _e, _f, _g;
-  try {
-    const currentFormId = (_b = (_a = currentKey == null ? void 0 : currentKey.split("_@")) == null ? void 0 : _a[1]) == null ? void 0 : _b.split("-");
-    const form_id = Number((currentFormId == null ? void 0 : currentFormId[0]) || ((_e = (_d = (_c = resources == null ? void 0 : resources[0]) == null ? void 0 : _c.resources) == null ? void 0 : _d[0]) == null ? void 0 : _e.id));
-    if (!form_id || !resources.length) return;
-    const cartId = cart._id;
-    const cartOriginResources = ((_f = cart._origin) == null ? void 0 : _f.resources) || [];
-    const resourceData = resources.find((r) => String(r._id) === String(cartId));
-    if (!resourceData) return;
-    let resourceItem = (resourceData.resources || []).find((r) => Number(r.id) === form_id);
-    if (!resourceItem) return;
-    resourceItem = {
-      ...resourceItem,
-      renderList: ((_g = resourceItem == null ? void 0 : resourceItem.renderList) == null ? void 0 : _g.map((r) => {
-        return {
-          ...r,
-          label: (r == null ? void 0 : r.main_field) || (r == null ? void 0 : r.id)
-        };
-      })) || []
-    };
-    const cartResource = cartOriginResources.find((r) => Number(r.form_id) === form_id);
-    const renderId = (cartResource == null ? void 0 : cartResource.id) || 0;
-    const renderItem = ((resourceItem == null ? void 0 : resourceItem.renderList) || []).find((r) => Number(r == null ? void 0 : r.id) === Number(renderId));
-    return {
-      cartItem: cart,
-      resourceItem: {
-        ...resourceItem,
-        originRenderLists: resourceData.resources
-      },
-      renderItem
-    };
-  } catch (error) {
-    return cart;
-  }
-};
-var getMultiResources = (cart, resourceItem, currentKey) => {
-  var _a;
-  if (!resourceItem || !cart) return [];
-  const isCurrentResourceStep = currentKey.startsWith("select-resource");
-  let resources = ((_a = cart == null ? void 0 : cart._origin) == null ? void 0 : _a.resources) || [];
-  let selectedResources = isCurrentResourceStep ? resources.filter((r) => (r == null ? void 0 : r.form_id) !== (resourceItem == null ? void 0 : resourceItem.form_id)) : resources;
-  selectedResources = selectedResources.map((r) => {
-    return {
-      ...r,
-      name: (r == null ? void 0 : r.main_field) || (r == null ? void 0 : r.id),
-      isShowChangeResource: false,
-      is_hide_like: true
-    };
-  });
-  let currentResources = resources.find((r) => (r == null ? void 0 : r.form_id) === (resourceItem == null ? void 0 : resourceItem.form_id));
-  let currentResource = isCurrentResourceStep ? {
-    allowClearResource: true,
-    lists: (resourceItem == null ? void 0 : resourceItem.renderList) || [],
-    is_hide_like: true,
-    id: currentResources == null ? void 0 : currentResources.id
-  } : {};
-  return [...selectedResources, currentResource];
-};
-var getCurrentBoard = (appointmentBooking, code) => {
-  var _a;
-  const { appointmentBoard } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
-  const resourceConfig = (_a = appointmentBoard == null ? void 0 : appointmentBoard.resource_tab) == null ? void 0 : _a[code];
-  return resourceConfig;
-};
-var getResourceTitle = (appointmentBooking, code, utils, originResource) => {
-  const resourceConfig = getCurrentBoard(appointmentBooking, code);
-  let name = "";
-  if (resourceConfig == null ? void 0 : resourceConfig.resource_type_title) {
-    name = utils.translation(resourceConfig == null ? void 0 : resourceConfig.resource_type_title);
+  if (hasResourceFormId2) {
+    const index = (currentStep == null ? void 0 : currentStep.index) + 1;
+    const description = locales2.getText("pisell2.appointment.fill-form");
+    const isExist = stepList == null ? void 0 : stepList.some((item) => (item == null ? void 0 : item.key) === "select-time");
+    appointmentBooking.addStep({ index, key: "fill-form", description }, isExist ? "select-time" : void 0);
   } else {
-    name = (originResource == null ? void 0 : originResource.title) || "";
+    appointmentBooking.removeStep("fill-form");
   }
-  return name;
-};
-var checkAndMarkCartRenderError = (carts, appointmentBooking, utils) => {
-  let hasError = false;
-  const updatedCartList = carts == null ? void 0 : carts.map((cart) => {
-    const currentResource = cart == null ? void 0 : cart.currentSelectedResource;
-    if (!(currentResource == null ? void 0 : currentResource.renderItem)) {
-      hasError = true;
-      const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
-      const name = getResourceTitle(appointmentBooking, resourceItem == null ? void 0 : resourceItem.code, utils, resourceItem);
-      return {
-        ...cart,
-        isErrorResource: true,
-        resourceErrorText: name
-      };
-    }
-    return cart;
-  });
-  return {
-    hasError,
-    updatedCartList
-  };
-};
-var getFormInsertBeforeKey = (currentKey, stepList) => {
-  const isFirstResource = currentKey === "select-resource";
-  const timeStep = stepList.find((item) => item.key.startsWith("select-time"));
-  if (isFirstResource && timeStep) {
-    return timeStep.key;
-  } else {
-    return currentKey;
-  }
-};
-var checkAndGoNext = (isFormSubject, checkAccount, carts) => {
-  let hasError = false;
-  let updatedCartList = [...carts];
-  if (isFormSubject && !checkAccount("holder")) {
-    updatedCartList = carts == null ? void 0 : carts.map((item) => {
-      if (!(item == null ? void 0 : item.holder_id)) {
-        hasError = true;
-        return {
-          ...item,
-          isErrorHolder: true
-        };
+  const stepLists = (_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList;
+  if ((currentStep == null ? void 0 : currentStep.index) + 2 === (stepLists == null ? void 0 : stepLists.length)) {
+    const _checkHolder = () => {
+      const result = checkHolder({
+        isFormSubject,
+        checkAccount,
+        carts
+      });
+      if (result) {
+        setCarts(result);
       }
-      return item;
-    });
-  }
-  return {
-    hasError,
-    updatedCartList
-  };
-};
-var currentAppointmentBoard = (currentKey, resources, appointmentBooking) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  try {
-    const currentStepKey = (_b = (_a = currentKey == null ? void 0 : currentKey.split("_@")) == null ? void 0 : _a[1]) == null ? void 0 : _b.split("-");
-    const form_id = Number((currentStepKey == null ? void 0 : currentStepKey[0]) || ((_e = (_d = (_c = resources == null ? void 0 : resources[0]) == null ? void 0 : _c.resources) == null ? void 0 : _d[0]) == null ? void 0 : _e.id));
-    const form_code = (currentStepKey == null ? void 0 : currentStepKey[1]) || ((_h = (_g = (_f = resources == null ? void 0 : resources[0]) == null ? void 0 : _f.resources) == null ? void 0 : _g[0]) == null ? void 0 : _h.code);
-    const cart_id = currentStepKey == null ? void 0 : currentStepKey[2];
-    const resource_form_id = currentStepKey == null ? void 0 : currentStepKey[3];
-    const policy_id = currentStepKey == null ? void 0 : currentStepKey[4];
-    const resource_tab = (_j = (_i = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _i.appointmentBoard) == null ? void 0 : _j.resource_tab;
-    const config = resource_tab == null ? void 0 : resource_tab[form_code];
-    const isRequired = (config == null ? void 0 : config.customer_resource) === "customer_resource_required";
-    const isSystem = (config == null ? void 0 : config.customer_resource) === "customer_resource_system";
-    const isSkip = (config == null ? void 0 : config.hasOwnProperty("resource_skip_select")) ? !!(config == null ? void 0 : config.resource_skip_select) : true;
-    return {
-      isRequired,
-      isSystem,
-      isSkip,
-      form_id,
-      form_code,
-      cart_id,
-      resource_form_id,
-      policy_id
+      if (!!result) return true;
     };
-  } catch (error) {
-    return {};
-  }
-};
-var currentRenderLists = (resources, code) => {
-  var _a;
-  if (!(resources == null ? void 0 : resources.length) || !code) return [];
-  const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
-  const currentResource = _resources == null ? void 0 : _resources.find((item) => item.code === code);
-  return (currentResource == null ? void 0 : currentResource.renderList) || [];
-};
-var updateCartResources = (item, value) => {
-  var _a;
-  let newResource = [];
-  let resources = ((_a = item == null ? void 0 : item._origin) == null ? void 0 : _a.resources) || [];
-  const currentResourceIndex = resources.findIndex(
-    (item2) => item2.form_id === value.form_id
-  );
-  if (currentResourceIndex > -1) {
-    newResource = resources.map(
-      (item2) => item2.form_id === value.form_id ? value : item2
-    );
+    if (!isLogin) {
+      utils.action({
+        type: "pisell1.login",
+        data: {
+          type: "plugin"
+        },
+        callback: (status) => {
+          var _a2;
+          if (status === "success") {
+            if (!isFormSubject) {
+              const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
+              const currentUser = formatCustomer(user);
+              const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
+              appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
+            } else {
+              getHolders();
+            }
+            if (isSkip) {
+              isNext = true;
+            }
+          }
+        }
+      });
+    } else {
+      isNext = true;
+    }
+    if (isNext && !_checkHolder()) {
+      nextStep();
+    } else {
+      return true;
+    }
   } else {
-    newResource = [...resources, value];
+    if (isSkip) {
+      nextStep();
+    }
   }
-  return newResource || [];
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Toast,
-  checkAndGoNext,
-  checkAndMarkCartRenderError,
   checkHasFormStep,
-  currentAppointmentBoard,
-  currentRenderLists,
   formatCarts,
   formatCartsResources,
   formatCurrentUser,
@@ -479,18 +345,12 @@ var updateCartResources = (item, value) => {
   formatForms,
   formatGuest,
   formatHolder,
-  getCartCurrentResourceData,
-  getCurrentBoard,
   getCustomer,
-  getFormInsertBeforeKey,
   getMeAccount,
-  getMultiResources,
   getPunctuationMark,
-  getResourceTitle,
   hasResourceFormId,
   openForm,
   sortResources,
   updateBookingFormStorage,
-  updateCartResources,
   updateLists
 });

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

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

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element | null;
 export default VoucherCard;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

@@ -104,7 +104,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285];
+  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -163,10 +163,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     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/booking/utils.js

@@ -230,6 +230,9 @@ var formatProductListByCategory = (list, filterItem) => {
   return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
+  var _a;
+  const isEdit = !!cacheItem.booking_id;
+  const isCurrentRelation = item.item_id === ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.relation_id);
   const startDate = (0, import_dayjs.default)(
     cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time)
   );
@@ -240,7 +243,8 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   if (time.max_participants_limit == 0) {
     isMaxLimitRange = true;
   } else {
-    isMaxLimitRange = time.order_event_count < time.max_participants_limit;
+    const orderEventCount = isEdit && isCurrentRelation ? time.order_event_count - 1 : time.order_event_count;
+    isMaxLimitRange = orderEventCount < time.max_participants_limit;
   }
   const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(
     1,

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

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "print" | "page" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "print" | "page" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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<"stripe" | "payo" | "tyro" | "windcave">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

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

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => JSX.Element;
 export default ErrorTip;