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(Bonus Pagamenti Digitali): [#176272983] Ranking not ready component & bottomsheet #2641

Merged
merged 38 commits into from
Dec 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e5a3d61
[#176191528] add ranking placeholder
fabriziofff Dec 21, 2020
dff5eeb
[#176191528] add supercashback representation
fabriziofff Dec 21, 2020
2fd3b83
[#176191528] update textual summary
fabriziofff Dec 21, 2020
a68ee40
[#176191528] add supercashback messages
fabriziofff Dec 21, 2020
c0469dc
[#176191528] remove console
fabriziofff Dec 22, 2020
4efefba
[#176191528] Merge remote-tracking branch 'origin/master' into 176191…
fabriziofff Dec 22, 2020
dcede5d
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 22, 2020
f391362
[#176191528] refactoring
fabriziofff Dec 22, 2020
f9669f4
[#176191528] Merge remote-tracking branch 'origin/176191528-supercash…
fabriziofff Dec 22, 2020
48d5816
[#176191528] fix test
fabriziofff Dec 22, 2020
ba57d3f
[#176191528] add supercashback test
fabriziofff Dec 22, 2020
38d0a67
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 22, 2020
04cfd56
[#176191528] add missing test
fabriziofff Dec 22, 2020
6d8c704
[#176191528] Merge remote-tracking branch 'origin/176191528-supercash…
fabriziofff Dec 22, 2020
a92c62b
[#176191528] refactoring
fabriziofff Dec 22, 2020
3e8ba81
[#176191528] remove FunctionComponent
fabriziofff Dec 23, 2020
a62cef5
[#176191528] remove functionComponent
fabriziofff Dec 23, 2020
22060c5
[#176191528] Merge remote-tracking branch 'origin/master' into 176191…
fabriziofff Dec 23, 2020
199dbea
[#176272983] Merge branch '176191528-supercashback-graphical-componen…
fabriziofff Dec 23, 2020
bbe6bdc
[#176272983] test
fabriziofff Dec 23, 2020
fb9f886
[#176272983] revert
fabriziofff Dec 23, 2020
8687ae5
[#176272983] add ranking not ready item
fabriziofff Dec 23, 2020
5321403
[#176272983] add condition for ranking
fabriziofff Dec 23, 2020
5ce95b7
[#176272983] add bottomsheet
fabriziofff Dec 23, 2020
cbdf99d
[#176272983] fix test
fabriziofff Dec 23, 2020
46cc1ec
[#176272983] add test
fabriziofff Dec 23, 2020
9dfc3dd
[#176272983] renaming
fabriziofff Dec 23, 2020
28c224b
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
1b961af
[#176191528] fixes
fabriziofff Dec 28, 2020
e2b97cc
[#176191528] add test for formatIntegerNumber
fabriziofff Dec 28, 2020
af0f136
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
bacf2cb
Merge branch 'master' into 176191528-supercashback-graphical-componen…
Undermaken Dec 28, 2020
ff9b276
Merge branch 'master' into 176272983-ranking-not-ready
Undermaken Dec 28, 2020
993b375
Merge branch 'master' into 176191528-supercashback-graphical-componen…
Undermaken Dec 28, 2020
5783110
[#176191528] Merge branch 'master' into 176191528-supercashback-graph…
fabriziofff Dec 28, 2020
7ca129a
[#176272983] Merge branch '176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
0f39762
Merge branch 'master' into 176272983-ranking-not-ready
Undermaken Dec 29, 2020
350c583
[#176272983] refactoring
Undermaken Dec 29, 2020
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
6 changes: 6 additions & 0 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1945,6 +1945,12 @@ bonus:
other: "{{count}} valid transactions"
ranking:
title: "Your position"
notReady:
title: "When will you see the Super Cashback ranking?"
body: "The ranking is based on the **number of transactions** made with the payment methods on which you have Cashback enabled.\n\n
Currently, **all participants are in the same position**. As soon as we'll receive the transactions collected so far, your ranking will be displayed.\n\n
Once published, the ranking will **continue to change** depending on the number of transactions among all participants, until the end of the 6 months."

transaction:
label:
one: "1 transaction"
Expand Down
5 changes: 5 additions & 0 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,11 @@ bonus:
other: "{{count}} transazioni valide"
ranking:
title: "La tua posizione"
notReady:
title: "Quando vedrai la classifica Super Cashback?"
body: "La classifica si basa sul **numero di transazioni** eseguite con i metodi di pagamento su cui hai attivato il Cashback.\n\n
In questo momento **tutti i partecipanti sono nella stessa posizione**. Non appena riceveremo le transazioni effettuate i primi giorni di quest’anno, verrà mostrata la tua posizione in classifica.\n\n
Una volta pubblicata, la classifica **continuerà a cambiare** a seconda del numero di transazioni di tutti i partecipanti, fino alla fine dei 6 mesi."
transaction:
label:
one: "1 transazione"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { GlobalState } from "../../../../../../../store/reducers/types";
import { BpdPeriod } from "../../../../store/actions/periods";
import { BpdPeriodWithInfo } from "../../../../store/reducers/details/periods";
import { bpdSelectedPeriodSelector } from "../../../../store/reducers/details/selectedPeriod";
import SuperCashbackRankingSummary from "./SuperCashbackRankingSummary";
import SuperCashbackRankingSummary from "./ranking/SuperCashbackRankingSummary";
import { TextualSummary } from "./textualSummary/TextualSummary";
import TransactionsGraphicalSummary from "./TransactionsGraphicalSummary";

Expand Down

This file was deleted.

Loading