Expired? check for a gift card

Fixing logic and abstract out