@pisell/private-materials 6.4.2 → 6.4.4

package/lib/components/checkout/PaymentModal.js

@@ -63,6 +63,7 @@ var import_constants = require("./constants");
 var import_lodash = require("lodash");
 var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
+var import_antd = require("antd");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -89,7 +90,8 @@ var PaymentContent = (0, import_react.forwardRef)(
     moduleConfig: parentModuleConfig,
     onShowCashPaymentChange,
     showSuccessToast,
-    dynamicMaxHeight = "600px"
+    dynamicMaxHeight = "600px",
+    onOrderSyncFailed
   }, ref) => {
     var _a;
     const context = (0, import_useEngineContext.default)();
@@ -366,13 +368,18 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
               (res) => {
-                var _a2;
+                var _a2, _b;
                 if (res.success) {
                   (_a2 = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _a2.call(Toast);
                 } else {
-                  Toast == null ? void 0 : Toast.fail(
-                    import_utils.locales.getText("pisell2.checkout.order-sync-failed") || "Order sync failed"
-                  );
+                  (_b = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _b.call(Toast);
+                  if (onOrderSyncFailed) {
+                    onOrderSyncFailed();
+                  } else {
+                    Toast == null ? void 0 : Toast.fail(
+                      import_utils.locales.getText("pisell2.checkout.order-sync-failed") || "Order sync failed"
+                    );
+                  }
                 }
               }
             );
@@ -531,9 +538,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           logger == null ? void 0 : logger.addLog({
             type: "info",
             title: "handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync",
-            metadata: {
-              voucherItems
-            }
+            metadata: {}
           });
           await checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
           if (walletPassRef.current) {
@@ -886,7 +891,17 @@ var PaymentModal = ({
   const [totalAmount, setTotalAmount] = (0, import_react.useState)(0);
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
+  const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
   const Toast = (0, import_useToast.default)();
+  const handleRetry = async () => {
+    const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
+    const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
+    console.log(res);
+    if (res.success) {
+      setShowRetryModal(false);
+      showSuccessToast == null ? void 0 : showSuccessToast(res);
+    }
+  };
   (0, import_react.useEffect)(() => {
     const updateHeight = () => {
       if (typeof window !== "undefined") {
@@ -1555,7 +1570,8 @@ var PaymentModal = ({
         moduleConfig,
         onShowCashPaymentChange: handleShowCashPaymentChange,
         showSuccessToast,
-        dynamicMaxHeight
+        dynamicMaxHeight,
+        onOrderSyncFailed: () => setShowRetryModal(true)
       }
     )
   ), noteModalOpen && (0, import_react_dom.createPortal)(
@@ -1571,6 +1587,23 @@ var PaymentModal = ({
       }
     )),
     document.body
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellContainer,
+    {
+      renderType: "modal",
+      props: {
+        open: showRetryModal,
+        title: import_utils.locales.getText("pisell2.checkout.tips"),
+        footer: null,
+        closable: false,
+        maskClosable: false,
+        keyboard: false,
+        onCancel: () => {
+        }
+        // 禁用关闭
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", padding: "20px" } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: "16px", fontSize: "16px" } }, import_utils.locales.getText("pisell2.checkout.sync-retry-hint") || "请点击重试按钮重新同步订单"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", size: "large", onClick: handleRetry, style: { width: "100%", marginTop: "80px" } }, import_utils.locales.getText("retry") || "重试"))
   ));
 };
 var PaymentModal_default = PaymentModal;

package/lib/components/checkout/PaymentPlugin.d.ts

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

package/lib/components/checkout/components/AdditionalModule/index.less

@@ -1,4 +1,6 @@
 .additional-module {
+  padding-bottom: 16px; // 底部间距
+
   // 标题样式
   &-title {
     font-size: 24px;

package/lib/components/checkout/hooks/useWalletPass.js

@@ -258,10 +258,7 @@ var useWalletPass = (props) => {
       logger == null ? void 0 : logger.addLog({
         type: "info",
         title: "useWalletPass_onOrderCreated onSelectChange 开始调用",
-        metadata: {
-          recommendList,
-          select
-        }
+        metadata: {}
       });
       onSelectChange == null ? void 0 : onSelectChange(select);
     } else {
@@ -413,10 +410,7 @@ var useWalletPass = (props) => {
       logger == null ? void 0 : logger.addLog({
         type: "info",
         title: "useWalletPass_handleFetchUserIdentificationCodes onSelectChange 开始调用",
-        metadata: {
-          prepare_payments,
-          select
-        }
+        metadata: {}
       });
       onSelectChange == null ? void 0 : onSelectChange(select);
       fetchUserIdentificationCodes({

package/lib/components/checkout/index.less

@@ -91,7 +91,6 @@
     .additional-module-container {
       flex-shrink: 0; // 不允许缩小
       min-height: 60px; // 确保额外模块有足够的显示空间
-      padding-bottom: 16px; // 底部间距
       position: absolute;
       bottom: 0;
       width: calc(100% - 80px);

package/lib/components/checkout/locales.d.ts

@@ -147,6 +147,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
     'zh-CN': {
         'order.total': string;
@@ -296,6 +299,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
     'zh-HK': {
         'order.total': string;
@@ -445,6 +451,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
 };
 export default _default;

package/lib/components/checkout/locales.js

@@ -202,7 +202,10 @@ var locales_default = {
     // Amount validation errors
     "pisell2.amount-summary.amount-cannot-be-zero": "The amount cannot be 0",
     // Order sync errors
-    "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network"
+    "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network",
+    "pisell2.checkout.sync-retry-hint": "Network error, please click the retry button to resync the order",
+    "pisell2.checkout.tips": "Tips",
+    "retry": "Retry"
   },
   "zh-CN": {
     // Order and Payment
@@ -387,7 +390,10 @@ var locales_default = {
     // Amount validation errors
     "pisell2.amount-summary.amount-cannot-be-zero": "金额不能为0",
     // Order sync errors
-    "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络"
+    "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络",
+    "pisell2.checkout.sync-retry-hint": "网络异常，请点击重试按钮重新同步订单",
+    "pisell2.checkout.tips": "提示",
+    "retry": "重试"
   },
   "zh-HK": {
     // Order and Payment
@@ -572,6 +578,9 @@ var locales_default = {
     // Amount validation errors
     "pisell2.amount-summary.amount-cannot-be-zero": "金額不能為0",
     // Order sync errors
-    "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡"
+    "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡",
+    "pisell2.checkout.sync-retry-hint": "網絡異常，請點擊重試按鈕重新同步訂單",
+    "pisell2.checkout.tips": "提示",
+    "retry": "重試"
   }
 };

package/lib/plus/productSelect/index.js

@@ -81,6 +81,12 @@ var index = ({
   layout,
   ...rest
 }) => {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  import_utils.locales.init(
+    import_locales.default,
+    ((_b = (_a = context.appHelper.utils) == null ? void 0 : _a.storage) == null ? void 0 : _b.get("umi_locale")) || "en"
+  );
   const searchRef = (0, import_react.useRef)(null);
   const [keyword, setKeyword] = (0, import_react.useState)("");
   const [activeKey, setActiveKey] = (0, import_react.useState)("");
@@ -91,14 +97,6 @@ var index = ({
   const gridComponents = (0, import_react.useMemo)(() => {
     return (0, import_ProductList.createGridComponents)(layout);
   }, [layout]);
-  const context = (0, import_useEngineContext.default)();
-  (0, import_react.useEffect)(() => {
-    var _a, _b;
-    import_utils.locales.init(
-      import_locales.default,
-      ((_b = (_a = context.appHelper.utils) == null ? void 0 : _a.storage) == null ? void 0 : _b.get("umi_locale")) || "en"
-    );
-  }, []);
   const _filteredList = (0, import_react.useMemo)(() => {
     if (!keyword) return dataSource;
     return dataSource.filter((product) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "scripts": {
     "dev": "father dev",
     "build": "father build",