module shops: optimize code for NukeViet 3.5
Merge branch 'develop' of git@github.com:nukeviet/shops.git into develop