change CurrentOrder to ControllerHelpers::Order