FIX: EBE-85 resolved conflict #83
Merged
dariopelliccioli merged 3 commits intodevelopfrom Aug 8, 2025
Merged
Conversation
* Refactor pagina panoramica * Cambiarto redirect * Refactor button * Ebe35 refinement and fix (#61) * Modificato box censimento punti vendita * Fix routing * Refactor struttura form
* [EBE-63]: first setup stores page * [EBE-63]: fixed filters labels * [EBE- 66] : create table ,filters and store detail components and update merchant transactions component * [EBE-63]: added dataGrid component * [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components * [EBE-63]: Updated initiative stores page and fixed routing * [EBE-63]: fixed table parameters in initiative stores page * [EBE-63]: fixed columns sorting in initiative stores page * [EBE-63]: fixed side menu and fixed pagination in initiative stores page * [EBE-63]: deleted duplicate line in sideMenu component * Refactor pagina panoramica * Cambiarto redirect * Refactor button * [EBE-63]: fixed transaction history filters layout * [EBE-63]: setted store detail page * Ebe35 refinement and fix (#61) * Modificato box censimento punti vendita * Fix routing * Refactor struttura form * [EBE-63]: modified store detail page * FEAT: finished store detail page (#63) * [EBE-63]: first setup stores page * [EBE-63]: fixed filters labels * [EBE- 66] : create table ,filters and store detail components and update merchant transactions component * [EBE-63]: added dataGrid component * [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components * [EBE-63]: Updated initiative stores page and fixed routing * [EBE-63]: fixed table parameters in initiative stores page * [EBE-63]: fixed columns sorting in initiative stores page * [EBE-63]: fixed side menu and fixed pagination in initiative stores page * [EBE-63]: deleted duplicate line in sideMenu component * [EBE-63]: fixed transaction history filters layout * [EBE-63]: setted store detail page * [EBE-63]: modified store detail page --------- Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it> Co-authored-by: Emanuele Stazzi <> * [DEV]: bug fix * [FIX]: bug fix (#64) * [EBE-63]: first setup stores page * [EBE-63]: fixed filters labels * [EBE- 66] : create table ,filters and store detail components and update merchant transactions component * [EBE-63]: added dataGrid component * [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components * [EBE-63]: Updated initiative stores page and fixed routing * [EBE-63]: fixed table parameters in initiative stores page * [EBE-63]: fixed columns sorting in initiative stores page * [EBE-63]: fixed side menu and fixed pagination in initiative stores page * [EBE-63]: deleted duplicate line in sideMenu component * [EBE-63]: fixed transaction history filters layout * [EBE-63]: setted store detail page * [EBE-63]: modified store detail page * [DEV]: bug fix --------- Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it> Co-authored-by: Emanuele Stazzi <> * [EBE-63]: fixed labels * [EBE-63]: fixed logs * [EBE-63]: fixed columns sort * [EBE-63]: fixed routing * [EBE-63]: pushed constants file * [EBE-63]: added constant * FIX: fixed store upload form (#69) * Fix button * [EBE-fix-to-release]: fixed store upload form --------- Co-authored-by: escarsel <eloisa.scarsella@nttdata.com> Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it> * fix path (#70) --------- Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it> Co-authored-by: Emanuele Stazzi <> Co-authored-by: mattialaurenzana21 <Mattia.Laurenzana@nttdata.com>
…nflicts # Conflicts: # src/components/labelValuePair/labelValuePair.tsx # src/components/pointsOfSaleForm/PointsOfSaleForm.tsx # src/locale/it.json # src/pages/initiativeDiscounts/MerchantTransactions.tsx # src/pages/initiativeStores/InitiativeStores.tsx # src/pages/initiativeStores/initiativeStoreDetail.tsx
skymoronigu
approved these changes
Aug 8, 2025
dariopelliccioli
approved these changes
Aug 8, 2025
Coverage report
Test suite run success134 tests passing in 49 suites.Report generated by 🧪jest coverage report action from a00be6a |
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description:
Resolved conflicts with uat
List of changes:
Resolved some conflicts with uat in store detail and initiative store