@pisell/private-materials 3.4.82 → 3.4.84

package/es/components/booking/info/header/index.js

@@ -52,19 +52,19 @@ var header = function header(_ref) {
   var statusList = [{
     label: locales.getText('pisell2.text.status.new'),
     key: 'new',
-    color: '#079455'
+    color: '#91caff'
   }, {
     label: locales.getText('pisell2.text.status.confirmed'),
     key: 'confirmed',
-    color: '#7F56D9'
+    color: '#b7eb8f'
   }, {
     label: locales.getText('pisell2.text.status.arrived'),
     key: 'arrived',
-    color: '#088AB2'
+    color: '#d3adf7'
   }, {
     label: locales.getText('pisell2.text.status.started'),
     key: 'started',
-    color: '#155EEF'
+    color: '#fffb8f'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -72,7 +72,7 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.cancelled')),
     key: 'cancelled',
-    color: '#DC6803'
+    color: '#bfbfbf'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -80,11 +80,11 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.no_show')),
     key: 'no_show',
-    color: '#D92D20'
+    color: '#ffa39e'
   }, {
     label: locales.getText('pisell2.text.status.completed'),
     key: 'completed',
-    color: '#4A5578'
+    color: '#ffd591'
   }];
 
   // 销售渠道

package/es/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

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/notes/NoteBlock/index.js

@@ -14,7 +14,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useMemo } from "react";
-import { Button, Modal, message, Skeleton } from "antd";
+import { Button, message, Skeleton } from "antd";
+import { PisellModal } from '@pisell/materials';
 import { useRequest } from "ahooks";
 import NoteItem from "./NoteItem";
 import AddNote from "../addNote";
@@ -174,7 +175,7 @@ var NoteBlock = function NoteBlock(props) {
       item: d,
       onChange: _noteChange
     });
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Modal, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PisellModal, {
     title: editNote ? locales.getText("pisell2.text.status.edit-note") : locales.getText("pisell2.text.status.add-note"),
     open: isModalOpen,
     onOk: handleOk,

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

@@ -166,10 +166,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/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: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "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, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "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,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<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "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">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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: "loading" | "success" | "warn" | "fail" | "question";
+        status: "warn" | "success" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -195,7 +195,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

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

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

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

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

package/es/index.d.ts

@@ -52,8 +52,8 @@ export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
-export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './components/authentication/admin';
-export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps } from './components/authentication/admin';
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, } from './components/authentication/admin';
+export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps, } from './components/authentication/admin';
 export { default as ContactInfo } from './plus/contactInfo';
 export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
@@ -71,7 +71,9 @@ export { default as ProNumberSelector } from './pro/pisellNumberSelector';
 export { default as SKUOptionsSelection } from './plus/skuOptionsSelection';
 export { default as SaasAttendance } from './plus/saasAttendance';
 export { default as Selector } from './pro/Selector';
+export { default as PisellSalesGrid } from './plus/pisellSalesGrid';
 export { default as EcoCupProject } from './components/ecocup/cupProject';
 export { default as EcoCupList } from './components/ecocup/cupList';
 export { default as EcoCustomerList } from './components/ecocup/customerList';
 export { default as OrderList } from './plus/orderList';
+export { default as pisellSalesManagement } from './plus/pisellSalesManagement';

package/es/index.js

@@ -73,7 +73,9 @@ export { default as ProNumberSelector } from "./pro/pisellNumberSelector";
 export { default as SKUOptionsSelection } from "./plus/skuOptionsSelection";
 export { default as SaasAttendance } from "./plus/saasAttendance";
 export { default as Selector } from "./pro/Selector";
+export { default as PisellSalesGrid } from "./plus/pisellSalesGrid";
 export { default as EcoCupProject } from "./components/ecocup/cupProject";
 export { default as EcoCupList } from "./components/ecocup/cupList";
 export { default as EcoCustomerList } from "./components/ecocup/customerList";
-export { default as OrderList } from "./plus/orderList";
+export { default as OrderList } from "./plus/orderList";
+export { default as pisellSalesManagement } from "./plus/pisellSalesManagement";

package/es/plus/contactInfo/components/SwipeAction/index.js

@@ -12,7 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { animated, useSpring } from '@react-spring/web';
-import { useDrag } from '@use-gesture/react/dist/use-gesture-react.cjs';
+import { useDrag } from '@use-gesture/react';
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 
 // 本地实现的工具函数和类型

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

@@ -1,5 +1,6 @@
 import React from 'react';
 declare const HandleActions: (props: {
     locales: any;
+    __id?: string;
 }) => React.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/Toolbar.d.ts

@@ -2,5 +2,6 @@ import React from 'react';
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;
+    __id?: string;
 }) => React.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/index.d.ts

@@ -4,6 +4,7 @@ export interface OrderListProps {
     biz: string;
     className?: string;
     style?: React.CSSProperties;
+    __id?: string;
 }
 declare const OrderList: (props: OrderListProps) => React.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/pisellSalesGrid/PisellSalesGrid.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { PisellSalesGridProps } from './types';
+import './PisellSalesGrid.less';
+declare const PisellSalesGrid: React.FC<PisellSalesGridProps>;
+export default PisellSalesGrid;