Merge catalog\controller\affiliate with opencart 1.5.5.1