@pisell/private-materials 6.4.18 → 6.4.20

package/lib/components/checkout/PaymentModal.js

@@ -744,6 +744,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       };
     };
     const handleSendCustomerPaymentLink = async (data) => {
+      const order = checkoutModule.getCurrentOrderInfo();
+      if (order.isDeposit) {
+        const stateAmount = checkoutModule.getStateAmount();
+        await checkoutModule.setDepositAmountAsync(stateAmount);
+      }
       const isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
       if (!isCurrentOrderSynced) {
         await checkoutModule.manualSyncOrderAsync();
@@ -1234,98 +1239,6 @@ var PaymentModal = ({
             unsubscribeRef.current();
             unsubscribeRef.current = void 0;
           }
-          unsubscribeRef.current = checkout.core.effects.on("checkout:onOrderSynced", (data2) => {
-            var _a3, _b3, _c2;
-            const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
-            const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
-            if (data2.isManual) return;
-            handlePaymentComplete(data2);
-            if (showingCashToastRef.current) {
-              return;
-            }
-            const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
-            const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
-            const currentChangeGivenAmount = Number(
-              ((_b3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b3.current_change_given_amount) || 0
-            );
-            const failureReason = responseData == null ? void 0 : responseData.failure_reason;
-            if (paymentStatus) {
-              console.log("print_order_onOrderSynced>>>>", responseData);
-              logger == null ? void 0 : logger.addLog({
-                type: "info",
-                title: "print_order_onOrderSynced",
-                metadata: {
-                  responseData
-                }
-              });
-              try {
-                const params = {
-                  type: "99",
-                  // 打印订单全部信息
-                  data: {
-                    order_id: responseData.order_id,
-                    machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                    small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data
-                  }
-                };
-                console.log("print_order_onOrderSynced_params>>>>", params);
-                logger == null ? void 0 : logger.addLog({
-                  type: "info",
-                  title: "print_order_onOrderSynced_params",
-                  metadata: {
-                    params
-                  }
-                });
-                (0, import_utils.webPrint)(params, (res) => {
-                  console.log("print_order_onOrderSynced_res>>>>", res);
-                  logger == null ? void 0 : logger.addLog({
-                    type: "info",
-                    title: "print_order_onOrderSynced_res",
-                    metadata: {
-                      res
-                    }
-                  });
-                });
-              } catch (error) {
-                console.error("print_order_onOrderSynced_error>>>>", error);
-                logger == null ? void 0 : logger.addLog({
-                  type: "info",
-                  title: "print_order_onOrderSynced_error",
-                  metadata: {
-                    error
-                  }
-                });
-              }
-              const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
-              const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
-                paymentStatus,
-                !!currentChangeGivenAmount
-              );
-              (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
-                {
-                  paymentStatus,
-                  orderTotalAmount,
-                  gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
-                  failureReason,
-                  autoCloseConfig,
-                  actionButtons: generateActionButtons(paymentStatus)
-                },
-                paymentResultToastConfig
-              );
-              const paymentResult = {
-                ...data2,
-                toastInfo: {
-                  status: paymentStatus,
-                  amount: orderTotalAmount,
-                  gapAmount: currentChangeGivenAmount,
-                  failureReason
-                }
-              };
-              handlePaymentComplete(paymentResult);
-            } else {
-              handlePaymentComplete(data2);
-            }
-          });
         } else if (isLocalOrderCreated.current) {
           console.log(
             "🔄 PaymentModal: data changed, updating checkout data..."
@@ -1361,6 +1274,102 @@ var PaymentModal = ({
     }
   }, [data]);
   (0, import_react.useEffect)(() => {
+    const checkout = pisellos == null ? void 0 : pisellos.getModule("checkout");
+    unsubscribeRef.current = checkout.core.effects.on(
+      "checkout:onOrderSynced",
+      (data2) => {
+        var _a2, _b2, _c2;
+        const responseData = (_a2 = data2.response) == null ? void 0 : _a2.data;
+        const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
+        if (data2.isManual) return;
+        handlePaymentComplete(data2);
+        if (showingCashToastRef.current) {
+          return;
+        }
+        const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
+        const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
+        const currentChangeGivenAmount = Number(
+          ((_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.current_change_given_amount) || 0
+        );
+        const failureReason = responseData == null ? void 0 : responseData.failure_reason;
+        if (paymentStatus) {
+          console.log("print_order_onOrderSynced>>>>", responseData);
+          logger == null ? void 0 : logger.addLog({
+            type: "info",
+            title: "print_order_onOrderSynced",
+            metadata: {
+              responseData
+            }
+          });
+          try {
+            const params = {
+              type: "99",
+              // 打印订单全部信息
+              data: {
+                order_id: responseData.order_id,
+                machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
+                small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data
+              }
+            };
+            console.log("print_order_onOrderSynced_params>>>>", params);
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "print_order_onOrderSynced_params",
+              metadata: {
+                params
+              }
+            });
+            (0, import_utils.webPrint)(params, (res) => {
+              console.log("print_order_onOrderSynced_res>>>>", res);
+              logger == null ? void 0 : logger.addLog({
+                type: "info",
+                title: "print_order_onOrderSynced_res",
+                metadata: {
+                  res
+                }
+              });
+            });
+          } catch (error) {
+            console.error("print_order_onOrderSynced_error>>>>", error);
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "print_order_onOrderSynced_error",
+              metadata: {
+                error
+              }
+            });
+          }
+          const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
+          const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
+            paymentStatus,
+            !!currentChangeGivenAmount
+          );
+          (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
+            {
+              paymentStatus,
+              orderTotalAmount,
+              gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
+              failureReason,
+              autoCloseConfig,
+              actionButtons: generateActionButtons(paymentStatus)
+            },
+            paymentResultToastConfig
+          );
+          const paymentResult = {
+            ...data2,
+            toastInfo: {
+              status: paymentStatus,
+              amount: orderTotalAmount,
+              gapAmount: currentChangeGivenAmount,
+              failureReason
+            }
+          };
+          handlePaymentComplete(paymentResult);
+        } else {
+          handlePaymentComplete(data2);
+        }
+      }
+    );
     return () => {
       var _a2;
       if (typeof unsubscribeRef.current === "function") {

package/lib/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

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

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<"loading" | "warn" | "success" | "fail" | "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>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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" | "success" | "fail" | "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?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | 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" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -41,7 +41,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.18",
+  "version": "6.4.20",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.4.3",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.4.3"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",