Add payment_method_id validation back