@pisell/private-materials 6.4.41 → 6.4.43

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

@@ -48,6 +48,7 @@ var import_utils4 = require("../../info/service2/utils");
 var import_utils5 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_utils6 = require("../../../../plus/clientName/utils");
+var import_lodash = require("lodash");
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -223,7 +224,7 @@ var formatSellingPrice = (item) => {
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
 var formatMetaData = (item) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -237,6 +238,9 @@ var formatMetaData = (item) => {
   if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
+  if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
+    metadata.unique_identification_number = (_g = item._extend) == null ? void 0 : _g.unique_identification_number;
+  }
   return metadata;
 };
 var getSourceProductPrice = (item) => {
@@ -258,6 +262,12 @@ var formatProducts = (item, quantity) => {
   const discount_amount = origin_total - total;
   const discount_list = (item == null ? void 0 : item.discount_list) || [];
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
+  discount_list.forEach((d) => {
+    d.metadata = {
+      ...d.metadata,
+      unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
+    };
+  });
   const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
   if (item.isCustomItem) {
     item.product_id = 0;
@@ -285,7 +295,8 @@ var formatProducts = (item, quantity) => {
     // checkout 需求新增字段
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
-    "tax_fee": item._extend.tax_fee
+    "tax_fee": item._extend.tax_fee,
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -337,7 +348,7 @@ var formatBookings = (data, values) => {
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   list.forEach((item) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -366,8 +377,13 @@ var formatBookings = (data, values) => {
       dayParams.holder = formatHolders(data, item, values);
       dayParams.duration = (0, import_utils3.getDays)({ _extend: { start_date: startDateTime, end_date: endDateTime } }, "minutes");
     }
+    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     const booking = {
       "product": formatProducts(item),
+      "metadata": formatMetaData(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       "id": item.booking_id || 0,
       "relation_id": item._extend.relation_id || 0,
@@ -384,7 +400,6 @@ var formatBookings = (data, values) => {
       "duration": isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
       "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item),
       "note": item._extend.note,
       ...eventOtherParams || {},
       ...dayParams
@@ -394,11 +409,14 @@ var formatBookings = (data, values) => {
       return;
     }
     for (let i = 0; i < (item._extend.quantity || 1); i++) {
+      const newItem = (0, import_lodash.cloneDeep)(item);
+      newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       bookings.push({
         ...booking,
-        "product": formatProducts(item, 1),
-        "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }, false) : item._extend.number || 1,
-        "holder": getHolderByIndex(booking.holder, i)
+        "product": formatProducts(newItem, 1),
+        "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i),
+        "metadata": formatMetaData(newItem)
       });
     }
   });
@@ -418,6 +436,11 @@ var formatRelationProducts = (data, type) => {
   );
   let relationProducts = [];
   relationProducts = list.map((item) => {
+    var _a2;
+    if (!((_a2 = item._extend) == null ? void 0 : _a2.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     return formatProducts(item);
   });
   return relationProducts || [];
@@ -428,6 +451,11 @@ var formatNormalProducts = (data) => {
   list = list.filter((item) => (0, import_utils4.isNormalProductByDurationSchedule)(item));
   let relationProducts = [];
   relationProducts = list.map((item) => {
+    var _a2;
+    if (!((_a2 = item._extend) == null ? void 0 : _a2.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     return formatProducts(item);
   });
   return relationProducts || [];

package/lib/components/booking/forms/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/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 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/info/model.js

@@ -47,6 +47,9 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
         service: { ...state.service, ...payload, ...obj }
       });
     },
+    setPaymentPaid(state, payload) {
+      state.setGlobalState({ paymentPaid: { ...state.paymentPaid, ...payload } });
+    },
     setDate(state, payload) {
       state.setGlobalState({ date: { ...state.date, ...payload } });
     },

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

@@ -127,7 +127,8 @@ var Info = (props) => {
     let product = list[0];
     const detail = await (0, import_serve.getProductDetail)(product.id, {
       schedule_date: state.date.value.format("YYYY-MM-DD"),
-      customer_id: customerId
+      customer_id: customerId,
+      open_deposit: 1
     });
     const isBundleOrCombination = (0, import_utils4.getIsBundleOrCombination)(detail.data);
     setLoading(false);

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -96,6 +96,7 @@ var Info = (0, import_model.Provider)((props) => {
       });
     }
   }, []);
+  const Toast = (0, import_materials.useToast)();
   (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _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");
@@ -110,6 +111,22 @@ var Info = (0, import_model.Provider)((props) => {
       }
     });
   }, [globalState]);
+  const dropdownProps = (0, import_react.useMemo)(() => {
+    const icon = /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Iconfont,
+      {
+        type: "pisell2-switch-horizontal-01",
+        size: 24,
+        style: { color: "#667085" }
+      }
+    );
+    return {
+      buttonProps: {
+        icon,
+        size: "default"
+      }
+    };
+  }, [modal.state]);
   const addNote = (e) => {
     modal.dispatch({
       type: "setNotes",
@@ -281,7 +298,7 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, null)) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, { clientCardProps: { dropdown: dropdownProps } })) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "booking-info-client-line-code",

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

@@ -98,7 +98,8 @@ var Info = (props) => {
     setLoading(true);
     let product = list[0];
     const detail = await (0, import_serve.getProductDetail)(product.id, {
-      schedule_date: state.date.value.format("YYYY-MM-DD")
+      schedule_date: state.date.value.format("YYYY-MM-DD"),
+      open_deposit: 1
     });
     const isBundleOrCombination = (0, import_utils.getIsBundleOrCombination)(detail.data);
     setLoading(false);

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -54,6 +54,7 @@ var import_utils6 = require("../../../utils");
 var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils7 = require("../addService/utils");
 var import_noteModal = __toESM(require("../../../../../plus/noteModal"));
+var import_priceKeyboard = require("../../../../../pro/priceKeyboard");
 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, _F, _G, _H, _I;
@@ -527,7 +528,7 @@ var Info = (_, ref) => {
         )
       },
       /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellAdjustPriceInputNumber,
+        import_priceKeyboard.DiscountKeyboard.InputNumber,
         {
           style: { width: "100%" },
           min: 0,
@@ -535,8 +536,15 @@ var Info = (_, ref) => {
           prefix: state.amountSymbol,
           onChange: handleTotalChange,
           disabled: state.channelDisabledEdit,
-          originValue: ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) || 0,
-          placeholder: ((_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total) || "0"
+          originalValue: ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) || 0,
+          placeholder: ((_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total) || "0",
+          size: "large",
+          keyboardProps: {
+            containerProps: {
+              renderType: "modal"
+            },
+            selectType: "dark"
+          }
         }
       )
     ));
@@ -676,7 +684,7 @@ var Info = (_, ref) => {
             style: { height: "48px", width: "140px" }
           },
           import_utils.locales.getText("pisell2.ticket-booking.note"),
-          useNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(Iconfont, { type: "pisell2-info-circle2" }))
+          useNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-info-circle2" }))
         )
       )),
       /* @__PURE__ */ import_react.default.createElement(

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -105,4 +106,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.d.ts

@@ -165,10 +165,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/checkout/PaymentModal.d.ts

@@ -23,6 +23,8 @@ interface PaymentModalProps {
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
+    setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
+    editOrderId?: number;
 }
 declare const PaymentModal: React.FC<PaymentModalMainProps>;
 export type { PaymentModalData, PaymentModalProps };