Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Updated minimum price validation in Tiers, to support more currencies (#17661)

Browse source 
no issue

- Stripe imposes different minimum charges based on the currency used,
see
https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts
- Our validation uses double that limit, to take into account
conversions to the main currency in use in the Stripe account
This commit is contained in:
Sag 2023-08-09 17:44:01 +02:00 • committed by GitHub
parent 335faf4955
commit ea75ca6188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ghost/admin/app/components/modal-tier.js
View file

@ -2,7 +2,7 @@ import ModalBase from 'ghost-admin/components/modal-base';
import TierBenefitItem from '../models/tier-benefit-item';
import classic from 'ember-classic-decorator';
import {action} from '@ember/object';
import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/currency';
import {currencies, getCurrencyOptions, getSymbol, minimumAmountForCurrency} from 'ghost-admin/utils/currency';
import {A as emberA} from '@ember/array';
import {htmlSafe} from '@ember/template';
import {inject} from 'ghost-admin/decorators/inject';
@ -214,12 +214,14 @@ export default class ModalTierPrice extends ModalBase {
const yearlyAmount = this.stripeYearlyAmount;
const monthlyAmount = this.stripeMonthlyAmount;
const symbol = getSymbol(this.currency);
if (!yearlyAmount || yearlyAmount < 1 || !monthlyAmount || monthlyAmount < 1) {
throw new TypeError(`Subscription amount must be at least ${symbol}1.00`);
const minimumAmount = minimumAmountForCurrency(this.currency) / 100;
if (!yearlyAmount || (yearlyAmount < minimumAmount) || !monthlyAmount || (monthlyAmount < minimumAmount)) {
throw new TypeError(`Subscription amount cannot be less than ${symbol}${minimumAmount}`);
}
if (yearlyAmount > MAX_AMOUNT || monthlyAmount > MAX_AMOUNT) {
throw new TypeError(`Subscription amount cannot be higher than ${symbol}${MAX_AMOUNT}`);
throw new TypeError(`Subscription amount cannot be more than ${symbol}${MAX_AMOUNT}`);
}
} catch (err) {
this.stripePlanError = err.message;

4
ghost/admin/app/utils/currency.js
View file

@ -171,7 +171,9 @@ export function getCurrencyOptions() {
* @retuns {Number} — Minimum amount in cents (e.g. 100 for $1.00)
*/
export function minimumAmountForCurrency(currency) {
switch (currency) {
const isoCurrency = currency?.toUpperCase();
switch (isoCurrency) {
case 'AED':
return 400;
case 'BGN':