@pisell/private-materials 3.0.191 → 3.0.193

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/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" | "fail" | "success", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail", 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" | "fail" | "success", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail", 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<"loading" | "warn" | "fail" | "success" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "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/payo/config.js

@@ -69,12 +69,13 @@ export var POS = function POS(_ref) {
    * @Date: 2024-01-30 16:34
    */
   var success = function success(res) {
+    var _res$data;
     dispatch(updateNextStep());
     dispatch(updateCustom({
-      card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0
+      card_reader_surcharge: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.card_reader_surcharge) || 0
     }));
     clearRef.current = setTimeout(function () {
-      var _deviceRef$current, _deviceRef$current$se;
+      var _res$data2, _deviceRef$current, _deviceRef$current$se;
       var params = getPayParams({
         mode: modeRef.current,
         amount: amountRef.current,
@@ -83,7 +84,7 @@ export var POS = function POS(_ref) {
         device: deviceRef.current,
         pay: payRef.current,
         custom: {
-          card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0
+          card_reader_surcharge: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.card_reader_surcharge) || 0
         }
       }, 'success');
       var receipt = Array.isArray(res.receipt) ? res.receipt : [res.receipt];

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

package/es/components/ruleSetting/server.js

@@ -17,7 +17,8 @@ export var getStaffList = /*#__PURE__*/function () {
         case 0:
           _context.next = 2;
           return request.getRequest().get('/shop/shop/setting/staff', {}, {
-            useCache: true
+            useCache: true,
+            fullResult: true
           });
         case 2:
           _yield$request$getReq = _context.sent;
@@ -54,7 +55,9 @@ export var getProductChannel = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return request.getRequest().get('/shop/order/platform-list');
+          return request.getRequest().get('/shop/order/platform-list', {}, {
+            fullResult: true
+          });
         case 2:
           _yield$request$getReq2 = _context2.sent;
           data = _yield$request$getReq2.data;
@@ -87,7 +90,9 @@ export var getOrderTypes = /*#__PURE__*/function () {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _context3.next = 2;
-          return request.getRequest().get('/shop/order/aggregation-type');
+          return request.getRequest().get('/shop/order/aggregation-type', {}, {
+            fullResult: true
+          });
         case 2:
           _yield$request$getReq3 = _context3.sent;
           data = _yield$request$getReq3.data;
@@ -120,7 +125,9 @@ export var getPaymentTypes = /*#__PURE__*/function () {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           _context4.next = 2;
-          return request.getRequest().get('/shop/till/opened-payment-method');
+          return request.getRequest().get('/shop/till/opened-payment-method', {}, {
+            fullResult: true
+          });
         case 2:
           _yield$request$getReq4 = _context4.sent;
           data = _yield$request$getReq4.data;

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

package/lib/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<"loading" | "warn" | "fail" | "success" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/lib/components/eftposPay/payo/config.js

@@ -71,14 +71,15 @@ var POS = ({
     failRef.current = fail;
   }, [fail]);
   const success = (res) => {
+    var _a;
     dispatch((0, import_store.updateNextStep)());
     dispatch(
       (0, import_store.updateCustom)({
-        card_reader_surcharge: (res == null ? void 0 : res.card_reader_surcharge) || 0
+        card_reader_surcharge: ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.card_reader_surcharge) || 0
       })
     );
     clearRef.current = setTimeout(() => {
-      var _a, _b;
+      var _a2, _b, _c;
       const params = (0, import_helper.getPayParams)(
         {
           mode: modeRef.current,
@@ -88,7 +89,7 @@ var POS = ({
           device: deviceRef.current,
           pay: payRef.current,
           custom: {
-            card_reader_surcharge: (res == null ? void 0 : res.card_reader_surcharge) || 0
+            card_reader_surcharge: ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.card_reader_surcharge) || 0
           }
         },
         "success"
@@ -96,7 +97,7 @@ var POS = ({
       const receipt = Array.isArray(res.receipt) ? res.receipt : [res.receipt];
       onChange("success", {
         ...params,
-        receipt: ((_b = (_a = deviceRef.current) == null ? void 0 : _a.setting) == null ? void 0 : _b.receipts) ? [] : receipt
+        receipt: ((_c = (_b = deviceRef.current) == null ? void 0 : _b.setting) == null ? void 0 : _c.receipts) ? [] : receipt
       });
     }, 1e3);
   };

package/lib/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" | "warn" | "fail" | "success" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ 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" | undefined;
+        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "warn" | "fail" | "success" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/ruleSetting/server.js

@@ -32,7 +32,8 @@ var getStaffList = async () => {
     "/shop/shop/setting/staff",
     {},
     {
-      useCache: true
+      useCache: true,
+      fullResult: true
     }
   );
   let _list = ((data == null ? void 0 : data.staff) || []).map((d) => {
@@ -53,7 +54,7 @@ var getStaffList = async () => {
   return _list;
 };
 var getProductChannel = async () => {
-  const { data } = await import_utils2.request.getRequest().get("/shop/order/platform-list");
+  const { data } = await import_utils2.request.getRequest().get("/shop/order/platform-list", {}, { fullResult: true });
   let _list = (data || []).map((d) => {
     return {
       label: d.name,
@@ -68,7 +69,7 @@ var getProductChannel = async () => {
 };
 var getOrderTypes = async () => {
   var _a;
-  let { data } = await import_utils2.request.getRequest().get("/shop/order/aggregation-type");
+  let { data } = await import_utils2.request.getRequest().get("/shop/order/aggregation-type", {}, { fullResult: true });
   let _list = (_a = data || []) == null ? void 0 : _a.map((d) => {
     return {
       ...d,
@@ -84,7 +85,7 @@ var getOrderTypes = async () => {
 };
 var getPaymentTypes = async () => {
   var _a;
-  let { data } = await import_utils2.request.getRequest().get("/shop/till/opened-payment-method");
+  let { data } = await import_utils2.request.getRequest().get("/shop/till/opened-payment-method", {}, { fullResult: true });
   let _list = (_a = data || []) == null ? void 0 : _a.map((d) => {
     return {
       ...d,

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.191",
+  "version": "3.0.193",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.0.55",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100",
-    "@pisell/materials": "3.0.55"
+    "@pisell/utils": "1.0.42",
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",