Improvements to gift order delivery

Fixed some issues where a gift order (where the recipient of the digital download is not the person paying) was not working as expected when the merchant's account had been suspended.

A small fix but a nice improvement!