Update merchant.ingredients to merchant.inventory on the frontend for clarity.

views/dashboardPage/js/classes/Merchant.js

@@ -57,7 +57,7 @@ class Merchant{
         ){
         this._name = name;
         this._pos = pos;
-        this._ingredients = [];
+        this._inventory = [];
         this._recipes = [];
         this._transactions = [];
         this._orders = [];
@@ -77,7 +77,7 @@ class Merchant{
                 ingredients[i].ingredient.unitType,
                 ingredients[i].defaultUnit,
                 this,
-                ingredients[i].ingredient.unitSize,
+                ingredients[i].ingredient.unitSize
             );
 
             const merchantIngredient = new MerchantIngredient(
@@ -85,7 +85,7 @@ class Merchant{
                 ingredients[i].quantity,
             );
 
-            this._ingredients.push(merchantIngredient);
+            this._inventory.push(merchantIngredient);
         }
 
         for(let i = 0; i < ingredients.length; i++){
@@ -98,10 +98,10 @@ class Merchant{
             let ingredients = [];
             for(let j = 0; j < recipes[i].ingredients.length; j++){
                 const ingredient = recipes[i].ingredients[j];
-                for(let k = 0; k < this._ingredients.length; k++){
-                    if(ingredient.ingredient === this._ingredients[k].ingredient.id){
+                for(let k = 0; k < this._inventory.length; k++){
+                    if(ingredient.ingredient === this._inventory[k].ingredient.id){
                         ingredients.push({
-                            ingredient: this._ingredients[k].ingredient.id,
+                            ingredient: this._inventory[k].ingredient.id,
                             quantity: ingredient.quantity
                         });
                         break;
@@ -149,8 +149,8 @@ class Merchant{
         return this._pos;
     }
 
-    get ingredients(){
-        return this._ingredients;
+    get inventory(){
+        return this._inventory;
     }
 
     /*
@@ -186,20 +186,20 @@ class Merchant{
             createdIngredient.replaceIngredients(ingredient.ingredients);
 
             const merchantIngredient = new MerchantIngredient(createdIngredient, quantity);
-            this._ingredients.push(merchantIngredient);
+            this._inventory.push(merchantIngredient);
         }
     }
 
     removeIngredient(ingredient){
-        const index = this._ingredients.indexOf(ingredient);
+        const index = this._inventory.indexOf(ingredient);
         if(index === undefined) return false;
 
-        this._ingredients.splice(index, 1);
+        this._inventory.splice(index, 1);
     }
 
     getIngredient(id){
-        for(let i = 0; i < this._ingredients.length; i++){
-            if(this._ingredients[i].ingredient.id === id) return this._ingredients[i];
+        for(let i = 0; i < this._inventory.length; i++){
+            if(this._inventory[i].ingredient.id === id) return this._inventory[i];
         }
     }
 
@@ -371,9 +371,9 @@ class Merchant{
         this._orders.splice(index, 1);
 
         for(let i = 0; i < order.ingredients.length; i++){
-            for(let j = 0; j < this._ingredients.length; j++){
-                if(order.ingredients[i].ingredient === this._ingredients[j].ingredient){
-                    this._ingredients[j].updateQuantity(-order.ingredients[i].quantity);
+            for(let j = 0; j < this._inventory.length; j++){
+                if(order.ingredients[i].ingredient === this._inventory[j].ingredient){
+                    this._inventory[j].updateQuantity(-order.ingredients[i].quantity);
                     break;
                 }
             }
@@ -531,11 +531,11 @@ class Merchant{
     categorizeIngredients(){
         let ingredientsByCategory = [];
 
-        for(let i = 0; i < this.ingredients.length; i++){
+        for(let i = 0; i < this._inventory.length; i++){
             let categoryExists = false;
             for(let j = 0; j < ingredientsByCategory.length; j++){
-                if(this.ingredients[i].ingredient.category === ingredientsByCategory[j].name){
-                    ingredientsByCategory[j].ingredients.push(this.ingredients[i]);
+                if(this._inventory[i].ingredient.category === ingredientsByCategory[j].name){
+                    ingredientsByCategory[j].ingredients.push(this._inventory[i]);
 
                     categoryExists = true;
                     break;
@@ -544,8 +544,8 @@ class Merchant{
 
             if(!categoryExists){
                 ingredientsByCategory.push({
-                    name: this.ingredients[i].ingredient.category,
-                    ingredients: [this.ingredients[i]]
+                    name: this._inventory[i].ingredient.category,
+                    ingredients: [this._inventory[i]]
                 });
             }
         }

views/dashboardPage/js/modal.js

@@ -197,15 +197,15 @@ let modal = {
             left.appendChild(button);
         }
 
-        for(let i = 0; i < merchant.ingredients.length; i++){
+        for(let i = 0; i < merchant.inventory.length; i++){
             let skip = false;
             for(let j = 0; j < ingredient.subIngredients.length; j++){
-                if(merchant.ingredients[i].ingredient === ingredient.subIngredients[j].ingredient){
+                if(merchant.inventory[i].ingredient === ingredient.subIngredients[j].ingredient){
                     let div = template.cloneNode(true);
-                    div.children[0].innerText = merchant.ingredients[i].ingredient.name;
+                    div.children[0].innerText = merchant.inventory[i].ingredient.name;
                     div.children[1].children[0].value = ingredient.subIngredients[j].quantity;
                     div.children[1].children[1].onclick = ()=>{removeIngredient(div, ingredient.subIngredients[j].ingredient)};
-                    div.ingredient = merchant.ingredients[i].ingredient;
+                    div.ingredient = merchant.inventory[i].ingredient;
                     right.appendChild(div);
                     skip = true;
                     break;
@@ -214,9 +214,9 @@ let modal = {
             if(skip === true) continue;
 
             let button = document.createElement("button");
-            button.innerText = merchant.ingredients[i].ingredient.name;
+            button.innerText = merchant.inventory[i].ingredient.name;
             button.classList.add("choosable");
-            button.onclick = ()=>{addIngredient(button, merchant.ingredients[i].ingredient)};
+            button.onclick = ()=>{addIngredient(button, merchant.inventory[i].ingredient)};
             left.appendChild(button);
         }
 

views/dashboardPage/js/sidebars/newOrder.js

@@ -14,12 +14,12 @@ let newOrder = {
             ingredientList.removeChild(ingredientList.firstChild);
         }
 
-        merchant.ingredients.sort((a, b) => (a.ingredient.name > b.ingredient.name) ? 1 : -1);
-        for(let i = 0; i < merchant.ingredients.length; i++){
+        merchant.inventory.sort((a, b) => (a.ingredient.name > b.ingredient.name) ? 1 : -1);
+        for(let i = 0; i < merchant.inventory.length; i++){
             let ingredient = document.createElement("button");
             ingredient.classList = "choosable";
-            ingredient.innerText = merchant.ingredients[i].ingredient.name;
-            ingredient.onclick = ()=>{this.addIngredient(merchant.ingredients[i], ingredient)};
+            ingredient.innerText = merchant.inventory[i].ingredient.name;
+            ingredient.onclick = ()=>{this.addIngredient(merchant.inventory[i], ingredient)};
             ingredientList.appendChild(ingredient);
         }
 

views/dashboardPage/js/sidebars/newRecipe.js

@@ -9,8 +9,8 @@ let newRecipe = {
         document.getElementById("newRecipeSearch").onkeyup = ()=>{this.populateChoices()};
 
         this.unchosen = [];
-        for(let i = 0; i < merchant.ingredients.length; i++){
-            this.unchosen.push(merchant.ingredients[i].ingredient);
+        for(let i = 0; i < merchant.inventory.length; i++){
+            this.unchosen.push(merchant.inventory[i].ingredient);
         }
 
         this.populateChoices();

views/dashboardPage/js/sidebars/orderFilter.js

@@ -13,15 +13,15 @@ let orderFilter = {
             ingredientList.removeChild(ingredientList.firstChild);
         }
 
-        for(let i = 0; i < merchant.ingredients.length; i++){
+        for(let i = 0; i < merchant.inventory.length; i++){
             let element = document.createElement("div");
             element.classList.add("choosable");
-            element.ingredient = merchant.ingredients[i].ingredient.id;
+            element.ingredient = merchant.inventory[i].ingredient.id;
             element.onclick = ()=>{this.toggleActive(element)};
             ingredientList.appendChild(element);
 
             let text = document.createElement("p");
-            text.innerText = merchant.ingredients[i].ingredient.name;
+            text.innerText = merchant.inventory[i].ingredient.name;
             element.appendChild(text);
         }
 

views/dashboardPage/js/strands/analytics.js

@@ -22,8 +22,8 @@ let analytics = {
 
             this.populateButtons();
 
-            if(merchant.ingredients.length > 0){
-                this.ingredient = merchant.ingredients[0].ingredient;
+            if(merchant.inventory.length > 0){
+                this.ingredient = merchant.inventory[0].ingredient;
             }
             if(merchant.recipes.length > 0){
                 this.recipe = merchant.recipes[0];
@@ -43,12 +43,12 @@ let analytics = {
             ingredientButtons.removeChild(ingredientButtons.firstChild);
         }
 
-        for(let i = 0; i < merchant.ingredients.length; i++){
+        for(let i = 0; i < merchant.inventory.length; i++){
             let button = document.createElement("button");
-            button.innerText = merchant.ingredients[i].ingredient.name;
+            button.innerText = merchant.inventory[i].ingredient.name;
             button.classList.add("choosable");
             button.onclick = ()=>{
-                this.ingredient = merchant.ingredients[i].ingredient;
+                this.ingredient = merchant.inventory[i].ingredient;
                 this.displayIngredient();
             };
             ingredientButtons.appendChild(button);

views/dashboardPage/js/strands/home.js

@@ -91,14 +91,14 @@ let home = {
 
     drawInventoryCheckCard: function(){
         let num;
-        if(merchant.ingredients.length < 5){
-            num = merchant.ingredients.length;
+        if(merchant.inventory.length < 5){
+            num = merchant.inventory.length;
         }else{
             num = 5;
         }
         let rands = [];
         for(let i = 0; i < num; i++){
-            let rand = Math.floor(Math.random() * merchant.ingredients.length);
+            let rand = Math.floor(Math.random() * merchant.inventory.length);
 
             if(rands.includes(rand)){
                 i--;
@@ -115,7 +115,7 @@ let home = {
         for(let i = 0; i < rands.length; i++){
             let ingredientCheck = template.cloneNode(true);
             let input = ingredientCheck.children[1].children[1];
-            const ingredient = merchant.ingredients[rands[i]];
+            const ingredient = merchant.inventory[rands[i]];
 
             ingredientCheck.ingredient = ingredient;
             ingredientCheck.children[0].innerText = ingredient.ingredient.name;