@pisell/private-materials 6.11.28 → 6.11.30

package/es/plus/pisellSalesManagement/hooks/useOrderPerspective.js

@@ -144,14 +144,21 @@ export var useOrderPerspective = function useOrderPerspective() {
       }
     }, {
       title: orderLabels.customer,
-      dataIndex: 'customer',
       key: 'customer',
       align: 'center',
       width: 150,
-      render: function render(value, record) {
-        if (!value) return '-';
-        var customer = value || {};
-        var guestCode = (customer === null || customer === void 0 ? void 0 : customer.guest_code) || (record === null || record === void 0 ? void 0 : record.guest_code);
+      uniformCompare: function uniformCompare(value, record) {
+        var customer = record === null || record === void 0 ? void 0 : record.customer;
+        if (!customer) return '-';
+        var guestCode = customer === null || customer === void 0 ? void 0 : customer.guest_code;
+        if (guestCode) return "".concat(guestCode);
+        if (customer.user_id === 1) return 'walk-in'; // 返回任意固定值即可
+        return customer;
+      },
+      render: function render(_, record) {
+        var customer = record === null || record === void 0 ? void 0 : record.customer;
+        if (!customer) return '-';
+        var guestCode = customer === null || customer === void 0 ? void 0 : customer.guest_code;
         if (guestCode) {
           return /*#__PURE__*/React.createElement("div", {
             style: {
@@ -193,6 +200,10 @@ export var useOrderPerspective = function useOrderPerspective() {
       key: 'contacts_info',
       align: 'center',
       width: 150,
+      uniformCompare: function uniformCompare(value, record) {
+        if (!value) return '-';
+        return value;
+      },
       render: function render(value) {
         if (!value) return '-';
         var info = (value === null || value === void 0 ? void 0 : value.value) || {};
@@ -219,11 +230,11 @@ export var useOrderPerspective = function useOrderPerspective() {
       }
     }, {
       title: orderLabels.paymentInfo,
-      dataIndex: 'payment_status',
       key: 'payment_info',
       width: 124,
       align: 'center',
-      render: function render(value, record) {
+      render: function render(_, record) {
+        var value = record === null || record === void 0 ? void 0 : record.payment_status;
         var currencySymbol = record === null || record === void 0 ? void 0 : record.currency_symbol;
         var totalAmount = Number((record === null || record === void 0 ? void 0 : record.total_amount) || 0);
         var paidAmount = Number((record === null || record === void 0 ? void 0 : record.paid_amount) || 0);
@@ -333,13 +344,11 @@ export var useOrderPerspective = function useOrderPerspective() {
       }
     }, {
       title: orderLabels.items,
-      dataIndex: 'product_quantity',
       key: 'product_quantity',
       align: 'center',
       width: 120,
-      render: function render(value, record) {
-        var _ref, _ref2;
-        var count = Number((_ref = (_ref2 = value !== null && value !== void 0 ? value : record === null || record === void 0 ? void 0 : record.items_count) !== null && _ref2 !== void 0 ? _ref2 : record === null || record === void 0 ? void 0 : record.item_count) !== null && _ref !== void 0 ? _ref : 0) || 0;
+      render: function render(_, record) {
+        var count = (record === null || record === void 0 ? void 0 : record.product_quantity) || 0;
         return /*#__PURE__*/React.createElement("span", {
           style: _objectSpread(_objectSpread({}, textStyles.text), {}, {
             textAlign: 'center'
@@ -432,18 +441,18 @@ export var useOrderPerspective = function useOrderPerspective() {
       }
     }, {
       title: orderLabels.shippingMethod,
-      dataIndex: 'delivery_type',
       key: 'delivery_type',
       align: 'center',
       width: 160,
-      render: function render(value, record) {
+      render: function render(_, record) {
         var _record$metadata;
+        var deliveryType = record === null || record === void 0 ? void 0 : record.delivery_type;
         var serverType = record === null || record === void 0 || (_record$metadata = record.metadata) === null || _record$metadata === void 0 || (_record$metadata = _record$metadata.shop_service_type) === null || _record$metadata === void 0 ? void 0 : _record$metadata.server_type;
-        if (!value && !serverType) return '-';
-        var isShopService = value === 'shop_service';
-        var label = isShopService ? SHOP_SERVICE_TYPE_LABEL_MAP[serverType] : DELIVERY_TYPE_LABEL_MAP[value];
-        if (!label || !isShopService && value === 'nil') return '-';
-        var color = isShopService ? SHOP_SERVICE_TYPE_COLOR_MAP[serverType] : DELIVERY_TYPE_COLOR_MAP[value];
+        if (!deliveryType && !serverType) return '-';
+        var isShopService = deliveryType === 'shop_service';
+        var label = isShopService ? SHOP_SERVICE_TYPE_LABEL_MAP[serverType] : DELIVERY_TYPE_LABEL_MAP[deliveryType];
+        if (!label || !isShopService && deliveryType === 'nil') return '-';
+        var color = isShopService ? SHOP_SERVICE_TYPE_COLOR_MAP[serverType] : DELIVERY_TYPE_COLOR_MAP[deliveryType];
         return /*#__PURE__*/React.createElement("div", {
           style: {
             textAlign: 'center'
@@ -455,6 +464,12 @@ export var useOrderPerspective = function useOrderPerspective() {
           },
           color: color
         }, label));
+      },
+      uniformCompare: function uniformCompare(_, record) {
+        var _record$metadata2;
+        var deliveryType = (record === null || record === void 0 ? void 0 : record.delivery_type) || '';
+        var serverType = (record === null || record === void 0 || (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 || (_record$metadata2 = _record$metadata2.shop_service_type) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.server_type) || '';
+        return "".concat(deliveryType, "|").concat(serverType);
       }
     }, {
       title: orderLabels.orderStatus,
@@ -500,12 +515,12 @@ export var useOrderPerspective = function useOrderPerspective() {
       }
     }, {
       title: orderLabels.updated,
-      dataIndex: 'last_edit_account',
       key: 'last_edit_account',
       width: 132,
       align: 'center',
-      render: function render(value, record) {
-        var time = (value === null || value === void 0 ? void 0 : value.created_at) || (record === null || record === void 0 ? void 0 : record.updated_at);
+      render: function render(_, record) {
+        var editor = record === null || record === void 0 ? void 0 : record.last_edit_account;
+        var time = (editor === null || editor === void 0 ? void 0 : editor.created_at) || (record === null || record === void 0 ? void 0 : record.updated_at);
         var channel = PLATFORM_LABEL_MAP[record === null || record === void 0 ? void 0 : record.order_platform] || (record === null || record === void 0 ? void 0 : record.order_platform);
         var lines = getDisplayLines([channel]);
         return /*#__PURE__*/React.createElement("div", {
@@ -515,7 +530,7 @@ export var useOrderPerspective = function useOrderPerspective() {
             alignItems: 'flex-start'
           }
         }, /*#__PURE__*/React.createElement(ClientName, {
-          dataSource: value || record.create_account,
+          dataSource: editor || record.create_account,
           style: {
             fontSize: 14
           }
@@ -574,6 +589,7 @@ export var useOrderPerspective = function useOrderPerspective() {
         return {
           grid: {
             bordered: true,
+            collapseUniformColumns: true,
             columns: buildColumns(ctx),
             defaultHiddenColumnKeys: ['order_origin', 'payment_status', 'delivery_type', 'status', 'shipping_status', 'last_edit_account', 'id'],
             scroll: {

package/es/plus/pisellSalesManagement/index.js

@@ -71,7 +71,9 @@ var PisellSalesManagement = function PisellSalesManagement(props) {
     dateAdapter: AdapterDayjs,
     adapterLocale: adapterLocale
   }, /*#__PURE__*/React.createElement("div", {
-    style: props === null || props === void 0 ? void 0 : props.style
+    style: Object.assign({}, {
+      height: 0
+    }, props === null || props === void 0 ? void 0 : props.style)
   }, /*#__PURE__*/React.createElement(PisellSalesGrid, {
     perspectives: perspectives,
     currentPerspective: perspective,

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/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/lib/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -8,7 +8,7 @@ export declare const useCupAction: () => {
  * @return {*}
  */
 export declare const useBatchCupAction: () => {
-    run: (this: unknown, eco_cup_ids: number[] | string[]) => Promise<boolean>;
+    run: (this: unknown, eco_cup_ids: string[] | number[]) => Promise<boolean>;
     loading: boolean;
 };
 /**

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

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

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

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "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/lib/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" | "print" | "fail" | "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/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ 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<"warn" | "success" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -178,7 +178,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "warn" | "success" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu" | undefined;
-        action?: "deviceList" | "pay" | "amount" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -312,7 +312,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "warn" | "success" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CallToBookProps = {
     show: boolean;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const StripePayment: () => import("react").JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const PageLoading: () => import("react").JSX.Element;
 export default PageLoading;

package/lib/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/lib/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/lib/plus/pisellSalesGrid/PisellSalesGrid.js

@@ -54,7 +54,10 @@ function getDefaultSearchParams(currentPerspective) {
       filter: {
         values: {
           order_payment_status: import_booking.defaultPaymentStatusKeys,
-          es_start_date: [(0, import_dayjs.default)(), (0, import_dayjs.default)()]
+          booking_time_start_between: [
+            (0, import_dayjs.default)().startOf("day"),
+            (0, import_dayjs.default)().endOf("day")
+          ]
         }
       }
     };
@@ -126,7 +129,7 @@ var PisellSalesGrid = (props) => {
   const [selectedRows, setSelectedRows] = (0, import_react.useState)([]);
   const [pagination, setPagination] = (0, import_react.useState)({
     pageNumber: 1,
-    pageSize: 10
+    pageSize: 50
   });
   const [searchParams, setSearchParams] = (0, import_react.useState)(() => {
     if (__id) {

package/lib/plus/pisellSalesGrid/PisellSalesGrid.less

@@ -7,4 +7,10 @@
   display: flex;
   flex-direction: column;
   min-height: 0;
+
+  /* Quick filter 内日期选择器宽度加大 */
+
+  .record-board-toolbar-quick-filter-form .pisell-date-range-picker {
+    min-width: 240px !important;
+  }
 }

package/lib/plus/pisellSalesGrid/serve.d.ts

@@ -6,7 +6,7 @@ export interface GetBookingListParams {
     with?: string[];
     item_type?: string;
     item_types?: string[];
-    es_start_date?: string;
+    booking_time_start_between?: string;
     keywords?: string;
     is_deposit?: number;
     child_booking?: number;

package/lib/plus/pisellSalesGrid/serve.js

@@ -79,7 +79,7 @@ var getOrderList = async (params) => {
 };
 var formatBookingParams = (params) => {
   const {
-    es_start_date,
+    booking_time_start_between,
     created_at_between,
     updated_at_between,
     number_between,
@@ -87,14 +87,14 @@ var formatBookingParams = (params) => {
     sort,
     ...rest
   } = params;
-  const bookingTimeRange = Array.isArray(es_start_date) ? es_start_date.map(
-    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD") : void 0
+  const bookingTimeRange = Array.isArray(booking_time_start_between) ? booking_time_start_between.map(
+    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD HH:mm:ss") : void 0
   ).filter((value) => value) : void 0;
   const createdRange = Array.isArray(created_at_between) ? created_at_between.map(
-    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD") : void 0
+    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD HH:mm:ss") : void 0
   ).filter((value) => value) : void 0;
   const updatedRange = Array.isArray(updated_at_between) ? updated_at_between.map(
-    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD") : void 0
+    (value) => value ? (0, import_dayjs.default)(value).format("YYYY-MM-DD HH:mm:ss") : void 0
   ).filter((value) => value) : void 0;
   const numberRange = Array.isArray(number_between) ? number_between : (number_between == null ? void 0 : number_between.min) != null || (number_between == null ? void 0 : number_between.max) != null ? [number_between == null ? void 0 : number_between.min, number_between == null ? void 0 : number_between.max] : void 0;
   const amountRange = Array.isArray(total_amount_between) ? total_amount_between : (total_amount_between == null ? void 0 : total_amount_between.min) != null || (total_amount_between == null ? void 0 : total_amount_between.max) != null ? [total_amount_between == null ? void 0 : total_amount_between.min, total_amount_between == null ? void 0 : total_amount_between.max] : void 0;
@@ -105,7 +105,7 @@ var formatBookingParams = (params) => {
     ...rest,
     ...ext,
     ...(bookingTimeRange == null ? void 0 : bookingTimeRange.length) && {
-      es_start_date: bookingTimeRange
+      booking_time_start_between: bookingTimeRange
     },
     ...(createdRange == null ? void 0 : createdRange.length) && { created_at_between: createdRange },
     ...(updatedRange == null ? void 0 : updatedRange.length) && { updated_at_between: updatedRange },

package/lib/plus/pisellSalesGrid/types.d.ts

@@ -81,6 +81,8 @@ export interface RecordBoardGridPropsCompat {
     columns?: any[];
     /** 默认隐藏的列 key 列表（对应 columns 的 key 或 dataIndex），与列上 hidden: true 合并后由 RecordBoard 初始化列显隐 */
     defaultHiddenColumnKeys?: string[];
+    /** 当前页某列全同值/全空时隐藏该列并在表格上方展示总结区；默认 true，传 false 可关闭 */
+    collapseUniformColumns?: boolean;
     /** 表格滚动，与 RecordBoard grid.scroll 对齐（含 autoCalc、scrollToFirstRowOnChange） */
     scroll?: {
         x?: number | string;

package/lib/plus/pisellSalesManagement/components/BookingFormsPreview.js

@@ -126,7 +126,8 @@ var BookingFormsPreview = (props) => {
     {
       style: {
         display: "flex",
-        flexDirection: "column"
+        flexDirection: "column",
+        gap: 10
       }
     },
     tableItems.map((item, idx) => {
@@ -140,7 +141,7 @@ var BookingFormsPreview = (props) => {
             color: clickable ? "#7f56d9" : "#98A2B3",
             textDecoration: clickable ? "underline" : "none",
             whiteSpace: "nowrap",
-            lineHeight: "26px",
+            lineHeight: "18px",
             cursor: clickable ? "pointer" : "default"
           },
           onClick: (event) => {

package/lib/plus/pisellSalesManagement/config/booking.d.ts

@@ -22,6 +22,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -47,6 +48,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -73,6 +75,7 @@ export declare const getFilterButtonList: () => ({
         maxInputNumberProps?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
 } | {
     name: string;
@@ -90,6 +93,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -109,6 +113,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -128,6 +133,27 @@ export declare const getFilterButtonList: () => ({
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
         component?: undefined;
+        showTime?: undefined;
+    };
+    sort?: undefined;
+    localFilter?: undefined;
+} | {
+    name: string;
+    type: string;
+    key: string;
+    label: any;
+    other: {
+        placeholder: any;
+        showTime: boolean;
+        allowClear?: undefined;
+        mode?: undefined;
+        maxTagCount?: undefined;
+        options?: undefined;
+        minInputNumberProps?: undefined;
+        maxInputNumberProps?: undefined;
+        component?: undefined;
+        isSearchServer?: undefined;
+        showSearch?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;

package/lib/plus/pisellSalesManagement/config/booking.js

@@ -115,7 +115,9 @@ var getBookingHeaderLabels = () => ({
   more: import_utils.locales.getText("pisell2.salesManagement.booking.common.more"),
   createdBy: import_utils.locales.getText(
     "pisell2.salesManagement.booking.common.createdBy"
-  )
+  ),
+  guest: import_utils.locales.getText("pisell2.salesManagement.order.common.guest"),
+  walkIn: import_utils.locales.getText("pisell2.salesManagement.order.common.walkIn")
 });
 var defaultPaymentStatusKeys = [
   "payment_pending",
@@ -337,7 +339,7 @@ var getFilterButtonList = () => {
     },
     {
       name: "created_at_between",
-      type: "rangePickerNew",
+      type: "rangePicker",
       key: "createdAtBetween",
       label: import_utils.locales.getText(
         "pisell2.salesManagement.booking.filter.orderDate.label"
@@ -345,12 +347,13 @@ var getFilterButtonList = () => {
       other: {
         placeholder: import_utils.locales.getText(
           "pisell2.salesManagement.booking.filter.orderDate.placeholder"
-        )
+        ),
+        showTime: true
       }
     },
     {
       name: "updated_at_between",
-      type: "rangePickerNew",
+      type: "rangePicker",
       key: "updatedAtBetween",
       label: import_utils.locales.getText(
         "pisell2.salesManagement.booking.filter.updatedDate.label"
@@ -358,7 +361,8 @@ var getFilterButtonList = () => {
       other: {
         placeholder: import_utils.locales.getText(
           "pisell2.salesManagement.booking.filter.updatedDate.placeholder"
-        )
+        ),
+        showTime: true
       }
     }
   ];