@pisell/private-materials 3.0.151-gray → 3.0.151

package/lib/components/booking/utils.js

@@ -112,9 +112,7 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
         value: durationValue
       });
     } else {
-      const durationLabel = `${durationValue} ${import_utils.locales.getText(
-        "pisell2.text.min"
-      )}`;
+      const durationLabel = `${durationValue} ${import_utils.locales.getText("pisell2.text.min")}`;
       durationSlicesBasedOnTime.push({
         label: durationLabel,
         value: durationValue
@@ -137,9 +135,7 @@ var getServeStartTime = (start_time) => {
   return start_time;
 };
 var getServiceTime = (item, currentDate) => {
-  const startDate = (0, import_dayjs.default)(
-    currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time));
   const startTime = startDate.format("HH:mm");
   const endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   const duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
@@ -187,7 +183,10 @@ var formatProductListByCategory = (list, filterItem) => {
         }
         categoryObject[categoryItem.id] = {
           ...categoryItem,
-          products: [...categoryObject[categoryItem.id].products, productItem]
+          products: [
+            ...categoryObject[categoryItem.id].products,
+            productItem
+          ]
         };
       }
     } else {
@@ -209,9 +208,7 @@ var formatProductListByCategory = (list, filterItem) => {
   return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
-  const startDate = (0, import_dayjs.default)(
-    cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));
   const isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
   let isMaxLimitRange = false;
   let isDateRange = false;
@@ -221,22 +218,13 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   } else {
     isMaxLimitRange = "unknown";
   }
-  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(
-    1,
-    "second"
-  );
-  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(
-    1,
-    "second"
-  );
+  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(1, "second");
+  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(1, "second");
   let bol;
   if (isFlexible) {
     bol = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
   } else {
-    let endDate = startDate.add(
-      flexibleObj.getValue(cacheItem._extend.duration),
-      "minute"
-    );
+    let endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
     bol = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
   }
   if (bol) {
@@ -341,9 +329,7 @@ var flexibleObj = {
 };
 var getEndDate = (startDate, duration, endDate) => {
   if (duration === "flexible") {
-    let openingDate = (0, import_dayjs.default)(
-      startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours()
-    );
+    let openingDate = (0, import_dayjs.default)(startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours());
     if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
       openingDate = openingDate.add(1, "day");
     }
@@ -358,13 +344,8 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
-  const startDate = (0, import_dayjs.default)(
-    (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
-  );
-  const endDate = startDate.add(
-    flexibleObj.getValue(service._extend.duration),
-    "minute"
-  );
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
+  const endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate,
     endDate
@@ -373,12 +354,10 @@ var getServiceTimes = (service) => {
 var getErrorList = (resource, cacheItem) => {
   var _a, _b, _c;
   if (!(cacheItem == null ? void 0 : cacheItem.id)) {
-    return [
-      {
-        label: import_utils.locales.getText("pisell2.text.no-product-added"),
-        type: "products"
-      }
-    ];
+    return [{
+      label: import_utils.locales.getText("pisell2.text.no-product-added"),
+      type: "products"
+    }];
   }
   if (!resource || !resource._extend || !cacheItem) {
     return [];
@@ -387,10 +366,7 @@ var getErrorList = (resource, cacheItem) => {
   if (!resource.usable) {
     if (!((_a = resource == null ? void 0 : resource._extend) == null ? void 0 : _a.usableProduct)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(
-          resource.labelText,
-          cacheItem == null ? void 0 : cacheItem.title
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(resource.labelText, cacheItem == null ? void 0 : cacheItem.title),
         type: "product"
       });
     }
@@ -402,21 +378,13 @@ var getErrorList = (resource, cacheItem) => {
     }
     if (!((_b = resource._extend) == null ? void 0 : _b.usableTime)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(
-          resource.labelText,
-          startText,
-          endText
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(resource.labelText, startText, endText),
         type: "time"
       });
     } else {
       if (!((_c = resource._extend) == null ? void 0 : _c.usableTime._extend.isMaxLimitRange)) {
         list.push({
-          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(
-            resource.labelText,
-            startText,
-            endText
-          ),
+          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(resource.labelText, startText, endText),
           type: "limit"
         });
       }
@@ -486,14 +454,11 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
         _extend.resource = resourceId;
       }
     }
+    console.log("_extend", findNextSliceProps);
     if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
-      if (cacheItem.currentDefaultTime) {
-        _extend.start_time = cacheItem.currentDefaultTime;
-      } else {
-        _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
-      }
+      _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
     }
   }
   _extend = {

package/lib/components/eftposPay/index.js

@@ -241,6 +241,8 @@ var eftposPay_default = (props) => {
       onChangeParams: props.onChangeParams,
       action,
       source: props.source,
+      tyroUrl: props.tyroUrl,
+      tyroVersion: props.tyroVersion,
       device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));

package/lib/components/eftposPay/tyro/index.js

@@ -197,10 +197,8 @@ var tyro_default = ({
   const receiptCallbackImpl = ({ signatureRequired, merchantReceipt }) => {
     console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
     console.log("商家小票 小票内容 = \n", merchantReceipt);
-    if (signatureRequired) {
-      const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
-      onChange("print", receipt);
-    }
+    const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
+    onChange("print", receipt);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
   };
   const statusMessageCallbackImpl = (message) => {
@@ -308,7 +306,7 @@ var tyro_default = ({
       card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
-      action: modeRef.current,
+      action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
       status: response.result === "APPROVED" ? "succeed" : "failed",
       request: requestParams.current,
       response: { ...response, merchantReceipt: merchantReceiptRef.current },
@@ -382,7 +380,8 @@ var tyro_default = ({
         failCustom: {
           isPosNetworkError: false,
           status: "fail",
-          fail: import_utils.locales.getText("page.eftpos-pay.text.transaction.fail"),
+          fail: response.result,
+          //locales.getText('page.eftpos-pay.text.transaction.fail'),
           warn: null,
           title: import_utils.locales.getText("page.eftpos-pay.text.failed")(
             modeRef.current
@@ -398,7 +397,9 @@ var tyro_default = ({
     if (load && TyroRef.current) {
       const IClient = TyroRef.current.IClient;
       if (IClient) {
+        console.log("apiKey = ", apiKey, "posProductData = ", posProductData);
         const iclient = new IClient(apiKey, posProductData);
+        console.log(iclient.posProductData);
         iClientRef.current = iclient;
         if (isCancelRef.current) {
           return;

package/lib/components/pay/toC/PaymentMethods/ApplePay/index.js

@@ -40,6 +40,7 @@ var import_utils = require("@pisell/utils");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils2 = require("../../utils");
 var ApplePay = (props, ref) => {
   var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -63,7 +64,10 @@ var ApplePay = (props, ref) => {
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
-      const _href = `${config.pay}/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`;
+      const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
+        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        state.history
+      )}`;
       window.location.href = _href;
     } catch (err) {
       setOpen(false);

package/lib/components/pay/toC/PaymentMethods/BankDeposit/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(BankDeposit_exports);
 var import_react = require("react");
 var import_model = require("../../model");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils = require("../../utils");
 var import_index = require("./index.less");
 var BankDeposit = (props, ref) => {
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -53,9 +54,11 @@ var BankDeposit = (props, ref) => {
       });
       return;
     }
-    state.history.push(
-      `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`
-    );
+    const _href = `${(0, import_utils.formatFranchiseeRoute)(
+      `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`,
+      state.history
+    )}`;
+    state.history.push(_href);
   };
   (0, import_react.useImperativeHandle)(
     ref,

package/lib/components/pay/toC/PaymentMethods/GooglePay/index.js

@@ -39,6 +39,7 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var GooglePay = (props, ref) => {
   var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -62,7 +63,10 @@ var GooglePay = (props, ref) => {
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
-      const _href = `${config.pay}/google-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`;
+      const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
+        `/google-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        state.history
+      )}`;
       window.location.href = _href;
     } catch (err) {
       setOpen(false);

package/lib/components/pay/toC/utils.d.ts

@@ -36,3 +36,14 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
  * @Date: 2024-08-30 10:06:17
  */
 export declare const getIsWalletPassAndTripartitePayment: (payGroup: PayGroup) => boolean | 0 | undefined;
+export declare const isFranchiseeShop: (path?: any, history?: any) => any;
+/**
+ * @title: 获取当前连锁加盟店铺shopid
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: chensheng.gu
+ * @Date: 2024-08-07 10:04
+ */
+export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
+export declare const formatFranchiseeRoute: (url: string, history?: any) => string;

package/lib/components/pay/toC/utils.js

@@ -20,9 +20,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calcWalletPassListAmount: () => calcWalletPassListAmount,
+  formatFranchiseeRoute: () => formatFranchiseeRoute,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
   formatWalletPassParams: () => formatWalletPassParams,
-  getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment
+  getFranchiseeShopId: () => getFranchiseeShopId,
+  getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment,
+  isFranchiseeShop: () => isFranchiseeShop
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
@@ -60,10 +63,31 @@ var getIsWalletPassAndTripartitePayment = (payGroup) => {
   var _a, _b, _c;
   return ((_b = (_a = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a.cards) == null ? void 0 : _b.length) && (0, import_status.isTripartitePayment)((_c = payGroup == null ? void 0 : payGroup.otherPayment) == null ? void 0 : _c.service);
 };
+var isFranchiseeShop = (path, history) => {
+  const { pathname } = history.location;
+  const _pathname = path || pathname;
+  return _pathname && _pathname.includes("/franchisee");
+};
+var getFranchiseeShopId = (path, history) => {
+  const { pathname } = history.location;
+  const _pathname = path || pathname;
+  const match = _pathname.match(/\/shop_(\d+)\//);
+  const shopNumber = match ? match[1] : null;
+  return Number(shopNumber);
+};
+var formatFranchiseeRoute = (url, history) => {
+  if (isFranchiseeShop(null, history)) {
+    return `/franchisee/shop/shop_${getFranchiseeShopId(null, history)}${url}`;
+  }
+  return url;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
+  formatFranchiseeRoute,
   formatWalletPassList2PreparePayments,
   formatWalletPassParams,
-  getIsWalletPassAndTripartitePayment
+  getFranchiseeShopId,
+  getIsWalletPassAndTripartitePayment,
+  isFranchiseeShop
 });

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/lib/index.d.ts

@@ -12,7 +12,6 @@ export { default as BookingStartTime } from './components/booking/materiels/star
 export { default as BookingDuration } from './components/booking/materiels/duration';
 export { default as BookingContacts } from './components/booking/materiels/contacts';
 export { VerticalClient } from './components/booking/info/clientVariant';
-export { default as VerticalAddService } from './components/booking/info/addServiceVariant';
 export { default as ProductExtension } from './components/productExtension';
 export { default as BookingDeposit } from './components/booking/deposit';
 export { default as RuleSetting } from './components/ruleSetting';
@@ -20,4 +19,3 @@ export { default as TaxSelect } from './components/taxSelect';
 export { default as ToCPay } from './components/pay/toC';
 export { default as Eftpos } from './components/eftpos';
 export { default as EftposPay } from './components/eftposPay';
-export { default as BookingDashboard } from './components/booking/dashboard';

package/lib/index.js

@@ -32,7 +32,6 @@ __export(src_exports, {
   Booking: () => import_booking.default,
   BookingAddons: () => import_addons.default,
   BookingContacts: () => import_contacts.default,
-  BookingDashboard: () => import_dashboard.default,
   BookingDeposit: () => import_deposit.default,
   BookingDuration: () => import_duration.default,
   BookingForms: () => import_forms.default,
@@ -49,7 +48,6 @@ __export(src_exports, {
   Schedules: () => import_schedules.default,
   TaxSelect: () => import_taxSelect.default,
   ToCPay: () => import_toC.default,
-  VerticalAddService: () => import_addServiceVariant.default,
   VerticalClient: () => import_clientVariant.VerticalClient
 });
 module.exports = __toCommonJS(src_exports);
@@ -69,7 +67,6 @@ var import_startTime = __toESM(require("./components/booking/materiels/startTime
 var import_duration = __toESM(require("./components/booking/materiels/duration"));
 var import_contacts = __toESM(require("./components/booking/materiels/contacts"));
 var import_clientVariant = require("./components/booking/info/clientVariant");
-var import_addServiceVariant = __toESM(require("./components/booking/info/addServiceVariant"));
 var import_productExtension = __toESM(require("./components/productExtension"));
 var import_deposit = __toESM(require("./components/booking/deposit"));
 var import_ruleSetting = __toESM(require("./components/ruleSetting"));
@@ -77,7 +74,6 @@ var import_taxSelect = __toESM(require("./components/taxSelect"));
 var import_toC = __toESM(require("./components/pay/toC"));
 var import_eftpos = __toESM(require("./components/eftpos"));
 var import_eftposPay = __toESM(require("./components/eftposPay"));
-var import_dashboard = __toESM(require("./components/booking/dashboard"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -85,7 +81,6 @@ import_dayjs.default.extend(import_localeData.default);
   Booking,
   BookingAddons,
   BookingContacts,
-  BookingDashboard,
   BookingDeposit,
   BookingDuration,
   BookingForms,
@@ -102,6 +97,5 @@ import_dayjs.default.extend(import_localeData.default);
   Schedules,
   TaxSelect,
   ToCPay,
-  VerticalAddService,
   VerticalClient
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.151-gray",
+  "version": "3.0.151",
   "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/materials": "3.0.48",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.0.49-gray",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/booking/dashboard/index.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivElement> {
-    backgroundColors?: string[];
-    labelColor?: string;
-    valueColor?: string;
-    otherParams?: Record<string, any>;
-    refreshKey?: string;
-}
-declare const BookingDashboard: (props: BookingDashboardProps) => React.JSX.Element;
-export default BookingDashboard;