From be33d0dd6746069e05ef3a8507a7f8889e2cc660 Mon Sep 17 00:00:00 2001 From: Liangjun Song <146005915+adai26@users.noreply.github.com> Date: Thu, 13 Feb 2025 12:49:47 +0000 Subject: [PATCH] Merge pull request #23599 from overleaf/ii-flexible-group-licensing-vat [web] Change "Sales tax" to "VAT" GitOrigin-RevId: 549c6cea7bcb52d08d3b0967cf5fa446da901379 --- services/web/frontend/extracted-translations.json | 1 - .../group-management/components/add-seats/cost-summary.tsx | 2 +- .../upgrade-subscription-upgrade-summary.tsx | 2 +- services/web/locales/en.json | 1 - .../features/group-management/components/add-seats.spec.tsx | 5 +---- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index b4de3719e5..22bb1cea0b 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -1365,7 +1365,6 @@ "revoke_invite": "", "right": "", "role": "", - "sales_tax": "", "saml_auth_error": "", "saml_identity_exists_error": "", "saml_invalid_signature_error": "", diff --git a/services/web/frontend/js/features/group-management/components/add-seats/cost-summary.tsx b/services/web/frontend/js/features/group-management/components/add-seats/cost-summary.tsx index c6cae7f064..87bc798c34 100644 --- a/services/web/frontend/js/features/group-management/components/add-seats/cost-summary.tsx +++ b/services/web/frontend/js/features/group-management/components/add-seats/cost-summary.tsx @@ -92,7 +92,7 @@ function CostSummary({ subscriptionChange, totalLicenses }: CostSummaryProps) { data-testid="tax" > - {t('sales_tax')} ·{' '} + {t('vat')} ·{' '} {Math.round( subscriptionChange.nextInvoice.tax.rate * 100 * factor ) / factor} diff --git a/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription-upgrade-summary.tsx b/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription-upgrade-summary.tsx index 921a4844a7..90b71421b0 100644 --- a/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription-upgrade-summary.tsx +++ b/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription-upgrade-summary.tsx @@ -59,7 +59,7 @@ function UpgradeSummary({ subscriptionChange }: UpgradeSummaryProps) { )} - {t('sales_tax')} + {t('vat')} {formatCurrency( subscriptionChange.immediateCharge.tax, diff --git a/services/web/locales/en.json b/services/web/locales/en.json index ed0ac1b527..63c23b1068 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1819,7 +1819,6 @@ "ro": "Romanian", "role": "Role", "ru": "Russian", - "sales_tax": "Sales tax", "saml": "SAML", "saml_auth_error": "Sorry, your identity provider responded with an error. Please contact your administrator for more information.", "saml_authentication_required_error": "Other login methods have been disabled by your group administrator. Please use your group SSO login.", diff --git a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx index f266789e13..2127e127ef 100644 --- a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx +++ b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx @@ -269,10 +269,7 @@ describe('', function () { cy.findByTestId('tax').within(() => { cy.findByText( - new RegExp( - `sales tax · ${this.body.nextInvoice.tax.rate * 100}%`, - 'i' - ) + new RegExp(`VAT · ${this.body.nextInvoice.tax.rate * 100}%`, 'i') ) cy.findByTestId('price').should( 'have.text',