Order module with app setting

Order Module Fixes and Charge app setting