@pisell/private-materials 3.0.151-gray → 3.0.151

package/es/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: (props: any) => JSX.Element;
 export default Notes;

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

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

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

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

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

@@ -62,7 +62,7 @@ export declare const getServeStartTime: (start_time: string) => string;
  * @Date: 2024-04-26 14:04
  */
 export declare const getServiceTime: (item: any, currentDate: any) => string;
-export declare const findNextSlice: ({ timeSlices, index, date, }: {
+export declare const findNextSlice: ({ timeSlices, index, date }: {
     timeSlices: any[];
     index?: number | undefined;
     date?: string | undefined;

package/es/components/booking/utils.js

@@ -14,7 +14,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import dayjs from 'dayjs';
-import { locales } from '@pisell/utils';
+import { locales } from "@pisell/utils";
 import { intersectionBy } from 'lodash';
 var Request = /*#__PURE__*/function () {
   function Request() {
@@ -38,7 +38,7 @@ export var request = new Request();
 
 /**
  * @title: 格式化持续时长用于展示
- * @description:
+ * @description: 
  * @param {number} service_times
  * @return {*}
  * @Author: zhiwei.Wang
@@ -46,12 +46,12 @@ export var request = new Request();
  */
 export var getDiscountTime = function getDiscountTime(service_times) {
   if (!service_times) {
-    return '';
+    return "";
   }
   if (service_times < 60) {
     return "".concat(service_times, " ").concat(locales.getText('pisell2.text.min'));
   } else {
-    var str = '';
+    var str = "";
     var hours = Math.floor(service_times / 60);
     var minutes = service_times % 60;
     str += "".concat(hours).concat(locales.getText('pisell2.text.h'));
@@ -64,7 +64,7 @@ export var getDiscountTime = function getDiscountTime(service_times) {
 
 /**
  * @title: 时间切片
- * @description:
+ * @description: 
  * @param {any} config
  * @param {string} locale
  * @return {*}
@@ -75,22 +75,22 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
-  var startTime = dayjs().startOf('day');
-  var endTime = dayjs().endOf('day');
+  var startTime = dayjs().startOf("day");
+  var endTime = dayjs().endOf("day");
   var timeSlice = (config === null || config === void 0 ? void 0 : config.value) || 5; // 切片时间间隔（分钟）
 
   var timeSlices = [];
   var durationSlicesBasedOnTime = [];
   var currentTime = startTime;
   while (currentTime.isBefore(endTime)) {
-    var timeLabel = currentTime.format('hh:mm A');
-    var timeValue = currentTime.format('HH:mm');
+    var timeLabel = currentTime.format("hh:mm A");
+    var timeValue = currentTime.format("HH:mm");
     timeSlices.push({
       label: timeLabel,
       value: timeValue
     });
-    var nextTime = currentTime.add(timeSlice, 'minute');
-    var durationValue = nextTime.diff(startTime, 'minute');
+    var nextTime = currentTime.add(timeSlice, "minute");
+    var durationValue = nextTime.diff(startTime, "minute");
     if (durationValue > 60) {
       var durationLabel = getDiscountTime(durationValue);
       durationSlicesBasedOnTime.push({
@@ -114,7 +114,7 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
 
 //  获取当前时间
 export var getNowTime = function getNowTime() {
-  return dayjs().format('HH:mm');
+  return dayjs().format("HH:mm");
 };
 export var isNowTime = function isNowTime(time) {
   return time === 'now';
@@ -122,7 +122,7 @@ export var isNowTime = function isNowTime(time) {
 
 /**
  * @title: 获取服务的开始时间, 如果是now 转换为当前的时间
- * @description:
+ * @description: 
  * @param {string} start_time
  * @return {*}
  * @Author: zhiwei.Wang
@@ -137,7 +137,7 @@ export var getServeStartTime = function getServeStartTime(start_time) {
 
 /**
  * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
- * @description:
+ * @description: 
  * @param {any} item
  * @param {any} currentDate
  * @return {*}
@@ -146,8 +146,8 @@ export var getServeStartTime = function getServeStartTime(start_time) {
  */
 export var getServiceTime = function getServiceTime(item, currentDate) {
   var startDate = dayjs(currentDate.format('YYYY-MM-DD') + ' ' + getServeStartTime(item._extend.start_time));
-  var startTime = startDate.format('HH:mm');
-  var endTime = startDate.add(flexibleObj.getValue(item._extend.duration), 'minute').format('HH:mm');
+  var startTime = startDate.format("HH:mm");
+  var endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   var duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
   return "".concat(startTime, " - ").concat(endTime, " ( ").concat(duration, " )");
 };
@@ -203,17 +203,17 @@ export var formatProductListByCategory = function formatProductListByCategory(li
         });
       }
     } else {
-      if (!categoryObject['other']) {
-        categoryObject['other'] = {
+      if (!categoryObject["other"]) {
+        categoryObject["other"] = {
           id: 0,
           title: locales.getText('pisell2.text.other'),
           name: locales.getText('pisell2.text.other'),
-          cover: '',
+          cover: "",
           products: []
         };
       }
-      categoryObject['other'] = _objectSpread(_objectSpread({}, categoryObject['other']), {}, {
-        products: [].concat(_toConsumableArray(categoryObject['other'].products), [productItem])
+      categoryObject["other"] = _objectSpread(_objectSpread({}, categoryObject["other"]), {}, {
+        products: [].concat(_toConsumableArray(categoryObject["other"].products), [productItem])
       });
     }
   }
@@ -222,7 +222,7 @@ export var formatProductListByCategory = function formatProductListByCategory(li
   });
 };
 export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cacheItem) {
-  var startDate = dayjs(cacheItem._extend.start_date.format('YYYY-MM-DD') + ' ' + getServeStartTime(cacheItem._extend.start_time));
+  var startDate = dayjs(cacheItem._extend.start_date.format("YYYY-MM-DD") + ' ' + getServeStartTime(cacheItem._extend.start_time));
   var isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
 
   // 是否在最大预约数量的区间内
@@ -236,10 +236,10 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     isMaxLimitRange = true;
   } else {
     // unknown 为 未知的,  需要掉接口确认是否可用
-    isMaxLimitRange = 'unknown';
+    isMaxLimitRange = "unknown";
   }
-  var timeStartDate = dayjs(time.start_date + ' ' + time.start_time).subtract(1, 'second');
-  var timeEndDate = dayjs(time.end_date + ' ' + time.end_time).add(1, 'second');
+  var timeStartDate = dayjs(time.start_date + " " + time.start_time).subtract(1, "second");
+  var timeEndDate = dayjs(time.end_date + " " + time.end_time).add(1, "second");
   var bol;
 
   // 灵活时长的 只判断开始时间是否在范围内
@@ -247,7 +247,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     bol = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
   } else {
     // 其余判断 开始时间 和 结束时间 是否都在范围内
-    var endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), 'minute');
+    var endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
     bol = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
   }
 
@@ -291,8 +291,8 @@ export var formatTimes = function formatTimes(resourceItem, cacheItem) {
 
   // 获取第一个最佳的time
   var _time = (usableTimes || []).sort(function (a, b) {
-    var aEndDate = dayjs(a.end_date + ' ' + a.end_time).valueOf();
-    var bEndDate = dayjs(b.end_date + ' ' + b.end_time).valueOf();
+    var aEndDate = dayjs(a.end_date + " " + a.end_time).valueOf();
+    var bEndDate = dayjs(b.end_date + " " + b.end_time).valueOf();
     return aEndDate - bEndDate;
   })[0];
   resourceItem._extend = _objectSpread(_objectSpread({}, resourceItem._extend), {}, {
@@ -317,21 +317,21 @@ var formatResourceProducts = function formatResourceProducts(resourceItem, curre
   var type = _resourceItem.partyroom_package.type;
 
   // 全部商品
-  if (type === 'product_all') {
+  if (type === "product_all") {
     usableProduct = true;
   } else {
-    if (type === 'product_collection') {
+    if (type === "product_collection") {
       var _resourceItem$partyro;
       // 取交集  intersectionBy([{ 'x': 2 }, { 'x': 1 }], [{ 'x': 1 }], 'x'); // => [{ 'x': 2 }]
       usableProduct = !!intersectionBy(((_resourceItem$partyro = _resourceItem.partyroom_package) === null || _resourceItem$partyro === void 0 ? void 0 : _resourceItem$partyro.products.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           id: item.product_collection_id
         });
-      })) || [], currentItem.collection || [], 'id').length;
+      })) || [], currentItem.collection || [], "id").length;
     } else {
       usableProduct = _resourceItem.partyroom_package.products.some(function (item) {
         // 判断商品
-        if (type === 'products') {
+        if (type === "products") {
           if (item.product_id == currentItem.product_id) {
             return true;
           }
@@ -348,7 +348,7 @@ var formatResourceProducts = function formatResourceProducts(resourceItem, curre
 
 /**
  * @title: 获取店铺的营业结束时间
- * @description:
+ * @description: 
  * @return {*}
  * @Author: zhiwei.Wang
  * @Date: 2024-02-23 10:00
@@ -359,7 +359,7 @@ export var getShopOpeningHours = function getShopOpeningHours() {
 
 /**
  * @title: 对灵活时长进行处理
- * @description:
+ * @description: 
  * @return {*}
  * @Author: zhiwei.Wang
  * @Date: 2024-02-23 10:00
@@ -405,7 +405,7 @@ export var flexibleObj = {
 export var getEndDate = function getEndDate(startDate, duration, endDate) {
   if (duration === 'flexible') {
     // 店铺营业结束时间
-    var openingDate = dayjs(startDate.format('YYYY-MM-DD') + ' ' + getShopOpeningHours());
+    var openingDate = dayjs(startDate.format("YYYY-MM-DD") + ' ' + getShopOpeningHours());
 
     // 如果选择的开始时间 > 店铺的营业时间, 店铺营业时间向后推一天
     if (dayjs(startDate).isAfter(openingDate)) {
@@ -421,14 +421,14 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
     }
     return endDate;
   }
-  return startDate.add(duration, 'minute');
+  return startDate.add(duration, "minute");
 };
 
 // export const get
 
 export var getServiceTimes = function getServiceTimes(service) {
-  var startDate = dayjs(dayjs(service._extend.start_date).format('YYYY-MM-DD ') + getServeStartTime(service._extend.start_time));
-  var endDate = startDate.add(flexibleObj.getValue(service._extend.duration), 'minute');
+  var startDate = dayjs(dayjs(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
+  var endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate: startDate,
     endDate: endDate
@@ -438,7 +438,7 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
   if (!(cacheItem !== null && cacheItem !== void 0 && cacheItem.id)) {
     return [{
       label: locales.getText('pisell2.text.no-product-added'),
-      type: 'products'
+      type: "products"
     }];
   }
   if (!resource || !resource._extend || !cacheItem) {
@@ -452,29 +452,29 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
     if (!(resource !== null && resource !== void 0 && (_resource$_extend = resource._extend) !== null && _resource$_extend !== void 0 && _resource$_extend.usableProduct)) {
       list.push({
         label: locales.getText('pisell1.text.resource-error-message-1')(resource.labelText, cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.title),
-        type: 'product'
+        type: "product"
       });
     }
     var _getServiceTimes = getServiceTimes(cacheItem),
       startDate = _getServiceTimes.startDate,
       endDate = _getServiceTimes.endDate;
     // 如果跨天  结束时间前面加一个明天
-    var startText = startDate.format('hh:mm A');
-    var endText = endDate.format('hh:mm A');
-    if (dayjs(endDate).isAfter(startDate, 'day')) {
+    var startText = startDate.format("hh:mm A");
+    var endText = endDate.format("hh:mm A");
+    if (dayjs(endDate).isAfter(startDate, "day")) {
       endText = locales.getText('pisell1.text.tomorrow') + endText;
     }
     if (!((_resource$_extend2 = resource._extend) !== null && _resource$_extend2 !== void 0 && _resource$_extend2.usableTime)) {
       list.push({
         label: locales.getText('pisell1.text.resource-error-message-2')(resource.labelText, startText, endText),
-        type: 'time'
+        type: "time"
       });
     } else {
       var _resource$_extend3;
       if (!((_resource$_extend3 = resource._extend) !== null && _resource$_extend3 !== void 0 && _resource$_extend3.usableTime._extend.isMaxLimitRange)) {
         list.push({
           label: locales.getText('pisell1.text.resource-error-message-3')(resource.labelText, startText, endText),
-          type: 'limit'
+          type: "limit"
         });
       }
     }
@@ -526,7 +526,7 @@ export var deleteCacheParams = function deleteCacheParams() {
 
 /**
  * @title: 创建一个服务商品
- * @description:
+ * @description: 
  * @param {any} state
  * @param {any} item
  * @return {*}
@@ -555,10 +555,10 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
     // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
+    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
       _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
     } else {
-      _extend.start_time = lastServerEndDate.format('HH:mm');
+      _extend.start_time = lastServerEndDate.format("HH:mm");
     }
   } else {
     // 没有上一个商品  资源为 0
@@ -584,17 +584,14 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
         _extend.resource = resourceId;
       }
     }
+    console.log("_extend", findNextSliceProps);
 
     // 只有选择了带 HH:mm的日期才选中, 否则使用当前日期
     if (findNextSliceProps.date && findNextSliceProps.date !== '00:00') {
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
-      if (cacheItem.currentDefaultTime) {
-        _extend.start_time = cacheItem.currentDefaultTime;
-      } else {
-        // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
-        _extend.start_time = dayjs().format('HH:mm');
-      }
+      // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
+      _extend.start_time = dayjs().format('HH:mm');
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);

package/es/components/eftposPay/index.js

@@ -277,6 +277,8 @@ export default (function (props) {
     onChangeParams: props.onChangeParams,
     action: action,
     source: props.source,
+    tyroUrl: props.tyroUrl,
+    tyroVersion: props.tyroVersion,
     device_number: props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number
   }));
 });

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

@@ -235,12 +235,12 @@ export default (function (_ref) {
       merchantReceipt = _ref3.merchantReceipt;
     console.log('商家小票 客户端是否打印小票 = ', signatureRequired);
     console.log('商家小票 小票内容 = \n', merchantReceipt);
-    if (signatureRequired) {
-      var receipt = [merchantReceipt].filter(function (item) {
-        return typeof item === 'string';
-      }).filter(Boolean);
-      onChange('print', receipt);
-    }
+    // if (signatureRequired) {
+    var receipt = [merchantReceipt].filter(function (item) {
+      return typeof item === 'string';
+    }).filter(Boolean);
+    onChange('print', receipt);
+    // }
     merchantReceiptRef.current = {
       signatureRequired: signatureRequired,
       merchantReceipt: merchantReceipt
@@ -344,7 +344,7 @@ export default (function (_ref) {
       card_reader_id: (_deviceRef$current5 = deviceRef.current) === null || _deviceRef$current5 === void 0 ? void 0 : _deviceRef$current5.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
-      action: modeRef.current,
+      action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
       status: response.result === 'APPROVED' ? 'succeed' : 'failed',
       request: requestParams.current,
       response: _objectSpread(_objectSpread({}, response), {}, {
@@ -413,7 +413,8 @@ export default (function (_ref) {
       failCustom: {
         isPosNetworkError: false,
         status: 'fail',
-        fail: locales.getText('page.eftpos-pay.text.transaction.fail'),
+        fail: response.result,
+        //locales.getText('page.eftpos-pay.text.transaction.fail'),
         warn: null,
         title: locales.getText('page.eftpos-pay.text.failed')(modeRef.current)
       }
@@ -427,7 +428,9 @@ export default (function (_ref) {
     if (load && TyroRef.current) {
       var _IClient = TyroRef.current.IClient;
       if (_IClient) {
+        console.log('apiKey = ', apiKey, 'posProductData = ', posProductData);
         var iclient = new _IClient(apiKey, posProductData);
+        console.log(iclient.posProductData);
         iClientRef.current = iclient;
         if (isCancelRef.current) {
           return;

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

@@ -16,6 +16,7 @@ import { locales } from '@pisell/utils';
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import "./index.less";
+import { formatFranchiseeRoute } from "../../utils";
 /**
  * @title: Apple 支付
  * @description:
@@ -75,7 +76,7 @@ var ApplePay = function ApplePay(props, ref) {
 
               // 提取域名
               shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay, "/apple-pay?order_id=").concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id);
+              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
               window.location.href = _href;
             } catch (err) {
               setOpen(false);

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

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useImperativeHandle, forwardRef, useContext } from 'react';
 import { Context } from "../../model";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import { formatFranchiseeRoute } from "../../utils";
 import "./index.less";
 /**
  * @title: 银行转账
@@ -31,7 +32,7 @@ var BankDeposit = function BankDeposit(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _context$appHelper, _context$appHelper$co;
-      var payGroup, platform, _item;
+      var payGroup, platform, _item, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -52,9 +53,9 @@ var BankDeposit = function BankDeposit(props, ref) {
             });
             return _context.abrupt("return");
           case 6:
-            // h5打开银行转账页面
-            state.history.push("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)));
-          case 7:
+            _href = "".concat(formatFranchiseeRoute("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)), state.history)); // h5打开银行转账页面
+            state.history.push(_href);
+          case 8:
           case "end":
             return _context.stop();
         }

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

@@ -15,6 +15,7 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import { formatFranchiseeRoute } from "../../utils";
 /**
  * @title: 谷歌支付
  * @description:
@@ -72,7 +73,7 @@ var GooglePay = function GooglePay(props, ref) {
 
               // 提取域名
               shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay, "/google-pay?order_id=").concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id);
+              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
               window.location.href = _href;
             } catch (err) {
               setOpen(false);

package/es/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/es/components/pay/toC/utils.js

@@ -58,4 +58,31 @@ export var formatWalletPassParams = function formatWalletPassParams(payGroup) {
 export var getIsWalletPassAndTripartitePayment = function getIsWalletPassAndTripartitePayment(payGroup) {
   var _payGroup$walletPass, _payGroup$walletPass$, _payGroup$otherPaymen;
   return (payGroup === null || payGroup === void 0 ? void 0 : (_payGroup$walletPass = payGroup.walletPass) === null || _payGroup$walletPass === void 0 ? void 0 : (_payGroup$walletPass$ = _payGroup$walletPass.cards) === null || _payGroup$walletPass$ === void 0 ? void 0 : _payGroup$walletPass$.length) && isTripartitePayment(payGroup === null || payGroup === void 0 ? void 0 : (_payGroup$otherPaymen = payGroup.otherPayment) === null || _payGroup$otherPaymen === void 0 ? void 0 : _payGroup$otherPaymen.service);
+};
+export var isFranchiseeShop = function isFranchiseeShop(path, history) {
+  var pathname = history.location.pathname;
+  var _pathname = path || pathname;
+  return _pathname && _pathname.includes('/franchisee');
+};
+
+/**
+ * @title: 获取当前连锁加盟店铺shopid
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: chensheng.gu
+ * @Date: 2024-08-07 10:04
+ */
+export var getFranchiseeShopId = function getFranchiseeShopId(path, history) {
+  var pathname = history.location.pathname;
+  var _pathname = path || pathname;
+  var match = _pathname.match(/\/shop_(\d+)\//);
+  var shopNumber = match ? match[1] : null;
+  return Number(shopNumber);
+};
+export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history) {
+  if (isFranchiseeShop(null, history)) {
+    return "/franchisee/shop/shop_".concat(getFranchiseeShopId(null, history)).concat(url);
+  }
+  return url;
 };

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

@@ -16,12 +16,10 @@ 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";
 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";
+export { default as EftposPay } from "./components/eftposPay";

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

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

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

@@ -595,7 +595,7 @@ var Footer = (props) => {
     }
     if (transaction_habit_selection.button_rows == 1) {
       if (state.appointment_status !== "cancelled") {
-        if (!state.disabledEdit && !state.isBookingCreatePage) {
+        if (!state.disabledEdit) {
           arr.push(actionMap.sale);
         }
       }
@@ -695,7 +695,7 @@ var Footer = (props) => {
       if (!state.bookingDetail) {
         return true;
       }
-      if (!((_a2 = state.addons) == null ? void 0 : _a2.load) && state.renderType !== "eventBooking" && !state.isBookingCreatePage) {
+      if (!((_a2 = state.addons) == null ? void 0 : _a2.load) && state.renderType !== "eventBooking") {
         return true;
       }
     }
@@ -809,7 +809,7 @@ var Footer = (props) => {
       className: "pisell-lowcode__booking-footer-buttons",
       style: { marginTop: 12 }
     },
-    state.appointment_status !== "cancelled" && !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(
+    state.appointment_status !== "cancelled" ? /* @__PURE__ */ import_react.default.createElement(
       import_antd2.Button,
       {
         onClick: () => handleSale(),

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

@@ -12,7 +12,6 @@ export interface InfoProps {
     client: any;
     loading?: boolean;
     addButtonProps?: any;
-    drawerProps?: any;
 }
 /**
  * @title: 表单模块