Skip to content
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

feat: [PE-553] CGN discount screen revamp #6087

Merged
merged 48 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
088031d
feat: first implementation of cgn discount page revamped
Hantex9 Aug 1, 2024
f42f814
feat: Implementation of OTP and bucket code
Hantex9 Aug 1, 2024
88971f7
chore: completed discount code expiration
Hantex9 Aug 1, 2024
0ac3560
chore: removed legacy components and screens
Hantex9 Aug 1, 2024
b3bca89
chore: add locales and fix expiration discount
Hantex9 Aug 2, 2024
584f781
chore: expired code implementation
Hantex9 Aug 2, 2024
44e48cf
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 2, 2024
6f2131c
chore: removed unused tests
Hantex9 Aug 2, 2024
ed1d789
Merge branch 'PE-553-cgn-discount-revamp' of https://github.com/pagop…
Hantex9 Aug 2, 2024
bc982ad
fix: tests
Hantex9 Aug 2, 2024
929d228
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 2, 2024
35cd64c
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 2, 2024
91da8f6
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 2, 2024
782726b
Merge branch 'master' into PE-553-cgn-discount-revamp
thisisjp Aug 5, 2024
609ff2c
Merge remote-tracking branch 'origin/master' into PE-553-cgn-discount…
Hantex9 Aug 12, 2024
db2eb1a
fix: ignore safe afrea margin
Hantex9 Aug 12, 2024
813d3d7
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 13, 2024
3ae53f7
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 21, 2024
fdbf175
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 26, 2024
baaa0ad
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 26, 2024
b3f6941
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 28, 2024
1f32f61
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 29, 2024
010a65d
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Aug 29, 2024
4a74494
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 2, 2024
73cc66c
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 9, 2024
f7a5de5
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 16, 2024
1163b91
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 16, 2024
ab9397a
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 18, 2024
4764401
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 20, 2024
3e381d5
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 23, 2024
7da70a8
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Sep 25, 2024
1895b3f
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 1, 2024
5c0edc3
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 1, 2024
ec3871f
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 4, 2024
1fb600d
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 4, 2024
d2ce507
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 7, 2024
ba56a2b
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 7, 2024
9dec246
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 8, 2024
acc340d
fix: regression on discount amount percentage
Hantex9 Oct 8, 2024
7bc79ab
fix: Removed isModal unused prop
Hantex9 Oct 8, 2024
61156f0
chore: remove unused translations
Hantex9 Oct 8, 2024
6c506d9
fix: add missed locales
Hantex9 Oct 8, 2024
9a16078
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 8, 2024
2011c3e
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 9, 2024
a6316f0
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 10, 2024
4accf10
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 10, 2024
a7aa482
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 11, 2024
bbdb8f8
Merge branch 'master' into PE-553-cgn-discount-revamp
Hantex9 Oct 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions locales/de/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2282,24 +2282,11 @@ bonus:
byDistance: "Nach der Nähe zu deinem Standort"
byName: "Alphabetisch geordnet"
merchantDetail:
bucket:
alert:
cta: "Verstanden!"
error:
noCode: "Die Rabattcodes für diese Ermäßigung sind derzeit abgelaufen, bitte versuche es später noch einmal."
title:
deals: Opportunità
description: "Beschreibung"
services: "Dienste"
contactInfo: "Adressen"
hours: "Öffnungszeiten"
validity: "Gültigkeit"
discountCode: "Rabattcode"
conditions: "Bedingungen"
cta:
label: "Besuche die Website des Anbieters"
landingPage: "Die Ermäßigung nutzen"
discountUrl: "Nutze die Ermäßigung"
website: Vai al sito del partner
categories:
counting: "und weitere {{count}}"
Expand Down
26 changes: 13 additions & 13 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2694,24 +2694,11 @@ bonus:
byDistance: By proximity to your location
byName: Alphabetical order
merchantDetail:
bucket:
alert:
cta: I got it!
error:
noCode: Codes for this discount are temporary over, please try again later
title:
deals: Opportunities
description: Description
services: Services
contactInfo: Addresses
hours: Working Hours
validity: Validity
discountCode: Discount code
conditions: Conditions
cta:
label: Go to partner's website
landingPage: Get the benefit
discountUrl: Go to the benefit
website: Go to partner's website
categories:
counting: and other {{count}}
Expand All @@ -2728,6 +2715,19 @@ bonus:
information:
address: Indirizzo
allNational: Tutti i punti vendita sul territorio nazionale
discount:
description: Descrizione
conditions: Condizioni
validity: Validità
cta:
api: Attiva codice sconto
static: Vai al codice sconto
bucket: Vai al codice sconto
landingpage: Vai all'opportunità
secondaryCta: Vai all'opportunità
title: Ecco il codice sconto!
expired: Codice sconto scaduto!
copyButton: Copia codice sconto
cta:
activeBonus: Activate Carta Giovani Nazionale
back: Not now
Expand Down
26 changes: 13 additions & 13 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2694,24 +2694,11 @@ bonus:
byDistance: Per vicinanza alla tua posizione
byName: Ordine alfabetico
merchantDetail:
bucket:
alert:
cta: Ho capito!
error:
noCode: I codici sconto di questa agevolazione sono al momento terminati, riprova più tardi
title:
deals: Opportunità
description: Descrizione
services: Servizi
contactInfo: Contatti e informazioni
hours: Orari
validity: Validità
discountCode: Codice Sconto
conditions: Condizioni
cta:
label: Vai al sito dell'operatore
landingPage: Accedi all’opportunità
discountUrl: Vai all'opportunità
website: Vai al sito del partner
categories:
counting: e altre {{count}}
Expand All @@ -2728,6 +2715,19 @@ bonus:
information:
address: Indirizzo
allNational: Tutti i punti vendita sul territorio nazionale
discount:
description: Descrizione
conditions: Condizioni
validity: Validità
cta:
api: Attiva codice sconto
static: Vai al codice sconto
bucket: Vai al codice sconto
landingpage: Vai all'opportunità
secondaryCta: Vai all'opportunità
title: Ecco il codice sconto!
expired: Codice sconto scaduto!
copyButton: Copia codice sconto
cta:
activeBonus: Attiva Carta Giovani Nazionale
back: Non ora
Expand Down
108 changes: 0 additions & 108 deletions ts/features/bonus/cgn/components/LegacyCgnServiceCTA.tsx

This file was deleted.

68 changes: 0 additions & 68 deletions ts/features/bonus/cgn/components/__test__/CgnCard.test.tsx

This file was deleted.

This file was deleted.

Loading
Loading