Merge ControllerReportCustomerOrder with opencart 1.5.5.1