Replace return_number by order_number