@pisell/private-materials 6.5.4 → 6.5.6

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

@@ -128,11 +128,12 @@ var WalletPassModule = /*#__PURE__*/forwardRef(function (props, ref) {
     return selectedWalletIds.length + selectedDiscountList.length;
   }, [selectedWalletIds.length, selectedDiscountList.length]);
   var discountDisabled = useMemo(function () {
+    if (Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) === 0) return true;
     return !!(paymentItems !== null && paymentItems !== void 0 && paymentItems.some(function (item) {
-      return !WALLET_PASS_CODE_ARRAY.includes(item.code);
+      return !WALLET_PASS_CODE_ARRAY.includes(item.code) && !item.isSynced;
     }));
-  }, [paymentItems]);
-  if (cardData.length === 0 && availableDiscountList.length === 0) {
+  }, [paymentItems, orderInfo]);
+  if (cardData.length === 0 && availableDiscountList.length === 0 && disabledWalletData.length === 0) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {

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

@@ -63,7 +63,7 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
     var _item$product2;
     var name = "";
     var storeName = "";
-    if (item.tag === 'product_discount_card') {
+    if (item.tag === 'product_discount_card' || item.tag === 'discount_card') {
       var _item$metadata;
       if ((item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.discount_card_type) === "fixed_amount") {
         var amountValue = item !== null && item !== void 0 && item.savedAmount ? item === null || item === void 0 ? void 0 : item.savedAmount : item.par_value;
@@ -72,9 +72,9 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
           showCurrencySymbol: true
         }));
       } else {
-        name = locales.getText('pisell2.checkout.discount.percentage.off')(item.par_value);
+        name = locales.getText('pisell2.checkout.discount.percentage.off')(item.par_value || item.discount.percent);
       }
-      storeName = item.product_name;
+      storeName = item.product_name || item.format_title.auto;
     } else if (item.tag === 'good_pass') {
       var _locales$getText;
       name = item.product_name;
@@ -85,6 +85,12 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
     } else {
       name = item.product_name;
     }
+
+    // 如果处理完最后还没有 name，并且是 isEditMode，则 name 为 item.amount
+    if (!name && item.isEditMode) {
+      name = item.amount;
+      storeName = item.format_title.auto;
+    }
     return _objectSpread(_objectSpread({}, item), {}, {
       id: item.id,
       name: name,
@@ -103,7 +109,7 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
       code: item.code,
       disabled: item.isDisabled,
       showStatus: true,
-      cardStatus: item.isDisabled ? 'conflict' : undefined,
+      cardStatus: item.isEditMode ? 'lastPayment' : item.isDisabled ? 'conflict' : undefined,
       cover: (_item$product2 = item.product) === null || _item$product2 === void 0 ? void 0 : _item$product2.cover,
       qrCode: item.code,
       validDate: voucherTime(item, 'expire_time'),

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

@@ -514,6 +514,7 @@ export var useWalletPass = function useWalletPass(props) {
     // 注册事件监听器
     core.effects.on('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
     core.effects.on('checkout:onPaymentStarted', handlePaymentStarted);
+    core.effects.on('checkout:onPaymentItemAdded', handlePaymentStarted);
     core.effects.on('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
     core.effects.on('wallet:onWalletCacheCleared', handleWalletCacheCleared);
     core.effects.on('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
@@ -526,6 +527,7 @@ export var useWalletPass = function useWalletPass(props) {
     return function () {
       core.effects.off('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
       core.effects.off('checkout:onPaymentStarted', handlePaymentStarted);
+      core.effects.off('checkout:onPaymentItemAdded', handlePaymentStarted);
       core.effects.off('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
       core.effects.off('wallet:onWalletCacheCleared', handleWalletCacheCleared);
       core.effects.off('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
@@ -706,11 +708,16 @@ export var useWalletPass = function useWalletPass(props) {
         }))) {
           Toast === null || Toast === void 0 || Toast.info(locales.getText('wallet-pass-module-already-best-combination'));
         } else {
-          setWalletSelect(searchIdentificationCodeList);
-          handleFetchUserIdentificationCodes(searchIdentificationCodeList.map(function (item) {
+          var _select2 = searchIdentificationCodeList.filter(function (item) {
+            return item.unified_available_status;
+          });
+          setWalletSelect(_select2);
+          handleFetchUserIdentificationCodes(_select2.map(function (item) {
             return item.id;
-          }), searchIdentificationCodeList);
-          Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
+          }), _select2);
+          if (_select2.length) {
+            Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
+          }
         }
       }
       return;

package/es/components/checkout/index.less

@@ -69,7 +69,7 @@
     display: grid;
     grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); // 强制等宽分配
     grid-template-rows: auto auto;
-    gap: 16px;
+    gap: 8px 16px;
     background-color: #f6f2ff;
     padding: 16px 16px 0 16px;
     border-radius: 0 0 12px 12px;

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

@@ -23,7 +23,9 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
+        'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -78,6 +80,7 @@ declare const _default: {
         'wallet-pass-module-disabled-modal-title': string;
         'wallet-pass-module-disabled-modal-empty': string;
         'wallet-pass-module-discount-partially-paid': string;
+        'wallet-pass-module-discount-order-free': string;
         'additional.options': string;
         'add.tip': string;
         'service.charge': string;
@@ -153,6 +156,15 @@ declare const _default: {
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
+        'cash-payment-title': string;
+        'cash-payment-balance-due': string;
+        'cash-payment-cash-received': string;
+        'cash-payment-change-due': string;
+        'cash-payment-rounding': string;
+        'cash-payment-other': string;
+        'cash-payment-reset': string;
+        'cash-payment-pay': string;
+        'cash-payment-amount-cannot-be-zero': string;
     };
     'zh-CN': {
         'order.total': string;
@@ -178,7 +190,9 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
+        'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -233,6 +247,7 @@ declare const _default: {
         'wallet-pass-module-disabled-modal-title': string;
         'wallet-pass-module-disabled-modal-empty': string;
         'wallet-pass-module-discount-partially-paid': string;
+        'wallet-pass-module-discount-order-free': string;
         'additional.options': string;
         'add.tip': string;
         'service.charge': string;
@@ -308,6 +323,15 @@ declare const _default: {
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
+        'cash-payment-title': string;
+        'cash-payment-balance-due': string;
+        'cash-payment-cash-received': string;
+        'cash-payment-change-due': string;
+        'cash-payment-rounding': string;
+        'cash-payment-other': string;
+        'cash-payment-reset': string;
+        'cash-payment-pay': string;
+        'cash-payment-amount-cannot-be-zero': string;
     };
     'zh-HK': {
         'order.total': string;
@@ -333,7 +357,9 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
+        'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -394,6 +420,7 @@ declare const _default: {
         'wallet-pass-module-disabled-modal-title': string;
         'wallet-pass-module-disabled-modal-empty': string;
         'wallet-pass-module-discount-partially-paid': string;
+        'wallet-pass-module-discount-order-free': string;
         'pisell2.checkout.search-section.placeholder': string;
         'pisell2.checkout.discount.percentage.off': (value: string) => string;
         'pisell2.checkout.discount.fixed_amount': string;
@@ -463,6 +490,15 @@ declare const _default: {
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
+        'cash-payment-title': string;
+        'cash-payment-balance-due': string;
+        'cash-payment-cash-received': string;
+        'cash-payment-change-due': string;
+        'cash-payment-rounding': string;
+        'cash-payment-other': string;
+        'cash-payment-reset': string;
+        'cash-payment-pay': string;
+        'cash-payment-amount-cannot-be-zero': string;
     };
 };
 export default _default;

package/es/components/checkout/locales.js

@@ -27,7 +27,9 @@ export default {
     'balance.due': 'Balance Due',
     'deposit.due': 'Deposit Due',
     'partial.paid': 'Partial Paid',
+    'deposit.partial.paid': 'Deposit Paid',
     'split.payment': 'Pay\nPartially',
+    'split.cancel': 'Cancel\nPartial',
     // Cash Payment
     'cash': 'Cash',
     'rounding': 'Rounding',
@@ -81,7 +83,7 @@ export default {
       return "".concat(count, " Expired");
     },
     'wallet-pass-module-best-saving': 'Select Best',
-    'wallet-pass-module-clear-all': 'Clear All',
+    'wallet-pass-module-clear-all': 'Clear Selection',
     'wallet-pass-module-expired-modal-title': function walletPassModuleExpiredModalTitle(count) {
       return "".concat(count, " Expired Vouchers");
     },
@@ -98,6 +100,7 @@ export default {
     'wallet-pass-module-disabled-modal-title': 'Unable to use',
     'wallet-pass-module-disabled-modal-empty': 'No unusable cards',
     'wallet-pass-module-discount-partially-paid': 'Promotion cannot be changed on partially paid orders or used wallet',
+    'wallet-pass-module-discount-order-free': 'The order total is free, can not use wallet',
     // Additional Module
     'additional.options': 'Additional Options',
     'add.tip': 'Add Tip',
@@ -198,7 +201,17 @@ export default {
     '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'
+    'retry': 'Retry',
+    // Cash Payment Module
+    'cash-payment-title': 'Cash Payment',
+    'cash-payment-balance-due': 'Balance Due',
+    'cash-payment-cash-received': 'Cash Received',
+    'cash-payment-change-due': 'Change Due',
+    'cash-payment-rounding': 'Rounding',
+    'cash-payment-other': 'Other',
+    'cash-payment-reset': 'Reset',
+    'cash-payment-pay': 'Pay',
+    'cash-payment-amount-cannot-be-zero': 'The amount cannot be 0'
   },
   'zh-CN': {
     // Order and Payment
@@ -228,7 +241,9 @@ export default {
     'balance.due': '应付金额',
     'deposit.due': '定金待支付金额',
     'partial.paid': '部分支付',
+    'deposit.partial.paid': '定金部分支付',
     'split.payment': '部分付款',
+    'split.cancel': '取消\n部分支付',
     // Cash Payment
     'cash': '现金',
     'rounding': '舍入',
@@ -299,6 +314,7 @@ export default {
     'wallet-pass-module-disabled-modal-title': '无法使用的卡券',
     'wallet-pass-module-disabled-modal-empty': '暂无不可用卡券',
     'wallet-pass-module-discount-partially-paid': '部分付款或已使用钱包的订单不可修改促销',
+    'wallet-pass-module-discount-order-free': '订单金额为0，不可使用折扣卡或商品券',
     // Additional Module
     'additional.options': '附加选项',
     'add.tip': '添加小费',
@@ -402,7 +418,17 @@ export default {
     'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络',
     'pisell2.checkout.sync-retry-hint': '网络异常，请点击重试按钮重新同步订单',
     'pisell2.checkout.tips': '提示',
-    'retry': '重试'
+    'retry': '重试',
+    // 现金支付模块
+    'cash-payment-title': '现金支付',
+    'cash-payment-balance-due': '应付金额',
+    'cash-payment-cash-received': '实收金额',
+    'cash-payment-change-due': '找零金额',
+    'cash-payment-rounding': '抹零',
+    'cash-payment-other': '其他',
+    'cash-payment-reset': '重置',
+    'cash-payment-pay': '支付',
+    'cash-payment-amount-cannot-be-zero': '金额不能为0'
   },
   'zh-HK': {
     // Order and Payment
@@ -432,7 +458,9 @@ export default {
     'balance.due': '應付金額',
     'deposit.due': '定金待支付金額',
     'partial.paid': '部分支付',
+    'deposit.partial.paid': '定金部分支付',
     'split.payment': '部分付款',
+    'split.cancel': '取消\n部分支付',
     // Cash Payment
     'cash': '現金',
     'rounding': '捨入',
@@ -510,6 +538,7 @@ export default {
     'wallet-pass-module-disabled-modal-title': '無法使用的卡券',
     'wallet-pass-module-disabled-modal-empty': '暫無不可用卡券',
     'wallet-pass-module-discount-partially-paid': '部分付款或已使用錢包的訂單不可修改促銷',
+    'wallet-pass-module-discount-order-free': '訂單金額為0，不可使用折扣卡或商品券',
     // search section
     'pisell2.checkout.search-section.placeholder': '錢包碼 / 短碼',
     // discount formatting
@@ -606,6 +635,16 @@ export default {
     'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡',
     'pisell2.checkout.sync-retry-hint': '網絡異常，請點擊重試按鈕重新同步訂單',
     'pisell2.checkout.tips': '提示',
-    'retry': '重試'
+    'retry': '重試',
+    // 現金支付模組
+    'cash-payment-title': '現金支付',
+    'cash-payment-balance-due': '應付金額',
+    'cash-payment-cash-received': '實收金額',
+    'cash-payment-change-due': '找零金額',
+    'cash-payment-rounding': '抹零',
+    'cash-payment-other': '其他',
+    'cash-payment-reset': '重置',
+    'cash-payment-pay': '支付',
+    'cash-payment-amount-cannot-be-zero': '金額不能為0'
   }
 };

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

@@ -121,6 +121,7 @@ export interface PaymentMethod {
     type: string;
     fixed?: number;
     percentage?: number;
+    totalAmount?: string;
 }
 export interface PaymentMethodSelection {
     method: PaymentMethod;

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: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "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, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", 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<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "fail" | "warn" | "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/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: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "fail" | "warn" | "question";
     };
 };
 /**
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "fail" | "warn" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,11 +28,4 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;