fixes for address and other gift aid information not saved

This MR changes the logic for matching eligible for gift aid custom field. So now rather than matching string we are checking id.

Matching string was resulting in odd behavior as it was considering custom_1 = custom_123 etc.