Added orders enhancement for POS
Fixed merge issue