@pisell/private-materials 3.0.201 → 3.0.202

package/lib/components/booking/info/utils.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/info/utils.ts
@@ -21,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   formatServiceListByTime: () => formatServiceListByTime,
   getIsBundleOrCombination: () => getIsBundleOrCombination,
+  getMultiDayPrices: () => getMultiDayPrices,
   isBooking4Shop: () => isBooking4Shop,
   isDayBooking: () => isDayBooking,
   isInterval: () => isInterval,
@@ -28,6 +39,7 @@ __export(utils_exports, {
   uniqueByField: () => uniqueByField
 });
 module.exports = __toCommonJS(utils_exports);
+var import_dayjs = __toESM(require("dayjs"));
 var getIsBundleOrCombination = (productDetail) => {
   var _a;
   if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
@@ -57,6 +69,9 @@ var moveItemToFront = (arr, targetId) => {
   return arr;
 };
 var isInterval = (time1, time2, interval = 1e3) => {
+  if (time2 === time1) {
+    return false;
+  }
   return Math.abs(time2 - time1) < interval;
 };
 var formatServiceListByTime = (list) => {
@@ -87,6 +102,25 @@ var isBooking4Shop = (shopId, renderType) => {
   const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191];
   return booking4Shops.includes(shopId);
 };
+function generateDateRange(start, end) {
+  const dateRange = [];
+  let currentDate = (0, import_dayjs.default)(start);
+  while (currentDate.isBefore((0, import_dayjs.default)(end).add(1, "day"))) {
+    dateRange.push(currentDate.format("YYYY-MM-DD"));
+    currentDate = currentDate.add(1, "day");
+  }
+  return dateRange;
+}
+var getMultiDayPrices = (data) => {
+  const result = {};
+  data.forEach((entry) => {
+    const dateRange = generateDateRange(entry.start_date, entry.end_date);
+    dateRange.forEach((date) => {
+      result[date] = entry;
+    });
+  });
+  return result;
+};
 var isDayBooking = (shopId) => {
   const dayBookingShops = [9];
   return dayBookingShops.includes(shopId);
@@ -95,6 +129,7 @@ var isDayBooking = (shopId) => {
 0 && (module.exports = {
   formatServiceListByTime,
   getIsBundleOrCombination,
+  getMultiDayPrices,
   isBooking4Shop,
   isDayBooking,
   isInterval,

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

@@ -238,6 +238,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -478,6 +480,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -718,6 +722,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -293,7 +293,9 @@ var locales_default = {
     "pisell2.text.change.pet.content": "Selecting “Keep” will move the items to Open Items. Selecting “Discard” will clear all items under the holder’s name.",
     "pisell2.text.change.pet.content1": "Reservation-type items cannot be added to the Open Items cart and will be removed.",
     "pisell2.text.change.pet.confirm": "Keep (Add to open items)",
-    "pisell2.text.change.pet.cancel": "Discard (Clear items)"
+    "pisell2.text.change.pet.cancel": "Discard (Clear items)",
+    "pisell2.text.booking-list": "List",
+    "pisell2.text.edit-booking": "Edit"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -559,7 +561,9 @@ var locales_default = {
     "pisell2.text.change.pet.content": "选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。",
     "pisell2.text.change.pet.content1": "预约类商品无法添加到公共购物车，将会被删除。",
     "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
-    "pisell2.text.change.pet.cancel": "不保留（清空商品）"
+    "pisell2.text.change.pet.cancel": "不保留（清空商品）",
+    "pisell2.text.booking-list": "列表",
+    "pisell2.text.edit-booking": "编辑"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -825,6 +829,8 @@ var locales_default = {
     "pisell2.text.change.pet.content": "選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。",
     "pisell2.text.change.pet.content1": "預約類商品無法添加到公共購物車，將會被刪除。",
     "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
-    "pisell2.text.change.pet.cancel": "不保留（清空商品）"
+    "pisell2.text.change.pet.cancel": "不保留（清空商品）",
+    "pisell2.text.booking-list": "列表",
+    "pisell2.text.edit-booking": "編輯"
   }
 };

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

@@ -99,6 +99,7 @@ export interface FormState {
     loading: boolean;
     isTerminalDayBookingPage?: boolean;
     activeCartId?: any[];
+    isDayBooking: boolean;
 }
 export declare const walkInData: {
     id: number;

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: any;
 export default Notes;

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

@@ -1,6 +1,6 @@
 /// <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) => 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) => any;
+declare const Payments: any;
 export default Payments;

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

@@ -1,6 +1,6 @@
 /// <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) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/utils.js

@@ -561,15 +561,15 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
     ...cacheItem._extend
   };
   if (isDay) {
+    _extend.end_date = (0, import_dayjs.default)(_extend.start_date).add(_extend.duration, "day");
     const { start_date, end_date } = (0, import_utils2.formatDayDate)(_extend);
-    _extend = { ..._extend, start_date, end_date };
+    _extend = { ..._extend, start_date, startDate: start_date, end_date, endDate: end_date };
   }
   return _extend;
 };
 var getProductTotalPrice = (item) => {
   var _a;
-  let price = 0;
-  price += Number(item._extend.price);
+  let price = Number(item._extend.price);
   let other = (_a = item._extend) == null ? void 0 : _a.other;
   if (other == null ? void 0 : other.product_variant_id) {
     price = Number(other == null ? void 0 : other.price);
@@ -584,7 +584,6 @@ var getProductTotalPrice = (item) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  price = price;
   return price;
 };
 var getDuration = (duration) => {

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

@@ -6,8 +6,8 @@ import { Eftpos } from './const';
  * @Date: 2024-08-20 13:23
  */
 export declare const usePairTerminalo: (type: Eftpos, params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => ({ mid, tid, apiKey, posProductData, }: {
     mid: string;
     tid: string;
@@ -29,6 +29,6 @@ export declare const usePairTerminalo: (type: Eftpos, params: {
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

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: "page" | "success" | "fail", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -2,11 +2,11 @@ import React from 'react';
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
-    warn?: string | undefined;
-    text?: string | undefined;
-    tip?: string | undefined;
-    loading?: string | undefined;
-    success?: string | undefined;
-    fail?: string | undefined;
+    warn?: string;
+    text?: string;
+    tip?: string;
+    loading?: string;
+    success?: string;
+    fail?: string;
 }) => React.JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 declare const _default: (props: {
     status: string;
-    pedding?: string | undefined;
-    resolve?: string | undefined;
-    reject?: string | undefined;
-    className?: string | undefined;
+    pedding?: string;
+    resolve?: string;
+    reject?: string;
+    className?: string;
 }) => React.JSX.Element;
 export default _default;

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

@@ -30,5 +30,5 @@ export declare const useStoreRef: <T extends {
  * @Date: 2024-08-12 11:54
  */
 export declare const useFail: (index: number) => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
+    code?: `${PayStatus}`;
 }, isMark?: boolean) => void;

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

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

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

@@ -9,6 +9,6 @@
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

package/lib/components/eftposPay/windcave/helper.d.ts

@@ -9,7 +9,7 @@ import XhrTimer from './timer';
  * @Date: 2024-08-12 10:29
  */
 export declare const useFail: () => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
+    code?: `${PayStatus}`;
 }, isMark?: boolean) => void;
 /**
  * @title: 轮询 check 接口

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: any;
 export default Schedules;

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

@@ -69,7 +69,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) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -35,33 +35,17 @@ module.exports = __toCommonJS(Product_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
 var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
-var import_utils = require("../../utils");
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
 var Product = (props) => {
   const { id, lists } = props;
-  const { state, updateState, onAction, onChange, onCard } = (0, import_useContext.useContext)();
+  const { state, onAction, onChange } = (0, import_useContext.useContext)();
   const { disabledEdit, isShowPackageNote, isShowNote, hideAddBtn } = state;
   const clearCart = (0, import_useClearCart.default)(id);
-  const handleChange = (item, type) => {
+  const handleChange = (item, type, other) => {
     if (disabledEdit)
       return;
-    let products = [...state.products];
-    if (type === "delete") {
-      products = products.filter((product) => product._id !== item._id);
-    } else {
-      products = products.map((product) => {
-        if (product._id === item._id) {
-          return {
-            ...product,
-            ...item
-          };
-        }
-        return product;
-      });
-    }
-    updateState((0, import_utils.updateProduct)(state, products));
-    onChange == null ? void 0 : onChange(products);
+    onChange(item, type, other);
   };
   const productParams = (0, import_react.useMemo)(() => {
     return {
@@ -78,9 +62,9 @@ var Product = (props) => {
         dataSource: item,
         onAction: (e) => onAction == null ? void 0 : onAction(e),
         onDelete: (e) => handleChange(e, "delete"),
-        onNote: (e) => handleChange(e),
-        onLike: (e) => handleChange(e),
-        onCard: (e) => onCard == null ? void 0 : onCard(e),
+        onNote: (e) => handleChange(e, "note", { note: e.note }),
+        onLike: (e) => handleChange(e, "like", { like_status: e.like_status }),
+        onCard: (e) => handleChange == null ? void 0 : handleChange(e, "view"),
         ...productParams
       }
     );

package/lib/components/shoppingCart/components/Render/index.js

@@ -46,15 +46,17 @@ var Content = () => {
   const [pet, setPet] = (0, import_react.useState)([]);
   const { isEmpty, className, holders, products, isEdit } = state;
   (0, import_react.useEffect)(() => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let _holders = holders == null ? void 0 : holders.filter((item) => (item == null ? void 0 : item.key) > 0);
     console.log(isEdit, products, _holders, pet, "wh_holder");
     if ((_holders == null ? void 0 : _holders.length) && !(pet == null ? void 0 : pet.length) && (products == null ? void 0 : products.length) && !isEdit) {
       if (_holders.length === 1) {
-        const _products = (0, import_utils.formatService)(products, (_a = _holders[0]) == null ? void 0 : _a.key);
+        onChange(products, "update_holders", (_a = _holders[0]) == null ? void 0 : _a.key);
+        return;
+        const _products = (0, import_utils.formatService)(products, (_b = _holders[0]) == null ? void 0 : _b.key);
         onChange(_products);
       } else {
-        (_c = (_b = selectPetRef.current) == null ? void 0 : _b.open) == null ? void 0 : _c.call(_b, {
+        (_d = (_c = selectPetRef.current) == null ? void 0 : _c.open) == null ? void 0 : _d.call(_c, {
           products,
           holders
         });
@@ -68,12 +70,6 @@ var Content = () => {
       className: (0, import_classnames.default)("pisell-lowcode__shopping-cart-wrap", className)
     },
     isEmpty ? /* @__PURE__ */ import_react.default.createElement(import_Empty.default, null) : /* @__PURE__ */ import_react.default.createElement(import_Cart.default, null)
-  ), /* @__PURE__ */ import_react.default.createElement(
-    import_SelectHolderModal.default,
-    {
-      ref: selectPetRef,
-      onChange: (e) => onChange(e)
-    }
-  ));
+  ), /* @__PURE__ */ import_react.default.createElement(import_SelectHolderModal.default, { ref: selectPetRef, onChange }));
 };
 var Render_default = Content;

package/lib/components/shoppingCart/components/SelectHolderModal/index.js

@@ -54,7 +54,7 @@ var SelectPetModal = ({ onChange }, ref) => {
   });
   const handleChange = (e, index) => {
     const _lists = [...params == null ? void 0 : params.service];
-    _lists[index]._extend.holder_id = e;
+    _lists[index].holder_id = e;
     console.log(e, index, _lists, "wh79876");
     setParams({ ...params, service: _lists });
   };
@@ -75,13 +75,14 @@ var SelectPetModal = ({ onChange }, ref) => {
           className: "pisell-lowcode__booking-select-pet-item",
           key: item._id
         },
-        /* @__PURE__ */ import_react.default.createElement("span", null, " ", item.title),
+        /* @__PURE__ */ import_react.default.createElement("span", null, " ", item.name),
         /* @__PURE__ */ import_react.default.createElement(
           import_antd.Select,
           {
             defaultValue: (_a2 = options[0]) == null ? void 0 : _a2.value,
             onChange: (e) => handleChange(e, index),
-            options
+            options,
+            popupMatchSelectWidth: false
           }
         )
       );
@@ -91,7 +92,14 @@ var SelectPetModal = ({ onChange }, ref) => {
     setOpen(false);
   };
   const handleOk = () => {
-    onChange(params == null ? void 0 : params.service);
+    const { service } = params;
+    const holders = service == null ? void 0 : service.map((item) => {
+      return {
+        _id: item._id,
+        holder_id: item.holder_id
+      };
+    });
+    onChange(service, "update_holders", holders);
     handleCancel();
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(

package/lib/components/shoppingCart/hooks/useClearCart.js

@@ -37,7 +37,6 @@ var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
 var import_useContext = require("./useContext");
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("../utils");
 var useClearCart = (key) => {
   const { state, updateState, onChange } = (0, import_useContext.useContext)();
   const { isProductList, disabledEdit } = state;
@@ -46,15 +45,11 @@ var useClearCart = (key) => {
     if (typeof key === "undefined") {
       products = [];
     } else {
-      products = products.filter(
-        (item) => {
-          var _a;
-          return ((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.holder_id) !== key;
-        }
-      );
+      const ids = products == null ? void 0 : products.map((item) => item == null ? void 0 : item._id);
+      onChange(ids, "delete_holders", key);
+      return;
+      products = products.filter((item) => (item == null ? void 0 : item.holder_id) !== key);
     }
-    updateState((0, import_utils2.updateProduct)(state, products));
-    onChange(products);
   };
   return !disabledEdit ? /* @__PURE__ */ import_react.default.createElement(
     "span",

package/lib/components/shoppingCart/type.d.ts

@@ -17,7 +17,7 @@ export interface shoppingCartProps {
     defaultActiveKey?: string[] | number[];
     className?: string;
     onCard?: (e: any) => void;
-    onChange?: (e: any) => void;
+    onChange?: (items: any, type?: string, other?: any) => void;
     onAddProduct?: (e?: any) => void;
     onActiveKey?: (e: any) => void;
     isShowImage?: boolean;

package/lib/components/shoppingCart/utils.js

@@ -33,10 +33,7 @@ var formatCartList = (state) => {
     return {
       ...holder,
       products: products == null ? void 0 : products.filter(
-        (product) => {
-          var _a;
-          return ((_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.holder_id) === (holder == null ? void 0 : holder.key);
-        }
+        (product) => (product == null ? void 0 : product.holder_id) === (holder == null ? void 0 : holder.key)
       )
     };
   });
@@ -74,10 +71,7 @@ var formatService = (service, id) => {
   return service.map((item) => {
     return {
       ...item,
-      _extend: {
-        ...item._extend || {},
-        holder_id: id
-      }
+      holder_id: id
     };
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.201",
+  "version": "3.0.202",
   "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.0.62",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.1",
-    "@pisell/materials": "3.0.61"
+    "@pisell/date-picker": "3.0.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",