From f8da2b2a03ebca3095b070ab02dfd3a5e3d79c4c Mon Sep 17 00:00:00 2001 From: ysandler Date: Thu, 2 Feb 2017 21:23:40 -0600 Subject: [PATCH] feat: added 2/3 and 3/4 calf --- js/createDrink.js | 14 ++++++++++++++ js/customTypes.js | 4 +++- js/order.js | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/js/createDrink.js b/js/createDrink.js index 4d49d2c..0250907 100644 --- a/js/createDrink.js +++ b/js/createDrink.js @@ -60,6 +60,20 @@ function changeCaffeine(drink, caffeine){ else{ drink.caffeine = caffeineTypes.HALFCAF; } + case "TWOTHIRDSCALF": + if(drink.caffeine === caffeineTypes.TWOTHIRDSCAF){ + drink.caffeine = caffeineTypes.NORMAL; + } + else{ + drink.caffeine = caffeineTypes.TWOTHIRDSCAF; + } + case "THREEFOURTHSCAFE": + if(drink.caffeine === caffeineTypes.THREEFOURTHSCAF){ + drink.caffeine = caffeineTypes.NORMAL; + } + else{ + drink.caffeine = caffeineTypes.THREEFOURTHSCAF; + } break; } return drink; diff --git a/js/customTypes.js b/js/customTypes.js index 53893ac..3afc2f8 100644 --- a/js/customTypes.js +++ b/js/customTypes.js @@ -39,5 +39,7 @@ const drinkSizes = { const caffeineTypes = { NORMAL: 1, DECAF: 2, - HALFCAF: 3 + HALFCAF: 3, + TWOTHIRDSCAF: 4, + THREEFOURTHSCAF: 5 } \ No newline at end of file diff --git a/js/order.js b/js/order.js index 844a041..ed87deb 100644 --- a/js/order.js +++ b/js/order.js @@ -105,6 +105,12 @@ function orderDisplay(drink){ case caffeineTypes.HALFCAF: o.caffeine = "1/2 Decaf
"; break; + case caffeineTypes.TWOTHIRDSCAF: + o.caffeine = "2/3 Decaf
"; + break; + case caffeineTypes.THREEFOURTHSCAF: + o.caffeine = "3/4 Decaf
"; + break; default: o.caffeine = "" }