added is_gift indicator, fixed gift quantity bug