Add bottles to sorting by unit of measurement

views/dashboardPage/bundle.js

@@ -402,8 +402,9 @@ class Merchant{
 
         for(let i = 0; i < this.ingredients.length; i++){
             let unitExists = false;
+            const innerIngredient = this.ingredients[i].ingredient;
             for(let j = 0; j < ingredientsByUnit.length; j++){
-                if(this.ingredients[i].ingredient.unit === ingredientsByUnit[j].name){
+                if(innerIngredient.unit === ingredientsByUnit[j].name || innerIngredient.specialUnit === ingredientsByUnit[j].name){
                     ingredientsByUnit[j].ingredients.push(this.ingredients[i]);
 
                     unitExists = true;
@@ -412,8 +413,15 @@ class Merchant{
             }
 
             if(!unitExists){
+                let unit = "";
+                if(innerIngredient.specialUnit === "bottle"){
+                    unit = "bottle";
+                }else{
+                    unit = innerIngredient.unit;
+                }
+
                 ingredientsByUnit.push({
-                    name: this.ingredients[i].ingredient.unit,
+                    name: unit,
                     ingredients: [this.ingredients[i]]
                 });
             }
@@ -1481,7 +1489,6 @@ let ingredientDetails = {
                 border.parentElement.removeChild(border);
             }catch(err){}
         }
-        console.log("something");
 
         document.getElementById("ingredientDetailsCategory").innerText = ingredient.ingredient.category;
 
@@ -1499,9 +1506,7 @@ let ingredientDetails = {
         let stockInput = document.getElementById("ingredientInput");
         let stockDisplay = document.getElementById("ingredientStock");
         stockInput.value = "";
-        console.log(ingredient);
         if(ingredient.ingredient.specialUnit === "bottle"){
-            console.log("bottle");
             let quantity = ingredient.ingredient.convert(ingredient.quantity);
 
             stockDisplay.innerText = `${quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
@@ -1810,7 +1815,7 @@ let ingredients = {
 
         for(let i = 0; i < categories.length; i++){
             let categoryDiv = categoryTemplate.cloneNode(true);
-            categoryDiv.children[0].children[0].innerText = categories[i].name;
+            categoryDiv.children[0].children[0].innerText = categories[i].name.toUpperCase();
             
             categoryDiv.children[0].children[1].onclick = ()=>{
                 this.toggleCategory(categoryDiv.children[1], categoryDiv.children[0].children[1]);

views/dashboardPage/js/Merchant.js

@@ -350,8 +350,9 @@ class Merchant{
 
         for(let i = 0; i < this.ingredients.length; i++){
             let unitExists = false;
+            const innerIngredient = this.ingredients[i].ingredient;
             for(let j = 0; j < ingredientsByUnit.length; j++){
-                if(this.ingredients[i].ingredient.unit === ingredientsByUnit[j].name){
+                if(innerIngredient.unit === ingredientsByUnit[j].name || innerIngredient.specialUnit === ingredientsByUnit[j].name){
                     ingredientsByUnit[j].ingredients.push(this.ingredients[i]);
 
                     unitExists = true;
@@ -360,8 +361,15 @@ class Merchant{
             }
 
             if(!unitExists){
+                let unit = "";
+                if(innerIngredient.specialUnit === "bottle"){
+                    unit = "bottle";
+                }else{
+                    unit = innerIngredient.unit;
+                }
+
                 ingredientsByUnit.push({
-                    name: this.ingredients[i].ingredient.unit,
+                    name: unit,
                     ingredients: [this.ingredients[i]]
                 });
             }

views/dashboardPage/js/ingredientDetails.js

@@ -14,7 +14,6 @@ let ingredientDetails = {
                 border.parentElement.removeChild(border);
             }catch(err){}
         }
-        console.log("something");
 
         document.getElementById("ingredientDetailsCategory").innerText = ingredient.ingredient.category;
 
@@ -32,9 +31,7 @@ let ingredientDetails = {
         let stockInput = document.getElementById("ingredientInput");
         let stockDisplay = document.getElementById("ingredientStock");
         stockInput.value = "";
-        console.log(ingredient);
         if(ingredient.ingredient.specialUnit === "bottle"){
-            console.log("bottle");
             let quantity = ingredient.ingredient.convert(ingredient.quantity);
 
             stockDisplay.innerText = `${quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;

views/dashboardPage/js/ingredients.js

@@ -33,7 +33,7 @@ let ingredients = {
 
         for(let i = 0; i < categories.length; i++){
             let categoryDiv = categoryTemplate.cloneNode(true);
-            categoryDiv.children[0].children[0].innerText = categories[i].name;
+            categoryDiv.children[0].children[0].innerText = categories[i].name.toUpperCase();
             
             categoryDiv.children[0].children[1].onclick = ()=>{
                 this.toggleCategory(categoryDiv.children[1], categoryDiv.children[0].children[1]);