updated shop and discount modules to include fixes to last set of issues