delivery macanhhuy

For future payments, this data should come from the PaymentAuthorization model rather than from the payment (because it is not there), i.e. if it is not in the payment, then try PaymentAuthorization.