fix order_number and also return avs code