@pisell/private-materials 6.6.5 → 6.6.7

package/es/components/checkout/PaymentModal.js

@@ -2078,7 +2078,7 @@ var PaymentModal = function PaymentModal(_ref18) {
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
       var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var checkout, shop_wallet_pass_id, newData, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4;
+        var checkout, shop_wallet_pass_id, newData, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4, domain;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2095,7 +2095,7 @@ var PaymentModal = function PaymentModal(_ref18) {
             case 6:
               shop_wallet_pass_id = _context23.sent;
               checkout.setOtherParams({
-                is_price_include_tax: getData('is_price_include_tax'),
+                is_price_include_tax: getData('is_price_include_tax') || 1,
                 tax_rate: getData('tax_rate') || '10',
                 surcharge_list: getData('surcharge_list'),
                 currency_format: getData('currency_format'),
@@ -2310,11 +2310,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                   return _ref29.apply(this, arguments);
                 };
               }()));
-              _context23.next = 42;
+              _context23.next = 45;
               break;
             case 25:
               if (!isLocalOrderCreated.current) {
-                _context23.next = 42;
+                _context23.next = 44;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
@@ -2361,27 +2361,32 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
-            case 42:
-              _context23.next = 49;
+              _context23.next = 45;
               break;
             case 44:
-              _context23.prev = 44;
+              throw new Error('pisellos is not available');
+            case 45:
+              _context23.next = 53;
+              break;
+            case 47:
+              _context23.prev = 47;
               _context23.t0 = _context23["catch"](0);
               console.error('Failed to initialize checkout data:', _context23.t0);
+              domain = window.location.hostname;
               logger === null || logger === void 0 || logger.addLog({
                 type: 'error',
-                title: 'Failed to initialize checkout data',
+                title: "".concat(domain, ": Failed to initialize checkout data"),
                 metadata: {
                   error: _context23.t0
                 }
               });
               // 如果订单创建失败，弹出提示让重新加载 app
               setShowCreateErrorModal(true);
-            case 49:
+            case 53:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, null, [[0, 44]]);
+        }, _callee23, null, [[0, 47]]);
       }));
       return function initCheckoutData() {
         return _ref28.apply(this, arguments);

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

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

package/es/components/checkout/components/AmountSummary/index.less

@@ -248,7 +248,6 @@
 
   .balance-due-label {
     font-size: 16px;
-    color: #7f56da;
     font-weight: 400;
     line-height: 1.5;
     margin-bottom: 4px;
@@ -256,7 +255,7 @@
 
   .balance-due-amount {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     color: #7f56da;
     line-height: 0.75;
     text-decoration: underline;
@@ -272,13 +271,13 @@
   .pay-text {
     font-size: 16px;
     font-weight: 500;
-    color: #7f56da;
     letter-spacing: 0.09375em;
+    margin-top: 12px;
   }
 
   .pay-amount {
-    font-size: 32px;
-    font-weight: 400;
+    font-size: 36px;
+    font-weight: 600;
     color: #1e1830;
     line-height: 0.75;
   }

package/es/components/checkout/components/WalletPassModule/index.js

@@ -25,6 +25,7 @@ var WalletPassModule = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useWalletPass = useWalletPass({
       onSelectChange: onSelectChange,
       customAmount: customAmount,
+      totalAmount: Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) || 0,
       clientId: clientId
     }),
     handleSelectWallet = _useWalletPass.handleSelectWallet,

package/es/components/checkout/components/WalletPassModule/utils.js

@@ -11,12 +11,15 @@ 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 React from 'react';
-import { formatDate, locales } from '@pisell/utils';
+import { formatDate, isNumber, locales } from '@pisell/utils';
 import { globalConfig, PisellText } from "@pisell/materials";
 import Decimal from 'decimal.js';
 var Amount = PisellText.Amount;
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var voucherTime = function voucherTime(data) {
@@ -32,6 +35,14 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
   var otherProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return (data || []).map(function (item) {
     var _item$unified_message, _item$product;
+    var disabled = false;
+    if (item.unified_available_status === 0) {
+      disabled = true;
+    } else {
+      if (isNumber(item._unified_available_status)) {
+        disabled = !item._unified_available_status;
+      }
+    }
     return _objectSpread({
       id: item.id,
       name: item.product_name,
@@ -48,8 +59,8 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
+      disabled: disabled,
+      disabledReason: isNumber(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -9,6 +9,7 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
+    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -17,7 +18,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;
@@ -29,7 +30,6 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (value: number[], option: any) => void;
     customerName: any;
-    fetchWalletRecommendList: (params: any) => Promise<any>;
     fetchUserIdentificationCodes: (params: any) => Promise<any>;
     getCachedWalletRecommendList: () => any;
     getCachedUserIdentificationCodes: () => any;