Improved checkout validation for giftshop