TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 04:43:12 +03:00
Code Issues Projects Releases Wiki Activity

Fixed max currency amount to only apply to donations (#18711)

Browse Source 
refs https://github.com/TryGhost/Product/issues/4044

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at ea09dec</samp>

This pull request improves the validation of suggested amounts for tips
or donations in the membership settings. It adds a constant `MAX_AMOUNT`
based on Stripe's limit and refactors the `validateCurrencyAmount`
function to make it more reusable.
This commit is contained in:
Jono M 2023-10-20 11:48:59 +01:00 committed by Jono Mingard
parent a08e5ef324
commit 838e315336
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx
View File

@ -11,6 +11,9 @@ import {currencySelectGroups, getSymbol, validateCurrencyAmount} from '../../../
import {getSettingValues} from '../../../api/settings'; import {getSettingValues} from '../../../api/settings';
import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary'; import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
// Stripe doesn't allow amounts over 10,000 as a preset amount
const MAX_AMOUNT = 10_000;
const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => { const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
const { const {
localSettings, localSettings,
@ -28,7 +31,7 @@ const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
} = useSettingGroup({ } = useSettingGroup({
onValidate: () => { onValidate: () => {
return { return {
donationsSuggestedAmount: validateCurrencyAmount(suggestedAmountInCents, donationsCurrency) donationsSuggestedAmount: validateCurrencyAmount(suggestedAmountInCents, donationsCurrency, {maxAmount: MAX_AMOUNT})
}; };
} }
}); });

13
apps/admin-x-settings/src/utils/currency.ts
View File

@ -203,10 +203,11 @@ export function minimumAmountForCurrency(currency: string) {
} }
} }
// Stripe doesn't allow amounts over 10,000 as a preset amount export function validateCurrencyAmount(
const MAX_AMOUNT = 10_000; cents: number | undefined,
currency: string | undefined,
export function validateCurrencyAmount(cents: number | undefined, currency: string | undefined, {allowZero = true} = {}) { {allowZero = true, maxAmount}: {allowZero?: boolean; maxAmount?: number} = {}
) {
if (cents === undefined || !currency) { if (cents === undefined || !currency) {
return; return;
} }
@ -222,7 +223,7 @@ export function validateCurrencyAmount(cents: number | undefined, currency: stri
return `Non-zero amount must be at least ${symbol}${minAmount}.`; return `Non-zero amount must be at least ${symbol}${minAmount}.`;
} }
if (cents !== 0 && cents > (MAX_AMOUNT * 100)) { if (maxAmount && cents !== 0 && cents > (maxAmount * 100)) {
return `Suggested amount cannot be more than ${symbol}${MAX_AMOUNT}.`; return `Suggested amount cannot be more than ${symbol}${maxAmount}.`;
} }
} }