Rohan dev

Order Module Fixes and Charge app setting