@pisell/private-materials 6.4.77 → 6.4.79

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

@@ -42,5 +42,18 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -112,6 +112,8 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     return {
+      "is_charge_tax": d.is_charge_tax,
+      "tax_fee": d.tax_fee,
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
       "bundle_product_id": (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? void 0 : d.product_id),
@@ -127,8 +129,13 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "option": option,
       "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
       "bundle_sum_price": (d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.original_total),
-      metadata: {
-        custom_product_bundle_map_id: d._id
+      "metadata": {
+        custom_product_bundle_map_id: d._id,
+        // 子商品单数量附加费
+        "surcharge_fee": d.surcharge_fee,
+        // 可选，附加费均摊舍入金额
+        "surcharge_rounding_remainder": d.surcharge_rounding_remainder,
+        relation_surcharge_ids: d.relation_surcharge_ids || []
       }
     };
   });
@@ -296,7 +303,7 @@ export var formatProductPrice = function formatProductPrice(item) {
  * @param item
  * @returns
  */
-var formatOriginalPrice = function formatOriginalPrice(item) {
+export var formatOriginalPrice = function formatOriginalPrice(item) {
   var _item$_extend8;
   return Number((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.origin_total);
 };
@@ -306,7 +313,7 @@ var formatOriginalPrice = function formatOriginalPrice(item) {
  * @param item
  * @returns
  */
-var formatSellingPrice = function formatSellingPrice(item) {
+export var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
@@ -333,6 +340,35 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   }
   return metadata;
 };
+var formatProductMetadata = function formatProductMetadata(item) {
+  var _item$_extend17, _item$_extend19, _item$_extend21, _item$_extend23;
+  var metadata = {};
+
+  // 主商品+非原价(加减价)子商品附加费
+  if ((_item$_extend17 = item._extend) !== null && _item$_extend17 !== void 0 && _item$_extend17.surcharge_fee) {
+    var _item$_extend18;
+    metadata.main_product_attached_bundle_surcharge_fee = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.surcharge_fee;
+  }
+
+  // 主商品+非原价(加减价)子商品税费
+  if ((_item$_extend19 = item._extend) !== null && _item$_extend19 !== void 0 && _item$_extend19.main_product_attached_bundle_tax_fee) {
+    var _item$_extend20;
+    metadata.main_product_attached_bundle_tax_fee = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.main_product_attached_bundle_tax_fee;
+  }
+
+  // 可选，附加费均摊舍入金额
+  if ((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.surcharge_rounding_remainder) {
+    var _item$_extend22;
+    metadata.surcharge_rounding_remainder = (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.surcharge_rounding_remainder;
+  }
+
+  // 使用的附加费id列表
+  if ((_item$_extend23 = item._extend) !== null && _item$_extend23 !== void 0 && _item$_extend23.relation_surcharge_ids) {
+    var _item$_extend24;
+    metadata.relation_surcharge_ids = (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.relation_surcharge_ids;
+  }
+  return metadata;
+};
 
 // const formatDiscountList = (list: any[]) => {
 //   return list.map(item => {
@@ -349,10 +385,10 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
 // }
 
 // 获取商品价格 包含组合规格
-var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend17, _item$_extend18, _item$variant2;
-  var other = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.other;
-  var price = Number((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.price);
+export var getSourceProductPrice = function getSourceProductPrice(item) {
+  var _item$_extend25, _item$_extend26, _item$variant2;
+  var other = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.other;
+  var price = Number((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
@@ -375,11 +411,11 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend19, _item$_extend$main_pr, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
+  var _item$_extend27, _item$_extend$main_pr, _item$_extend28, _item$_extend29, _item$_extend30, _item$_extend31;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var bundleDiscountList = getBundleDiscountList(((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 || (_item$_extend27 = _item$_extend27.other) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.bundle) || []);
   var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
   discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
@@ -408,17 +444,17 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.note) || '',
+    "note": ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.note) || '',
     "discountway": item._extend.discountway || "num",
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.bundle),
+    "product_bundle": formatProductBundle((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 || (_item$_extend29 = _item$_extend29.other) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.option),
-    "product_variant_id": ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 || (_item$_extend23 = _item$_extend23.other) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 || (_item$_extend30 = _item$_extend30.other) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.option),
+    "product_variant_id": ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.product_variant_id) || 0,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatProductMetadata(item),
     // checkout 需求新增字段
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
@@ -441,8 +477,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend24;
-    var holderId = (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id;
+    var _item$_extend32;
+    var holderId = (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -468,15 +504,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend25;
-      return ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend33;
+      return ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend26;
-      var key = (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id; // 分组键
+      var _item$_extend34;
+      var key = (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -538,7 +574,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend31, _item$_extend32;
+    var _item$_extend39, _item$_extend40;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -559,9 +595,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend27, _item$_extend28, _item$_extend29, _item$_extend30;
-      var startDate = ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.startDate) || ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.start_date);
-      var endDate = ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.endDate) || ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.end_date);
+      var _item$_extend35, _item$_extend36, _item$_extend37, _item$_extend38;
+      var startDate = ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.startDate) || ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.start_date);
+      var endDate = ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.endDate) || ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -587,8 +623,8 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId];
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.groupId];
+    if (!((_item$_extend40 = item._extend) !== null && _item$_extend40 !== void 0 && _item$_extend40.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -627,13 +663,25 @@ var formatBookings = function formatBookings(data, values) {
     for (var i = 0; i < (item._extend.quantity || 1); i++) {
       var newItem = cloneDeep(item);
       newItem._extend.unique_identification_number = "".concat(item._extend.unique_identification_number, "_").concat(i);
+      // 舍入金额已基于数量计算，拆分时只保留第一个的 surcharge_rounding_remainder
+      if (i > 0) {
+        var _newItem$_extend;
+        // 清除主商品的舍入金额
+        newItem._extend.surcharge_rounding_remainder = undefined;
+        // 清除 bundle 子商品的舍入金额
+        if (((_newItem$_extend = newItem._extend) === null || _newItem$_extend === void 0 || (_newItem$_extend = _newItem$_extend.other) === null || _newItem$_extend === void 0 || (_newItem$_extend = _newItem$_extend.bundle) === null || _newItem$_extend === void 0 ? void 0 : _newItem$_extend.length) > 0) {
+          newItem._extend.other.bundle.forEach(function (bundleItem) {
+            bundleItem.surcharge_rounding_remainder = undefined;
+          });
+        }
+      }
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
         product: formatProducts(newItem, 1),
         number: item._extend.capacity ? getSumCapacity({
           cacheItem: newItem
         }, false) : newItem._extend.number || 1,
         holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem)
+        metadata: formatMetaData(newItem, false)
       }));
     }
   });
@@ -653,16 +701,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend33;
+    var _item$_extend41;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend34;
-    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
+    var _item$_extend42;
+    if (!((_item$_extend42 = item._extend) !== null && _item$_extend42 !== void 0 && _item$_extend42.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -681,8 +729,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend35;
-    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
+    var _item$_extend43;
+    if (!((_item$_extend43 = item._extend) !== null && _item$_extend43 !== void 0 && _item$_extend43.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -803,19 +851,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend37;
+    var _item$_extend45;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend36;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
+      var _item$_extend44;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend44 = item._extend) === null || _item$_extend44 === void 0 || (_item$_extend44 = _item$_extend44.other) === null || _item$_extend44 === void 0 ? void 0 : _item$_extend44.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.holder_id) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.length) !== item._extend.quantity) {
-      var _item$_extend38;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 || (_item$_extend45 = _item$_extend45.holder_id) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.length) !== item._extend.quantity) {
+      var _item$_extend46;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend46 = item._extend) === null || _item$_extend46 === void 0 || (_item$_extend46 = _item$_extend46.other) === null || _item$_extend46 === void 0 ? void 0 : _item$_extend46.rowKey);
       return true;
     }
     return false;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

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

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

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

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/es/components/booking/info/notes/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/es/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/es/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/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/es/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const ContactInfoMode: () => JSX.Element;
 export default ContactInfoMode;

package/es/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/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

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

package/es/components/checkout/PaymentPlugin.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PaymentPlugin: () => JSX.Element;
 export default PaymentPlugin;

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

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

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

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
@@ -303,12 +303,12 @@ export declare const backUpFree: (payload: Partial<State>) => {
         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;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/index.d.ts

@@ -20,4 +20,5 @@ import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };
+import Registry from './systemSettings/registry';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };

package/es/components/index.js

@@ -20,4 +20,5 @@ import StepController from "./stepController";
 import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth };
+import Registry from "./systemSettings/registry";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };

package/es/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -476,16 +476,7 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
   // 返回iframe
   return new Promise(function (res, rej) {
     var timer = null;
-
-    // 120秒没成功 认为失败
-    timer = setTimeout(function () {
-      log({
-        msg: '第五步: 60秒超时则走N逻辑',
-        data: challengeData
-      });
-      rej('time out');
-    }, 2 * 60 * 1000);
-    window.addEventListener('message', function (event) {
+    var handleMessage = function handleMessage(event) {
       // loadingSpinnerAnimation("on");
       if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
         if (typeof event.data.cres == 'string') {
@@ -496,7 +487,18 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
           closeIframe();
         }
       }
-    }, false);
+    };
+
+    // 120秒没成功 认为失败
+    timer = setTimeout(function () {
+      log({
+        msg: '第五步: 60秒超时则走N逻辑',
+        data: challengeData
+      });
+      window.removeEventListener('message', handleMessage);
+      rej('time out');
+    }, 2 * 60 * 1000);
+    window.addEventListener('message', handleMessage, false);
   });
 };
 

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

@@ -130,6 +130,8 @@ var PaymentReturnContent = function PaymentReturnContent(_ref) {
     src: "".concat(prefix, "/payment-content.png"),
     alt: "success"
   })), /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content-text"
+  }, locales.getText('tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater')), /*#__PURE__*/React.createElement("div", {
     className: "payment-return-content-buttons"
   }, /*#__PURE__*/React.createElement(Button, {
     block: true,

package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -1,16 +1,26 @@
 .payment-return-content {
   padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
 
   .payment-return-content-img {
     width: 100%;
-    margin-bottom: 60px;
     min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
-      width: 100%;
+      max-width: 100%;
       height: 100%;
+      max-height: 480px;
     }
   }
-  
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
   .payment-return-content-buttons {
     display: flex;
     flex-direction: column;

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

@@ -511,7 +511,8 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: 'paymentInit'
               }
             });
-          case 18:
+            throw _context5.t0;
+          case 19:
           case "end":
             return _context5.stop();
         }

package/es/components/pay/toC/locales.d.ts

@@ -97,6 +97,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -195,6 +196,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -293,6 +295,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
 };
 export default _default;