UPS-982 optimisation my promotions and my advantages
UPS-982 fixing paging ajax bug
fix errors when testing UPS-989
Merge branch 'develop' into feature/UPS-982