@pisell/private-materials 6.9.4 → 6.9.6

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

@@ -1250,7 +1250,7 @@ var Footer = function Footer(props) {
           case 33:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context9.next = 43;
+              _context9.next = 44;
               break;
             }
             subtotal_info = {
@@ -1277,8 +1277,9 @@ var Footer = function Footer(props) {
               state === null || state === void 0 || state.callback(res, type);
               _setLoading(false);
             }
+            setEditOrderId(0);
             return _context9.abrupt("return");
-          case 43:
+          case 44:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1342,43 +1343,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context9.next = 49;
+              _context9.next = 50;
               break;
             }
-            _context9.next = 49;
+            _context9.next = 50;
             return handleSaveAddons();
-          case 49:
+          case 50:
             if (!infoEdit) {
-              _context9.next = 54;
+              _context9.next = 55;
               break;
             }
-            _context9.next = 52;
+            _context9.next = 53;
             return api(values, state.bookingId || editOrderId);
-          case 52:
+          case 53:
             callbackData = _context9.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 54:
+          case 55:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context9.abrupt("return", callbackData || values);
-          case 59:
-            _context9.prev = 59;
+          case 60:
+            _context9.prev = 60;
             _context9.t1 = _context9["catch"](27);
             console.log(_context9.t1);
             if ((_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.code) === 70101) {
               message.error(_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.message);
             }
             _setLoading(false);
-          case 64:
+          case 65:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[27, 59]]);
+      }, _callee9, null, [[27, 60]]);
     }));
     return function handleSave(_x6) {
       return _ref10.apply(this, arguments);

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

@@ -107,6 +107,7 @@ export var formatProductBundle = function formatProductBundle(bundle, is_price_i
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var _d$original_price;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -128,7 +129,7 @@ export var formatProductBundle = function formatProductBundle(bundle, is_price_i
       "price": Number(d === null || d === void 0 ? void 0 : d.product_price),
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "price_type_ext": d === null || d === void 0 ? void 0 : d.price_type_ext,
-      "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
+      "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((_d$original_price = d === null || d === void 0 ? void 0 : d.original_price) !== null && _d$original_price !== void 0 ? _d$original_price : d === null || d === void 0 ? void 0 : d.product_price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option,
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
@@ -295,7 +296,7 @@ export var formatProductPrice = function formatProductPrice(item) {
   var _item$_extend6, _item$price, _item$_extend7, _item$_extend8, _item$_extend9, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
   var price = Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
-  if (isString((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.priceOverride) && isNumber((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.priceOverride)) {
+  if (isString((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.priceOverride) || isNumber((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.priceOverride)) {
     var _item$_extend10;
     price = Number(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.price);
   }

package/es/components/booking/info2/service/editNormalService/index.js

@@ -94,7 +94,9 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
         newTotal: (_data7 = data) === null || _data7 === void 0 || (_data7 = _data7._extend) === null || _data7 === void 0 ? void 0 : _data7.total,
         origin_total: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.origin_total
       });
-      var e = _objectSpread({}, detail._extend.other);
+      var e = _objectSpread(_objectSpread({}, detail._extend.other), {}, {
+        quantity: quantity
+      });
       e = formatDataKey(e);
       payload.callback(e, undefined, detail, false);
       return;

package/es/components/checkout/PaymentModal.js

@@ -2081,13 +2081,17 @@ var PaymentModal = function PaymentModal(_ref19) {
       status: 'cancelled'
     });
     var checkout = pisellos.getModule('checkout');
-    if (!notCancelOrder) {
-      checkout.cancelCurrentOrderAsync();
-    } else {
-      onClose === null || onClose === void 0 || onClose(false);
-      onSetLocalOrderId === null || onSetLocalOrderId === void 0 || onSetLocalOrderId(checkout.getCurrentOrderId());
-      return;
-    }
+
+    // if (!notCancelOrder) {
+    //   checkout.cancelCurrentOrderAsync();
+    // } else {
+    //   onClose?.(false)
+    //   onSetLocalOrderId?.(checkout.getCurrentOrderId())
+    //   return
+    // }
+    // 暂时先使用取消订单的逻辑（本地数据库标记）
+    // 确认是否有地方重复调用 checkout
+    checkout.cancelCurrentOrderAsync();
     // 不关闭PaymentResultToast，让它独立存在
     onClose === null || onClose === void 0 || onClose(reset || false);
   };

package/es/components/ecocup/components/AddCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     visible: boolean;

package/es/components/ecocup/components/CupActionList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ECupActionType, ICup, ICustomer } from '../../types';
 import './index.less';
 interface IProps {

package/es/components/ecocup/components/CupActionModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ICustomer, ICup, ECupActionType } from '../../types';
 interface IProps {

package/es/components/ecocup/components/CupInfoCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     type: 'rentInfo' | 'markInfo' | 'belongInfo';

package/es/components/ecocup/components/CupStatusModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ECupScanStatus, ICup } from '../../types';
 import './index.less';
 interface IProps {

package/es/components/ecocup/components/CustomerAndCupModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ICup, ICustomer } from '../../types';
 interface IProps {

package/es/components/ecocup/components/CustomerCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ICustomer } from '../../types';
 interface IProps extends ICustomer {

package/es/components/ecocup/components/MoreDropdown/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface MoreDropdownProps {
     locales: any;
     onClick?: (key: string) => void;

package/es/components/ecocup/components/SearchBar/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface SearchBarProps {
     scanListenerKey: string;

package/es/components/ecocup/cupList/hooks/useSummary.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import '../index.less';
 export declare const useSummary: (locales: any, staticsData: any, isPartner?: boolean) => () => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/es/components/eftposPay/windcave/windcave.js

@@ -174,16 +174,16 @@ export default (function (_ref) {
     if (isPay) {
       var _deviceRef$current2;
       _params = _objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
-        "operator_id": custom.operator_id,
-        "operator_type": custom.operator_type,
-        "platform": custom.platform,
-        "custom_payment_id": custom.custom_payment_id,
-        "service_charge": {
-          "amount": payRef.current.surMoney,
-          "percentage": payRef.current.surPercentRate
-        },
-        "original_amount": payRef.current.amount
+        operator_id: custom.operator_id,
+        operator_type: custom.operator_type,
+        platform: custom.platform,
+        custom_payment_id: custom.custom_payment_id
       } : {}), {}, {
+        service_charge: {
+          amount: payRef.current.surMoney,
+          percentage: payRef.current.surPercentRate
+        },
+        original_amount: payRef.current.amount,
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -1408,7 +1408,7 @@ var TicketBooking = function TicketBooking(props) {
       holder: 1,
       note: 1
     }
-  })), /*#__PURE__*/React.createElement(PisellFloatingPanel, {
+  })), isShowFloatButtons && /*#__PURE__*/React.createElement(PisellFloatingPanel, {
     bookingId: activeBookingId,
     ref: pisellFloatingPanelRef,
     currentDate: currentDate,

package/es/plus/orderList/components/BatchActionBar.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useCallback, useMemo } from 'react';
 import { Checkbox, Button } from 'antd';
 import { PisellBatchActionBar, PisellQuickFilter, PisellDataSourceContainer, PisellModal } from '@pisell/materials';
-import { editordership, postSendInvoice, printPack, printPicking, batchAddOrderTags, batchDeleteOrderTags, batchPutOrderStatus, batchVoidedOrder } from "../serve";
+import { editordership, postSendInvoice, printPack, printPicking, batchAddOrderTags, batchDeleteOrderTags, batchPutOrderStatus } from "../serve";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { getTagSelectOptions } from "../serve";
 var useContainerContext = PisellDataSourceContainer.useContainerContext;
@@ -715,69 +715,39 @@ var OrderBatchActionBar = function OrderBatchActionBar(props) {
   /**
    * 作废订单（voided）
    */
-  var handleMarkAsVoid = useCallback( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(keys, rows) {
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
-          case 0:
-            PisellModal.confirm({
-              title: locales.getText('pisell2.orderList.batchAction.void.title'),
-              cancelText: locales.getText('pisell2.orderList.batchAction.button.cancel'),
-              okText: locales.getText('pisell2.orderList.batchAction.button.ok'),
-              content: locales.getText('page.order.lists.cancel.content')(0, 0, 0, '', false, 'void'),
-              onOk: function () {
-                var _onOk7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-                  return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-                    while (1) switch (_context15.prev = _context15.next) {
-                      case 0:
-                        _context15.prev = 0;
-                        setLoadingStates(function (prev) {
-                          return _objectSpread(_objectSpread({}, prev), {}, {
-                            markAsVoid: true
-                          });
-                        });
-                        _context15.next = 4;
-                        return batchVoidedOrder({
-                          order_ids: keys
-                        });
-                      case 4:
-                        handleSuccess();
-                        _context15.next = 10;
-                        break;
-                      case 7:
-                        _context15.prev = 7;
-                        _context15.t0 = _context15["catch"](0);
-                        handleError();
-                      case 10:
-                        _context15.prev = 10;
-                        setLoadingStates(function (prev) {
-                          return _objectSpread(_objectSpread({}, prev), {}, {
-                            markAsVoid: false
-                          });
-                        });
-                        return _context15.finish(10);
-                      case 13:
-                      case "end":
-                        return _context15.stop();
-                    }
-                  }, _callee15, null, [[0, 7, 10, 13]]);
-                }));
-                function onOk() {
-                  return _onOk7.apply(this, arguments);
-                }
-                return onOk;
-              }()
-            });
-          case 1:
-          case "end":
-            return _context16.stop();
-        }
-      }, _callee16);
-    }));
-    return function (_x16, _x17) {
-      return _ref9.apply(this, arguments);
-    };
-  }(), [handleSuccess, handleError, locales]);
+  // const handleMarkAsVoid = useCallback(
+  //   async (keys: React.Key[], rows?: any[]) => {
+  //     PisellModal.confirm({
+  //       title: locales.getText('pisell2.orderList.batchAction.void.title'),
+  //       cancelText: locales.getText(
+  //         'pisell2.orderList.batchAction.button.cancel'
+  //       ),
+  //       okText: locales.getText('pisell2.orderList.batchAction.button.ok'),
+  //       content: locales.getText('page.order.lists.cancel.content')(
+  //         0,
+  //         0,
+  //         0,
+  //         '',
+  //         false,
+  //         'void'
+  //       ),
+  //       onOk: async () => {
+  //         try {
+  //           setLoadingStates((prev) => ({ ...prev, markAsVoid: true }));
+  //           await batchVoidedOrder({
+  //             order_ids: keys as number[],
+  //           });
+  //           handleSuccess();
+  //         } catch (error: any) {
+  //           handleError();
+  //         } finally {
+  //           setLoadingStates((prev) => ({ ...prev, markAsVoid: false }));
+  //         }
+  //       },
+  //     });
+  //   },
+  //   [handleSuccess, handleError, locales]
+  // );
 
   /**
    * 批量操作按钮配置
@@ -835,14 +805,18 @@ var OrderBatchActionBar = function OrderBatchActionBar(props) {
       icon: 'pisell2-slash-circle-01',
       loading: loadingStates.markAsCancelled,
       onClick: handleMarkAsCancelled
-    }, {
-      key: 'mark-as-void',
-      label: locales.getText('page.order.void'),
-      icon: 'pisell2-alert-circle',
-      loading: loadingStates.markAsVoid,
-      onClick: handleMarkAsVoid
-    }];
-  }, [loadingStates.ship, loadingStates.invoice, loadingStates.addTags, loadingStates.removeTags, loadingStates.markAsOpen, loadingStates.markAsCompleted, loadingStates.markAsCancelled, loadingStates.markAsVoid, handleShip, handleInvoice, handlePrintPack, handlePrintPicking, handleAddTags, handleRemoveTags, handleMarkAsOpen, handleMarkAsCompleted, handleMarkAsCancelled, handleMarkAsVoid, locales]);
+    }
+    // {
+    //   key: 'mark-as-void',
+    //   label: locales.getText('page.order.void'),
+    //   icon: 'pisell2-alert-circle',
+    //   loading: loadingStates.markAsVoid,
+    //   onClick: handleMarkAsVoid,
+    // },
+    ];
+  }, [loadingStates.ship, loadingStates.invoice, loadingStates.addTags, loadingStates.removeTags, loadingStates.markAsOpen, loadingStates.markAsCompleted, loadingStates.markAsCancelled, loadingStates.markAsVoid, handleShip, handleInvoice, handlePrintPack, handlePrintPicking, handleAddTags, handleRemoveTags, handleMarkAsOpen, handleMarkAsCompleted, handleMarkAsCancelled,
+  // handleMarkAsVoid,
+  locales]);
   if (selectedKeys.length === 0) {
     return null;
   }

package/es/plus/orderList/components/HandleActions.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 declare const HandleActions: (props: {
     locales: any;
+    __id?: string;
 }) => JSX.Element;
 export default HandleActions;

package/es/plus/orderList/components/HandleActions.js

@@ -3,7 +3,8 @@ import { PisellDataSourceContainer, PisellSort, PisellFilter } from '@pisell/mat
 import { getFilterButtonList, getSortList } from "../config";
 var ColumnsSetting = PisellDataSourceContainer.ColumnsSetting;
 var HandleActions = function HandleActions(props) {
-  var locales = props.locales;
+  var locales = props.locales,
+    __id = props.__id;
   var filterButtonListValue = useMemo(function () {
     return {
       otherFilter: getFilterButtonList(locales)
@@ -12,7 +13,9 @@ var HandleActions = function HandleActions(props) {
   var sortList = useMemo(function () {
     return getSortList(locales);
   }, [locales]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColumnsSetting, null), /*#__PURE__*/React.createElement(PisellSort, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColumnsSetting, {
+    __id: __id
+  }), /*#__PURE__*/React.createElement(PisellSort, {
     hasForm: false,
     list: sortList
   }), /*#__PURE__*/React.createElement(PisellFilter, {

package/es/plus/orderList/components/QuickFilter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const QuickFilter: (props: {
     locales: any;
 }) => JSX.Element;

package/es/plus/orderList/components/Reset.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const Reset: (props: {
     locales: any;
     setValueType: (value: any) => void;

package/es/plus/orderList/components/Toolbar.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;
+    __id?: string;
 }) => JSX.Element;
 export default Toolbar;

package/es/plus/orderList/components/Toolbar.js

@@ -20,7 +20,8 @@ import dayjs from 'dayjs';
 var useContainerContext = PisellDataSourceContainer.useContainerContext;
 var Toolbar = function Toolbar(props) {
   var locales = props.locales,
-    clearSelectedData = props.clearSelectedData;
+    clearSelectedData = props.clearSelectedData,
+    __id = props.__id;
   var _useContainerContext = useContainerContext(),
     serverActions = _useContainerContext.serverActions,
     refManager = _useContainerContext.refManager,
@@ -50,7 +51,8 @@ var Toolbar = function Toolbar(props) {
       locales: locales
     }),
     bottomRight: /*#__PURE__*/React.createElement(HandleActions, {
-      locales: locales
+      locales: locales,
+      __id: __id
     })
   }));
 };

package/es/plus/orderList/config.d.ts

@@ -46,6 +46,7 @@ export declare const getQuickFilterList: (locales: any) => ({
     label: any;
     other: {
         placeholder: any;
+        allowClear?: undefined;
         trigger?: undefined;
         style?: undefined;
     };
@@ -54,6 +55,7 @@ export declare const getQuickFilterList: (locales: any) => ({
     type: string;
     key: string;
     other: {
+        allowClear: boolean;
         placeholder: any;
         trigger: string[];
         style: {

package/es/plus/orderList/config.js

@@ -479,6 +479,7 @@ export var getQuickFilterList = function getQuickFilterList(locales) {
     type: 'search',
     key: 'keyword',
     other: {
+      allowClear: true,
       placeholder: locales.getText('pisell2.orderList.quickFilter.keyword.placeholder'),
       trigger: ['onChange'],
       style: {

package/es/plus/orderList/index.d.ts

@@ -4,6 +4,7 @@ export interface OrderListProps {
     biz: string;
     className?: string;
     style?: React.CSSProperties;
+    __id?: string;
 }
 declare const OrderList: (props: OrderListProps) => JSX.Element;
 export default OrderList;

package/es/plus/orderList/index.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -25,7 +26,8 @@ var OrderList = function OrderList(props) {
   var _context$engine, _context$appHelper, _window, _utils$getApp;
   var biz = props.biz,
     style = props.style,
-    className = props.className;
+    className = props.className,
+    __id = props.__id;
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en'); // 默认改为英文
 
@@ -122,7 +124,10 @@ var OrderList = function OrderList(props) {
     title: locales.getText('pisell2.orderList.title')
   }), /*#__PURE__*/React.createElement(Toolbar, {
     clearSelectedData: clearSelectedData,
+    __id: __id,
     locales: locales
-  }), /*#__PURE__*/React.createElement(PisellGridView, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Table, tableConfig)), /*#__PURE__*/React.createElement(OrderBatchActionBar, batchActionBarConfig), /*#__PURE__*/React.createElement(PisellGridPro.Footer, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Pagination, null)))));
+  }), /*#__PURE__*/React.createElement(PisellGridView, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Table, _extends({}, tableConfig, {
+    __id: __id
+  }))), /*#__PURE__*/React.createElement(OrderBatchActionBar, batchActionBarConfig), /*#__PURE__*/React.createElement(PisellGridPro.Footer, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Pagination, null)))));
 };
 export default OrderList;

package/es/plus/orderList/serve.js

@@ -298,7 +298,7 @@ export var openUrl = function openUrl(host, url, shopId, ids) {
     var previewPrefix = '/shop';
 
     // 过滤 /shop 避免重复添加
-    var prefix = _host.startsWith(previewPrefix) ? '' : previewPrefix;
+    var prefix = _host.indexOf(previewPrefix) !== -1 ? '' : previewPrefix;
     window.open("".concat(_host).concat(prefix).concat(url, "?shop_id=").concat(shopId).concat(str));
   } catch (err) {}
 };

package/es/pro/Selector/demo.d.ts

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

package/es/pro/skuDetailModal/index.js

@@ -482,6 +482,10 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
         return false;
       }
     }
+    // 如果有 variant，则不检测商品本身的库存了
+    if (value !== null && value !== void 0 && value.product_variant_id) {
+      return true;
+    }
     // 检测商品本身库存
     var productCanSell = checkSkuStockCanSell(data);
     if (!productCanSell.hasStock) {

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

@@ -879,6 +879,7 @@ var Footer = (props) => {
           state == null ? void 0 : state.callback(res, type);
           _setLoading(false);
         }
+        setEditOrderId(0);
         return;
       }
       if (type === "save") {

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

@@ -131,7 +131,7 @@ var formatProductBundle = (bundle, is_price_include_tax) => {
       "price": Number(d == null ? void 0 : d.product_price),
       "price_type": d == null ? void 0 : d.price_type,
       "price_type_ext": d == null ? void 0 : d.price_type_ext,
-      "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
+      "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) ?? (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option,
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
@@ -261,7 +261,7 @@ var formatProductPrice = (item) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((item == null ? void 0 : item.price) ?? ((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.price));
-  if ((0, import_utils5.isString)((_c = item._extend) == null ? void 0 : _c.priceOverride) && (0, import_utils5.isNumber)((_d = item._extend) == null ? void 0 : _d.priceOverride)) {
+  if ((0, import_utils5.isString)((_c = item._extend) == null ? void 0 : _c.priceOverride) || (0, import_utils5.isNumber)((_d = item._extend) == null ? void 0 : _d.priceOverride)) {
     price = Number((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.price);
   }
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_f = item == null ? void 0 : item.variant) == null ? void 0 : _f.length) > 0) {

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

@@ -110,7 +110,8 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
         origin_total: (_g = data._extend) == null ? void 0 : _g.origin_total
       });
       let e = {
-        ...detail._extend.other
+        ...detail._extend.other,
+        quantity
       };
       e = (0, import_utils2.formatDataKey)(e);
       payload.callback(e, void 0, detail, false);

package/lib/components/checkout/PaymentModal.js

@@ -1479,13 +1479,7 @@ var PaymentModal = ({
     console.log("Payment cancelled");
     callback == null ? void 0 : callback({ status: "cancelled" });
     const checkout = pisellos.getModule("checkout");
-    if (!notCancelOrder) {
-      checkout.cancelCurrentOrderAsync();
-    } else {
-      onClose == null ? void 0 : onClose(false);
-      onSetLocalOrderId == null ? void 0 : onSetLocalOrderId(checkout.getCurrentOrderId());
-      return;
-    }
+    checkout.cancelCurrentOrderAsync();
     onClose == null ? void 0 : onClose(reset || false);
   };
   const handleSetEditCartMode = async (closeModal = false) => {

package/lib/components/ecocup/components/AddCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     visible: boolean;

package/lib/components/ecocup/components/CupActionList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ECupActionType, ICup, ICustomer } from '../../types';
 import './index.less';
 interface IProps {