was add controllerhelper for decorate controller dashboard, refactor sales controller with decorate by time
fixed conflic
Merge branch 'decorator_controller_over_inheritance' into develop