Refactor most popular drink methods
Fix hardcoded happy_hour discount issue