Fixed issues in the handling of Customer Payment records when Gift Cards are used in conjunction with other payment methods (aside from credit cards).