From 0d73f61fdb2b78a5000e81b3211f93654920b52a Mon Sep 17 00:00:00 2001
From: ysandler <ysandler@tzed.io>
Date: Sat, 4 Mar 2017 20:03:18 -0600
Subject: [PATCH] refact: changed numerical values of milks to names

---
 index.html        | 32 ++++++++++++++++----------------
 js/app.js         |  3 +++
 js/createDrink.js |  5 +++++
 js/order.js       | 10 ++++++++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/index.html b/index.html
index df087e1..ad0d811 100644
--- a/index.html
+++ b/index.html
@@ -295,29 +295,29 @@
 
                     <div id="milk-menu" class="drink-menu five-buttons" style="display: none;">
                         <h5>Milks</h5>
-                        <button class="button-brown" data-name="MILK" data-value="2">NONFAT</button>
-                        <button class="button-brown" data-name="MILK" data-value="7">1% MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Nonfat">NONFAT</button>
+                        <button class="button-brown" data-name="MILK" data-value="1% Milk">1% MILK</button>
                         <button class="empty-button" data-name="" data-value="">.</button>
-                        <button class="button-brown" data-name="MILK" data-value="2">WITH NONFAT</button>
-                        <button class="button-brown" data-name="MILK" data-value="7">WITH 1% MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Nonfat">WITH NONFAT</button>
+                        <button class="button-brown" data-name="MILK" data-value="with 1% Milk">WITH 1% MILK</button>
                         
-                        <button class="button-brown" data-name="MILK" data-value="1">2% MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="3">WHOLE MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="2% Milk">2% MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Whole Milk">WHOLE MILK</button>
                         <button class="empty-button" data-name="" data-value="">.</button>
-                        <button class="button-brown" data-name="MILK" data-value="2">WITH 2% MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="3">WITH WHOLE MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with 2% Milk">WITH 2% MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Whole Milk">WITH WHOLE MILK</button>
                         
-                        <button class="button-brown" data-name="MILK" data-value="5">SOY MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="10">LACTAID MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Soy Milk">SOY MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Lactaid Milk">LACTAID MILK</button>
                         <button class="empty-button" data-name="" data-value="">.</button>
-                        <button class="button-brown" data-name="MILK" data-value="5">WITH SOY MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="10">WITH LACTAID MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Soy Milk">WITH SOY MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Lactaid Milk">WITH LACTAID MILK</button>
                         
-                        <button class="button-brown" data-name="MILK" data-value="4">COCONUT MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="6">ALMOUNDMILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Coconut Milk">COCONUT MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="Almoundmilk">ALMOUNDMILK</button>
                         <button class="empty-button" data-name="" data-value="">.</button>
-                        <button class="button-brown" data-name="MILK" data-value="4">WITH COCONUT MILK</button>
-                        <button class="button-brown" data-name="MILK" data-value="6">WITH ALMOUNDMILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Coconut Milk">WITH COCONUT MILK</button>
+                        <button class="button-brown" data-name="MILK" data-value="with Almoundmilk">WITH ALMOUNDMILK</button>
                         
                         <button class="button-brown" data-name="MILK" data-value="8">BREVE</button>
                         <button class="button-brown" data-name="MILK" data-value="9">HEAVY CREAM</button>
diff --git a/js/app.js b/js/app.js
index a73d641..e0b0712 100644
--- a/js/app.js
+++ b/js/app.js
@@ -38,6 +38,9 @@ document.addEventListener('DOMContentLoaded', function(){
                     case "SYRUP":
                         Object.assign(currentDrink.recipe, addSyrup(currentDrink.recipe, dataValue, currentDrink.size));
                         break;
+                    case "MILK":
+                        currentDrink = changeMilk(currentDrink,dataValue);
+                        break;
                     case "OTHER":
                         Object.assign(currentDrink.recipe, addOther(currentDrink.recipe, dataValue, currentDrink.size));
                         break;
diff --git a/js/createDrink.js b/js/createDrink.js
index ec8d96b..fe6424d 100644
--- a/js/createDrink.js
+++ b/js/createDrink.js
@@ -37,6 +37,11 @@ function changeSize(drink, size) {
     return drink;
 }
 
+function changeMilk(drink, milk){
+    drink.recipe.milk = milk;
+    return drink;
+}
+
 function changeIced(drink){
     if(drink.iced === undefined)
         drink.iced = true;
diff --git a/js/order.js b/js/order.js
index 83565bb..cfd7f66 100644
--- a/js/order.js
+++ b/js/order.js
@@ -34,6 +34,7 @@ function orderDisplay(drink){
     let o = {
         name: "default Drink <br>",
         iced: "",
+        milk: "",
         syrups: "",
         other: "",
         size: "",
@@ -100,6 +101,14 @@ function orderDisplay(drink){
         o.iced = ""
     }
 
+
+    if(drink.recipe.milk){
+        o.milk = drink.recipe.milk + "<br>";
+    }
+    else{
+        o.milk = "";
+    }
+
     
     switch(drink.caffeine){
         case "Decaf":
@@ -135,6 +144,7 @@ function orderDisplay(drink){
             o.name + 
             o.shotDeclaration + 
             o.caffeine + 
+            o.milk +
             o.syrups + 
             o.other;
 }