HOTFIX: Gift Certificate Checkout Issue

Fix for error with payment method not persisting correctly when using gift certificate on order

This was preventing users from being able to checkout in certain instances when using gift certificates.