Repository navigation
PRE-3677: PPRO display eligibility by amount and country #337
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
hdelaforce-payplug
merged 3 commits into
develop
from
feature/PRE-3677_apm-ppro-display-eligibility
Oct 27, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import { Controller } from '@hotwired/stimulus'; | ||
|
|
||
| import { validateAmounts, validateCountries } from './ppro-eligibility_validation.js'; | ||
|
|
||
| /* | ||
| * Live feedback on the PPRO amount and country settings. It never blocks the submit: the | ||
| * server-side validation is the one that refuses an invalid save. | ||
| */ | ||
| /* stimulusFetch: 'lazy' */ | ||
| export default class extends Controller { | ||
| static values = { | ||
| minBound: Number, | ||
| maxBound: Number, | ||
| messages: Object, | ||
| }; | ||
|
|
||
| static targets = ['minField', 'maxField', 'minError', 'maxError', 'countriesField', 'countriesError']; | ||
|
|
||
| connect() { | ||
| this.minInput = this.minFieldTarget.querySelector('input'); | ||
| this.maxInput = this.maxFieldTarget.querySelector('input'); | ||
| this.countriesSelect = this.countriesFieldTarget.querySelector('select'); | ||
|
|
||
| this.onAmountInput = () => this.validateAmounts(); | ||
| this.onCountriesChange = () => this.validateCountries(); | ||
|
|
||
| [this.minInput, this.maxInput].forEach((input) => input?.addEventListener('input', this.onAmountInput)); | ||
| this.countriesSelect?.addEventListener('change', this.onCountriesChange); | ||
| } | ||
|
|
||
| disconnect() { | ||
| [this.minInput, this.maxInput].forEach((input) => input?.removeEventListener('input', this.onAmountInput)); | ||
| this.countriesSelect?.removeEventListener('change', this.onCountriesChange); | ||
| } | ||
|
|
||
| validateAmounts() { | ||
| if (!this.minInput || !this.maxInput || this.minInput.disabled) { | ||
| return; | ||
| } | ||
|
|
||
| const errors = validateAmounts({ | ||
| min: this.minInput.value, | ||
| max: this.maxInput.value, | ||
| minBound: this.hasMinBoundValue ? this.minBoundValue : undefined, | ||
| maxBound: this.hasMaxBoundValue ? this.maxBoundValue : undefined, | ||
| }); | ||
|
|
||
| this.showError(this.minInput, this.minErrorTarget, errors.min); | ||
| this.showError(this.maxInput, this.maxErrorTarget, errors.max); | ||
| } | ||
|
|
||
| validateCountries() { | ||
| if (!this.countriesSelect || this.countriesSelect.disabled) { | ||
| return; | ||
| } | ||
|
|
||
| this.showError(this.countriesSelect, this.countriesErrorTarget, validateCountries(this.countriesSelect.selectedOptions.length)); | ||
| } | ||
|
|
||
| showError(field, errorElement, messageKey) { | ||
| errorElement.textContent = messageKey ? this.messagesValue[messageKey] ?? '' : ''; | ||
| errorElement.hidden = !messageKey; | ||
| field.classList.toggle('is-invalid', Boolean(messageKey)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| const AMOUNT_PATTERN = /^\d+(\.\d{1,2})?$/; | ||
|
|
||
| /** | ||
| * Euros typed by the merchant to cents: null when empty, NaN when not a positive amount with at | ||
| * most two decimals. Both "." and "," are accepted as the decimal separator. | ||
| */ | ||
| export function parseAmount(value) { | ||
| const normalised = String(value ?? '') | ||
| .replace(/[\s ]/g, '') | ||
| .replace(',', '.'); | ||
|
|
||
| if (normalised === '') { | ||
| return null; | ||
| } | ||
|
|
||
| if (!AMOUNT_PATTERN.test(normalised)) { | ||
| return Number.NaN; | ||
| } | ||
|
|
||
| return Math.round(Number.parseFloat(normalised) * 100); | ||
| } | ||
|
|
||
| const isKnown = (amount) => amount !== null && amount !== undefined && !Number.isNaN(amount); | ||
|
|
||
| /** | ||
| * Same rules as the server-side validator, with the PayPlug bounds in cents (undefined when | ||
| * unknown). Returns the message key to show under each field, or null. | ||
| */ | ||
| export function validateAmounts({ min, max, minBound, maxBound }) { | ||
| const minCents = parseAmount(min); | ||
| const maxCents = parseAmount(max); | ||
| const errors = { min: null, max: null }; | ||
|
|
||
| if (Number.isNaN(minCents)) { | ||
| errors.min = 'invalidAmount'; | ||
| } else if (isKnown(minCents) && isKnown(minBound) && minCents < minBound) { | ||
| errors.min = 'belowMin'; | ||
| } | ||
|
|
||
| if (Number.isNaN(maxCents)) { | ||
| errors.max = 'invalidAmount'; | ||
| } else if (isKnown(maxCents) && isKnown(maxBound) && maxCents > maxBound) { | ||
| errors.max = 'aboveMax'; | ||
| } | ||
|
|
||
| const effectiveMin = isKnown(minCents) ? minCents : minBound; | ||
| const effectiveMax = isKnown(maxCents) ? maxCents : maxBound; | ||
| if (errors.min === null && errors.max === null && isKnown(effectiveMin) && isKnown(effectiveMax)) { | ||
| if (effectiveMin > effectiveMax) { | ||
| errors.min = 'minGreaterThanMax'; | ||
| } | ||
| } | ||
|
|
||
| return errors; | ||
| } | ||
|
|
||
| export function validateCountries(selectedCount) { | ||
| return selectedCount === 0 ? 'noCountry' : null; | ||
| } |
64 changes: 64 additions & 0 deletions
64
assets/admin/controllers/ppro-eligibility_validation.test.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import { test } from 'node:test'; | ||
| import assert from 'node:assert/strict'; | ||
|
|
||
| import { parseAmount, validateAmounts, validateCountries } from './ppro-eligibility_validation.js'; | ||
|
|
||
| const bounds = { minBound: 30, maxBound: 2000000 }; | ||
|
|
||
| test('belowMinReturnsError', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: '0.10', max: '' }), { min: 'belowMin', max: null }); | ||
| }); | ||
|
|
||
| test('aboveMaxReturnsError', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: '', max: '20000.01' }), { min: null, max: 'aboveMax' }); | ||
| }); | ||
|
|
||
| test('minGreaterThanMaxReturnsError', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: '50', max: '10' }), { min: 'minGreaterThanMax', max: null }); | ||
| }); | ||
|
|
||
| test('minGreaterThanMaxAgainstTheBoundOfAnEmptyField', () => { | ||
| assert.deepEqual(validateAmounts({ minBound: 500, maxBound: 200000, min: '', max: '3' }), { | ||
| min: 'minGreaterThanMax', | ||
| max: null, | ||
| }); | ||
| }); | ||
|
|
||
| test('boundsAreInclusive', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: '0.30', max: '20000' }), { min: null, max: null }); | ||
| }); | ||
|
|
||
| test('emptyIsValid', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: '', max: ' ' }), { min: null, max: null }); | ||
| }); | ||
|
|
||
| test('unknownBoundsOnlyCheckMinAgainstMax', () => { | ||
| assert.deepEqual(validateAmounts({ min: '0.01', max: '999999' }), { min: null, max: null }); | ||
| assert.deepEqual(validateAmounts({ min: '10', max: '5' }), { min: 'minGreaterThanMax', max: null }); | ||
| }); | ||
|
|
||
| test('invalidAmountReturnsError', () => { | ||
| assert.deepEqual(validateAmounts({ ...bounds, min: 'abc', max: '12.345' }), { | ||
| min: 'invalidAmount', | ||
| max: 'invalidAmount', | ||
| }); | ||
| }); | ||
|
|
||
| test('noCountryReturnsError', () => { | ||
| assert.equal(validateCountries(0), 'noCountry'); | ||
| assert.equal(validateCountries(1), null); | ||
| }); | ||
|
|
||
| test('commaDecimalIsParsed', () => { | ||
| assert.equal(parseAmount('12,50'), 1250); | ||
| assert.equal(parseAmount('12.5'), 1250); | ||
| assert.equal(parseAmount('1 500'), 150000); | ||
| assert.equal(parseAmount('0,1'), 10); | ||
| }); | ||
|
|
||
| test('parseAmountDistinguishesEmptyFromInvalid', () => { | ||
| assert.equal(parseAmount(''), null); | ||
| assert.equal(parseAmount(undefined), null); | ||
| assert.ok(Number.isNaN(parseAmount('-5'))); | ||
| assert.ok(Number.isNaN(parseAmount('1.2.3'))); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.