Browse Source

Update all frontend merchant calls. Have not yet checked for bugs.

Lee Morgan 5 years ago
parent
commit
eb0e0d7267

+ 1 - 3208
views/dashboardPage/bundle.js

@@ -1,3208 +1 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-class Ingredient{
-    constructor(id, name, category, unitType, unit, parent, specialUnit = undefined, unitSize = undefined){
-        this.id = id;
-        this.name = name;
-        this.category = category;
-        this.unitType = unitType;
-        this.unit = unit;
-        this.parent = parent;
-        if(specialUnit){
-            this.specialUnit = specialUnit;
-            this.unitSize = unitSize;
-        }
-        
-    }
-
-    convert(quantity){
-        if(this.unitType === "mass"){
-            switch(this.unit){
-                case "g": break;
-                case "kg": quantity /= 1000; break;
-                case "oz":  quantity /= 28.3495; break;
-                case "lb":  quantity /= 453.5924; break;
-            }
-        }else if(this.unitType === "volume"){
-            switch(this.unit){
-                case "ml": quantity *= 1000; break;
-                case "l": break;
-                case "tsp": quantity *= 202.8842; break;
-                case "tbsp": quantity *= 67.6278; break;
-                case "ozfl": quantity *= 33.8141; break;
-                case "cup": quantity *= 4.1667; break;
-                case "pt": quantity *= 2.1134; break;
-                case "qt": quantity *= 1.0567; break;
-                case "gal": quantity /= 3.7854; break;
-            }
-        }else if(this.unitType === "length"){
-            switch(this.unit){
-                case "mm": quantity *= 1000; break;
-                case "cm": quantity *= 100; break;
-                case "m": break;
-                case "in": quantity *= 39.3701; break;
-                case "ft": quantity *= 3.2808; break;
-            }
-        }
-
-        return quantity;
-    }
-}
-
-module.exports = Ingredient;
-},{}],2:[function(require,module,exports){
-class Merchant{
-    constructor(oldMerchant, transactions, modules){
-        this._modules = modules;
-        this._name = oldMerchant.name;
-        this._pos = oldMerchant.pos;
-        this._ingredients = [];
-        this._recipes = [];
-        this._transactions = [];
-        this._orders = [];
-        this._units = {
-            mass: ["g", "kg", "oz", "lb"],
-            volume: ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"],
-            length: ["mm", "cm", "m", "in", "ft"],
-            other: ["each", "bottle"]
-        }
-        
-        for(let i = 0; i < oldMerchant.inventory.length; i++){
-            this.ingredients.push({
-                ingredient: new modules.Ingredient(
-                    oldMerchant.inventory[i].ingredient._id,
-                    oldMerchant.inventory[i].ingredient.name,
-                    oldMerchant.inventory[i].ingredient.category,
-                    oldMerchant.inventory[i].ingredient.unitType,
-                    oldMerchant.inventory[i].defaultUnit,
-                    this,
-                    oldMerchant.inventory[i].ingredient.specialUnit,
-                    oldMerchant.inventory[i].ingredient.unitSize
-                ),
-                quantity: oldMerchant.inventory[i].quantity
-            });
-        }
-
-        for(let i = 0; i < oldMerchant.recipes.length; i++){
-            this.recipes.push(new modules.Recipe(
-                oldMerchant.recipes[i]._id,
-                oldMerchant.recipes[i].name,
-                oldMerchant.recipes[i].price,
-                oldMerchant.recipes[i].ingredients,
-                this
-            ));
-        }
-
-        for(let i = 0; i < transactions.length; i++){
-            this.transactions.push(new modules.Transaction(
-                transactions[i]._id,
-                transactions[i].date,
-                transactions[i].recipes,
-                this
-            ));
-        }
-    }
-
-    get name(){
-        return this._name;
-    }
-
-    set name(name){
-        if(sanitaryString(name)){
-            this._name = name;
-        }
-        return false;
-    }
-
-    get pos(){
-        return this._pos;
-    }
-
-    get ingredients(){
-        return this._ingredients;
-    }
-
-    addIngredient(ingredient){
-        if(ingredient.quantity <  0 || ingredient.quantity === undefined){
-            return false;
-        }
-
-        this.ingredients.push(ingredient);
-
-        this._modules.home.isPopulated = false;
-        this._modules.ingredients.isPopulated = false;
-    }
-
-    removeIngredient(ingredient){
-        const index = this._ingredients.indexOf(ingredient);
-        if(index === undefined){
-            return false;
-        }
-
-        this._ingredients.splice(index, 1);
-
-        this._modules.home.isPopulated = false;
-        this._modules.ingredients.isPopulated = false;
-    }
-
-    get recipes(){
-        return this._recipes;
-    }
-
-    addRecipe(recipe){
-        this._recipes.push(recipe);
-
-        this._modules.transactions.isPopulated = false;
-        this._modules.recipeBook.isPopulated = false;
-    }
-
-    removeRecipe(recipe){
-        const index = this._recipes.indexOf(recipe);
-        if(index === undefined){
-            return false;
-        }
-
-        this._recipes.splice(index, 1);
-
-        this._modules.transactions.isPopulated = false;
-        this._modules.recipeBook.isPopulated = false;
-    }
-
-    get transactions(){
-        return this._transactions;
-    }
-
-    addTransaction(transaction){
-        this._transactions.push(transaction);
-
-        this._modules.home.isPopulated = false;
-        this._modules.ingredients.isPopulated = false;
-        this._modules.transactions.isPopulated = false;
-        this._modules.analytics.newData = true;
-    }
-
-    removeTransaction(transaction){
-        const index = this._transactions.indexOf(transaction);
-        if(index === undefined){
-            return false;
-        }
-
-        this._transactions.splice(index, 1);
-
-        this._modules.home.isPopulated = false;
-        this._modules.ingredients.isPopulated = false;
-        this._modules.transactions.isPopulated = false;
-        this._modules.analytics.newData = true;
-    }
-
-    get orders(){
-        return this._orders;
-    }
-
-    addOrder(order){
-        this._orders.push(order);
-
-        this._modules.orders.isPopulated = false;
-    }
-
-    removeOrder(order){
-        const index = this._orders.indexOf(order);
-        if(index === undefined){
-            return false;
-        }
-
-        this._orders.splice(index, 1);
-
-        this._modules.orders.isPopulated = false;
-    }
-
-    get units(){
-        return this._units;
-    }
-
-    revenue(indices){
-        let total = 0;
-
-        for(let i = indices[0]; i <= indices[1]; i++){
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                for(let k = 0; k < this.recipes.length; k++){
-                    if(this.transactions[i].recipes[j].recipe === this.recipes[k]){
-                        total += this.transactions[i].recipes[j].quantity * this.recipes[k].price;
-                    }
-                }
-            }
-        }
-
-        return total / 100;
-    }
-
-    /*
-    Gets the quantity of each ingredient sold between two dates (dateRange)
-    Inputs
-    dateRange: list containing a start date and an end date
-    Return:
-        [{
-            ingredient: Ingredient object,
-            quantity: quantity of ingredient sold
-        }]
-    */
-    ingredientsSold(dateRange){
-        if(!dateRange){
-            return false;
-        }
-        
-        let recipes = this.recipesSold(dateRange);
-        let ingredientList = [];
-
-        for(let i = 0; i < recipes.length; i++){
-            for(let j = 0; j < recipes[i].recipe.ingredients.length; j++){
-                let exists = false;
-
-                for(let k = 0; k < ingredientList.length; k++){
-                    if(ingredientList[k].ingredient === recipes[i].recipe.ingredients[j].ingredient){
-                        exists = true;
-                        ingredientList[k].quantity += recipes[i].quantity * recipes[i].recipe.ingredients[j].quantity;
-                        break;
-                    }
-                }
-
-                if(!exists){
-                    ingredientList.push({
-                        ingredient: recipes[i].recipe.ingredients[j].ingredient,
-                        quantity: recipes[i].quantity * recipes[i].recipe.ingredients[j].quantity
-                    });
-                }
-            }
-        }
-    
-        return ingredientList;
-    }
-
-    singleIngredientSold(dateRange, ingredient){
-        let total = 0;
-
-        for(let i = dateRange[0]; i < dateRange[1]; i++){
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                for(let k = 0; k < this.transactions[i].recipes[j].recipe.ingredients.length; k++){
-                    if(this.transactions[i].recipes[j].recipe.ingredients[k].ingredient === ingredient.ingredient){
-                        total += this.transactions[i].recipes[j].recipe.ingredients[k].quantity;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return total;
-    }
-
-    /*
-    Gets the number of recipes sold between two dates (dateRange)
-    Inputs:
-        dateRange: array containing a start date and an end date
-    Return:
-        [{
-            recipe: a recipe object
-            quantity: quantity of the recipe sold
-        }]
-    */
-    recipesSold(dateRange){
-        let recipeList = [];
-
-        for(let i = dateRange[0]; i <= dateRange[1]; i++){
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                let exists = false;
-                for(let k = 0; k < recipeList.length; k++){
-                    if(recipeList[k].recipe === this.transactions[i].recipes[j].recipe){
-                        exists = true;
-                        recipeList[k].quantity += this.transactions[i].recipes[j].quantity;
-                        break;
-                    }
-                }
-
-                if(!exists){
-                    recipeList.push({
-                        recipe: this.transactions[i].recipes[j].recipe,
-                        quantity: this.transactions[i].recipes[j].quantity
-                    });
-                }
-            }
-        }
-
-        return recipeList;
-    }
-    
-    /*
-    Groups all of the merchant's ingredients by their category
-    Return: [{
-        name: category name,
-        ingredients: [Ingredient Object]
-    }]
-    */
-    categorizeIngredients(){
-        let ingredientsByCategory = [];
-
-        for(let i = 0; i < this.ingredients.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]);
-
-                    categoryExists = true;
-                    break;
-                }
-            }
-
-            if(!categoryExists){
-                ingredientsByCategory.push({
-                    name: this.ingredients[i].ingredient.category,
-                    ingredients: [this.ingredients[i]]
-                });
-            }
-        }
-
-        return ingredientsByCategory;
-    }
-
-    unitizeIngredients(){
-        let ingredientsByUnit = [];
-
-        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(innerIngredient.unit === ingredientsByUnit[j].name || innerIngredient.specialUnit === ingredientsByUnit[j].name){
-                    ingredientsByUnit[j].ingredients.push(this.ingredients[i]);
-
-                    unitExists = true;
-                    break;
-                }
-            }
-
-            if(!unitExists){
-                let unit = "";
-                if(innerIngredient.specialUnit === "bottle"){
-                    unit = "bottle";
-                }else{
-                    unit = innerIngredient.unit;
-                }
-
-                ingredientsByUnit.push({
-                    name: unit,
-                    ingredients: [this.ingredients[i]]
-                });
-            }
-        }
-
-        return ingredientsByUnit;
-    }
-
-    getRecipesForIngredient(ingredient){
-        let recipes = [];
-
-        for(let i = 0; i < this.recipes.length; i++){
-            for(let j = 0; j < this.recipes[i].ingredients.length; j++){
-                if(this.recipes[i].ingredients[j].ingredient === ingredient){
-                    recipes.push(this.recipes[i]);
-                }
-            }
-        }
-
-        return recipes;
-    }
-}
-
-module.exports = Merchant;
-},{}],3:[function(require,module,exports){
-class Order{
-    constructor(id, name, date, taxes, fees, ingredients, parent){
-        this.id = id;
-        this.name = name;
-        this.date = new Date(date);
-        this.taxes = taxes;
-        this.fees = fees;
-        this.ingredients = [];
-        this.parent = parent;
-
-        for(let i = 0; i < ingredients.length; i++){
-            for(let j = 0; j < parent.ingredients.length; j++){
-                if(ingredients[i].ingredient === parent.ingredients[j].ingredient.id){
-                    this.ingredients.push({
-                        ingredient: parent.ingredients[j].ingredient,
-                        quantity: ingredients[i].quantity,
-                        pricePerUnit: ingredients[i].pricePerUnit
-                    });
-
-                    break;
-                }
-            }
-        }
-    }
-}
-
-module.exports = Order;
-},{}],4:[function(require,module,exports){
-class Recipe{
-    constructor(id, name, price, ingredients, parent){
-        this.id = id;
-        this.name = name;
-        this.price = price;
-        this.parent = parent;
-        this.ingredients = [];
-
-        for(let i = 0; i < ingredients.length; i++){
-            for(let j = 0; j < parent.ingredients.length; j++){
-                if(ingredients[i].ingredient === parent.ingredients[j].ingredient.id){
-                    this.ingredients.push({
-                        ingredient: parent.ingredients[j].ingredient,
-                        quantity: ingredients[i].quantity
-                    });
-                    break;
-                }
-            }
-        }
-    }
-}
-
-module.exports = Recipe;
-},{}],5:[function(require,module,exports){
-class Transaction{
-    constructor(id, date, recipes, parent){
-        this.id = id;
-        this.parent = parent;
-        this.date = new Date(date);
-        this.recipes = [];
-
-        for(let i = 0; i < recipes.length; i++){
-            for(let j = 0; j < parent.recipes.length; j++){
-                if(recipes[i].recipe === parent.recipes[j].id){
-                    this.recipes.push({
-                        recipe: parent.recipes[j],
-                        quantity: recipes[i].quantity
-                    });
-                    break;
-                }
-            }
-        }
-    }
-}
-
-module.exports = Transaction;
-},{}],6:[function(require,module,exports){
-let analytics = {
-    newData: false,
-    dateChange: false,
-    transactions: [],
-    ingredient: {},
-    recipe: {},
-
-    display: function(Transaction){
-        document.getElementById("analDateBtn").onclick = ()=>{this.changeDates(Transaction)};
-
-        if(this.transactions.length === 0 || this.newData === true){
-            let startDate = new Date();
-            startDate.setMonth(startDate.getMonth() - 1);
-            const dateIndices = controller.transactionIndices(merchant.transactions, startDate);
-
-            this.transactions = merchant.transactions.slice(dateIndices[0], dateIndices[1] + 1);
-        }
-
-        let slider = document.getElementById("analSlider");
-        slider.onchange = ()=>{this.display(Transaction)};
-
-        let ingredientContent = document.getElementById("analIngredientContent");
-        let recipeContent = document.getElementById("analRecipeContent");
-
-        if(slider.checked){
-            ingredientContent.style.display = "none";
-            recipeContent.style.display = "flex";
-            this.displayRecipes();
-        }else{
-            ingredientContent.style.display = "flex";
-            recipeContent.style.display = "none"
-            this.displayIngredients();
-        }
-    },
-
-    displayIngredients: function(){
-        const itemsList = document.getElementById("itemsList");
-
-        while(itemsList.children.length > 0){
-            itemsList.removeChild(itemsList.firstChild);
-        }
-
-        for(let i = 0; i < merchant.ingredients.length; i++){
-            let li = document.createElement("li");
-            li.classList.add("itemButton");
-            li.item = merchant.ingredients[i];
-            li.innerText = merchant.ingredients[i].ingredient.name;
-            li.onclick = ()=>{
-                const itemsList = document.getElementById("itemsList");
-                for(let i = 0; i < itemsList.children.length; i++){
-                    itemsList.children[i].classList.remove("analItemActive");
-                }
-
-                li.classList.add("analItemActive");
-
-                this.ingredient = merchant.ingredients[i];
-                this.ingredientDisplay();
-            };
-            itemsList.appendChild(li);
-        }
-
-        if(this.dateChange && Object.keys(this.ingredient).length !== 0){
-            this.ingredientDisplay();
-        }
-        this.dateChange = false;
-    },
-
-    displayRecipes: function(){
-        let recipeList = document.getElementById("analRecipeList");
-        while(recipeList.children.length > 0){
-            recipeList.removeChild(recipeList.firstChild);
-        }
-
-        for(let i = 0; i < merchant.recipes.length; i++){
-            let li = document.createElement("li");
-            li.classList.add("itemButton");
-            li.recipe = merchant.recipes[i];
-            li.innerText = merchant.recipes[i].name;
-            li.onclick = ()=>{
-                let recipeList = document.getElementById("analRecipeList");
-                for(let i = 0; i < recipeList.children.length; i++){
-                    recipeList.children[i].classList.remove("analItemActive");
-                }
-                li.classList.add("analItemActive");
-
-                this.recipe = merchant.recipes[i];
-                this.recipeDisplay();
-            }
-
-            recipeList.appendChild(li);
-        }
-
-        if(this.dateChange  && Object.keys(this.recipe).length !== 0){
-            this.recipeDisplay();
-        }
-        this.dateChange = false;
-    },
-
-    ingredientDisplay: function(){
-        //Get list of recipes that contain the ingredient
-        let containingRecipes = [];
-
-        for(let i = 0; i < merchant.recipes.length; i++){
-            for(let j = 0; j < merchant.recipes[i].ingredients.length; j++){
-                if(merchant.recipes[i].ingredients[j].ingredient === this.ingredient.ingredient){
-                    containingRecipes.push({
-                        recipe: merchant.recipes[i],
-                        quantity: merchant.recipes[i].ingredients[j].quantity
-                    });
-
-                    break;
-                }
-            }
-        }
-
-        //Create Graph
-        let quantities = [];
-        let dates = [];
-        let currentDate = this.transactions[0].date;
-        let currentQuantity = 0;
-
-        for(let i = 0; i < this.transactions.length; i++){
-            if(currentDate.getDate() !== this.transactions[i].date.getDate()){
-                quantities.push(this.ingredient.ingredient.convert(currentQuantity));
-                dates.push(currentDate);
-                currentQuantity = 0;
-                currentDate = this.transactions[i].date;
-            }
-
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                for(let k = 0; k < containingRecipes.length; k++){
-                    if(this.transactions[i].recipes[j].recipe === containingRecipes[k].recipe){
-                        for(let l = 0; l < this.transactions[i].recipes[j].recipe.ingredients.length; l++){
-                            const transIngredient = this.transactions[i].recipes[j].recipe.ingredients[l];
-
-                            if(transIngredient.ingredient === this.ingredient.ingredient){
-                                currentQuantity += transIngredient.quantity * this.transactions[i].recipes[j].quantity;
-
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if(i === this.transactions.length - 1){
-                quantities.push(this.ingredient.ingredient.convert(currentQuantity));
-                dates.push(currentDate);
-            }
-        }
-
-        let trace = {
-            x: dates,
-            y: quantities,
-            mode: "lines+markers",
-            line: {
-                color: "rgb(255, 99, 107)"
-            }
-        }
-
-        const layout = {
-            title: this.ingredient.ingredient.name.toUpperCase(),
-            xaxis: {
-                title: "DATE"
-            },
-            yaxis: {
-                title: `QUANTITY (${this.ingredient.ingredient.unit.toUpperCase()})`,
-            }
-        }
-
-        Plotly.newPlot("itemUseGraph", [trace], layout);
-
-        //Create use cards
-        let sum = 0;
-        let max = 0;
-        let min = quantities[0];
-        for(let i = 0; i < quantities.length; i++){
-            sum += quantities[i];
-            if(quantities[i] > max){
-                max = quantities[i];
-            }else if(quantities[i] < min){
-                min = quantities[i];
-            }
-        }
-        document.getElementById("analMinUse").innerText = `${min.toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analAvgUse").innerText = `${(sum / quantities.length).toFixed(2)} ${this.ingredient.ingredient.unit}`;        
-        document.getElementById("analMaxUse").innerText = `${max.toFixed(2)} ${this.ingredient.ingredient.unit}`;
-
-        let dayUse = [0, 0, 0, 0, 0, 0, 0];
-        let dayCount = [0, 0, 0, 0, 0, 0, 0];
-        for(let i = 0; i < quantities.length; i++){
-            dayUse[dates[i].getDay()] += quantities[i];
-            dayCount[dates[i].getDay()]++;
-        }
-
-        document.getElementById("analDayOne").innerText = `${(dayUse[0] / dayCount[0]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDayTwo").innerText = `${(dayUse[1] / dayCount[1]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDayThree").innerText = `${(dayUse[2] / dayCount[2]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDayFour").innerText = `${(dayUse[3] / dayCount[3]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDayFive").innerText = `${(dayUse[4] / dayCount[4]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDaySix").innerText = `${(dayUse[5] / dayCount[5]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-        document.getElementById("analDaySeven").innerText = `${(dayUse[6] / dayCount[6]).toFixed(2)} ${this.ingredient.ingredient.unit}`;
-    },
-
-    recipeDisplay: function(){
-        let quantities = [];
-        let dates = [];
-        let currentDate = this.transactions[0].date;
-        let quantity = 0;
-
-        for(let i = 0; i < this.transactions.length; i++){
-            if(currentDate.getDate() !== this.transactions[i].date.getDate()){
-                quantities.push(quantity);
-                quantity = 0;
-                dates.push(currentDate);
-                currentDate = this.transactions[i].date;
-            }
-
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                const recipe = this.transactions[i].recipes[j];
-
-                if(recipe.recipe === this.recipe){
-                    quantity += recipe.quantity;
-                }
-            }
-
-            if(i === this.transactions.length - 1){
-                quantities.push(quantity);
-                dates.push(currentDate);
-            }
-        }
-
-        const trace = {
-            x: dates,
-            y: quantities,
-            mode: "lines+markers",
-            line: {
-                color: "rgb(255, 99, 107"
-            }
-        }
-
-        const layout = {
-            title: this.recipe.name.toUpperCase(),
-            xaxis: {
-                title: "DATE"
-            },
-            yaxis: {
-                title: "Quantity"
-            }
-        }
-
-        Plotly.newPlot("recipeSalesGraph", [trace], layout);
-
-        let sum = 0;
-        for(let i = 0; i < quantities.length; i++){
-            sum += quantities[i];
-        }
-
-        document.getElementById("recipeAvgUse").innerText = (sum / quantities.length).toFixed(2);
-        document.getElementById("recipeAvgRevenue").innerText = `$${(((sum / quantities.length) * this.recipe.price) / 100).toFixed(2)}`;
-    },
-
-    changeDates: function(Transaction){
-        let dates = {
-            from: document.getElementById("analStartDate").valueAsDate,
-            to: document.getElementById("analEndDate").valueAsDate
-        }
-
-        if(dates.from > dates.to || dates.from === "" || dates.to === "" || dates.to > new Date()){
-            banner.createError("INVALID DATE");
-            return;
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/transaction/retrieve", {
-            method: "post",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(dates)
-        })
-            .then((response)=>response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response.data);
-                }else{
-                    this.transactions = [];
-
-                    for(let i = 0; i < response.length; i++){
-                        this.transactions.push(new Transaction(
-                            response[i]._id,
-                            new Date(response[i].date),
-                            response[i].recipes,
-                            merchant
-                        ));
-                    }
-
-                    let isRecipe = document.getElementById("analSlider").checked;
-                    if(isRecipe && Object.keys(this.recipe).length !== 0){
-                        this.recipeDisplay();
-                    }else if(!isRecipe && Object.keys(this.ingredient).length !== 0){
-                        this.ingredientDisplay();
-                    }
-                    
-                    this.dateChange = true;
-                }
-            })
-            .catch((err)=>{
-                banner.createError("ERROR: UNABLE TO DISPLAY THE DATA");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = analytics;
-},{}],7:[function(require,module,exports){
-const home = require("./home.js");
-const ingredients = require("./ingredients.js");
-const recipeBook = require("./recipeBook.js");
-const analytics = require("./analytics.js");
-const orders = require("./orders.js");
-const transactions = require("./transactions.js");
-
-const ingredientDetails = require("./ingredientDetails.js");
-const newIngredient = require("./newIngredient.js");
-const newOrder = require("./newOrder.js");
-const newRecipe = require("./newRecipe.js");
-const newTransaction = require("./newTransaction.js");
-const orderDetails = require("./orderDetails.js");
-const recipeDetails = require("./recipeDetails.js");
-const transactionDetails = require("./transactionDetails.js");
-
-const Merchant = require("./Merchant.js");
-const Ingredient = require("./Ingredient.js");
-const Recipe = require("./Recipe.js");
-const Order = require("./Order.js");
-const Transaction = require("./Transaction.js");
-
-merchant = new Merchant(data.merchant, data.transactions, {
-    home: home,
-    ingredients: ingredients,
-    transactions: transactions,
-    recipeBook: recipeBook,
-    analytics: analytics,
-    orders: orders,
-    Ingredient: Ingredient,
-    Recipe: Recipe,
-    Transaction: Transaction
-});
-
-controller = {
-    sanitaryString: function(str){
-        let disallowed = ["\\", "<", ">", "$", "{", "}", "(", ")"];
-
-        for(let i = 0; i < disallowed.length; j++){
-            if(str.includes(disallowed[i])){
-                return false;
-            }
-        }
-
-        return true;
-    },
-
-    openStrand: function(strand){
-        this.closeSidebar();
-
-        let strands = document.querySelectorAll(".strand");
-        for(let i = 0; i < strands.length; i++){
-            strands[i].style.display = "none";
-        }
-
-        let buttons = document.querySelectorAll(".menuButton");
-        for(let i = 0; i < buttons.length - 1; i++){
-            buttons[i].classList = "menuButton";
-            buttons[i].disabled = false;
-        }
-
-        let activeButton = {};
-        switch(strand){
-            case "home": 
-                activeButton = document.getElementById("homeBtn");
-                document.getElementById("homeStrand").style.display = "flex";
-                home.display();
-                break;
-            case "ingredients": 
-                activeButton = document.getElementById("ingredientsBtn");
-                document.getElementById("ingredientsStrand").style.display = "flex";
-                ingredients.display();
-                break;
-            case "recipeBook":
-                activeButton = document.getElementById("recipeBookBtn");
-                document.getElementById("recipeBookStrand").style.display = "flex";
-                recipeBook.display(Recipe);
-                break;
-            case "analytics":
-                activeButton = document.getElementById("analyticsBtn");
-                document.getElementById("analyticsStrand").style.display = "flex";
-                analytics.display(Transaction);
-                break;
-            case "orders":
-                activeButton = document.getElementById("ordersBtn");
-                document.getElementById("ordersStrand").style.display = "flex";
-                orders.display(Order);
-                break;
-            case "transactions":
-                activeButton = document.getElementById("transactionsBtn");
-                document.getElementById("transactionsStrand").style.display = "flex";
-                transactions.display(Transaction);
-                break;
-        }
-
-        activeButton.classList = "menuButton active";
-        activeButton.disabled = true;
-
-        if(window.screen.availWidth <= 1000){
-            this.closeMenu();
-        }
-    },
-
-    /*
-    Open a specific sidebar
-    Input:
-    sidebar: the outermost element of the sidebar (must contain class sidebar)
-    */
-    openSidebar: function(sidebar, data = {}){
-        this.closeSidebar();
-
-        document.getElementById("sidebarDiv").classList = "sidebar";
-        document.getElementById(sidebar).style.display = "flex";
-
-        switch(sidebar){
-            case "ingredientDetails":
-                ingredientDetails.display(data);
-                break;
-            case "addIngredients":
-                addIngredients.display(Merchant);
-                break;
-            case "newIngredient":
-                newIngredient.display(Ingredient);
-                break;
-            case "recipeDetails":
-                recipeDetails.display(data);
-                break;
-            case "addRecipe":
-                newRecipe.display(Recipe);
-                break;
-            case "orderDetails":
-                orderDetails.display(data);
-                break;
-            case "newOrder":
-                newOrder.display(Order);
-                break;
-            case "transactionDetails":
-                transactionDetails.display(data);
-                break;
-            case "newTransaction":
-                newTransaction.display(Transaction);
-                break;
-        }
-
-        if(window.screen.availWidth <= 1000){
-            document.querySelector(".contentBlock").style.display = "none";
-            document.getElementById("mobileMenuSelector").style.display = "none";
-            document.getElementById("sidebarCloser").style.display = "block";
-        }
-    },
-
-    closeSidebar: function(){
-        let sidebar = document.getElementById("sidebarDiv");
-        for(let i = 0; i < sidebar.children.length; i++){
-            sidebar.children[i].style.display = "none";
-        }
-        sidebar.classList = "sidebarHide";
-
-        if(window.screen.availWidth <= 1000){
-            document.querySelector(".contentBlock").style.display = "flex";
-            document.getElementById("mobileMenuSelector").style.display = "block";
-            document.getElementById("sidebarCloser").style.display = "none";
-        }
-    },
-
-    changeMenu: function(){
-        let menu = document.querySelector(".menu");
-        let buttons = document.querySelectorAll(".menuButton");
-        if(!menu.classList.contains("menuMinimized")){
-            menu.classList = "menu menuMinimized";
-
-            for(let i = 0; i < buttons.length; i++){
-                buttons[i].children[1].style.display = "none";
-            }
-
-            document.getElementById("max").style.display = "none";
-            document.getElementById("min").style.display = "flex";
-
-            
-        }else if(menu.classList.contains("menuMinimized")){
-            menu.classList = "menu";
-
-            for(let i = 0; i < buttons.length; i++){
-                buttons[i].children[1].style.display = "block";
-            }
-
-            setTimeout(()=>{
-                document.getElementById("max").style.display = "flex";
-                document.getElementById("min").style.display = "none";
-            }, 150);
-        }
-    },
-
-    openMenu: function(){
-        document.getElementById("menu").style.display = "flex";
-        document.querySelector(".contentBlock").style.display = "none";
-        document.getElementById("mobileMenuSelector").onclick = ()=>{this.closeMenu()};
-    },
-
-    closeMenu: function(){
-        document.getElementById("menu").style.display = "none";
-        document.querySelector(".contentBlock").style.display = "flex";
-        document.getElementById("mobileMenuSelector").onclick = ()=>{this.openMenu()};
-    },
-
-    convertToMain: function(unit, quantity){
-        let converted = 0;
-    
-        if(merchant.units.mass.includes(unit)){
-            switch(unit){
-                case "g": converted = quantity; break;
-                case "kg": converted = quantity * 1000; break;
-                case "oz": converted = quantity * 28.3495; break;
-                case "lb": converted = quantity * 453.5924; break;
-            }
-        }else if(merchant.units.volume.includes(unit)){
-            switch(unit){
-                case "ml": converted = quantity / 1000; break;
-                case "l": converted = quantity; break;
-                case "tsp": converted = quantity / 202.8842; break;
-                case "tbsp": converted = quantity / 67.6278; break;
-                case "ozfl": converted = quantity / 33.8141; break;
-                case "cup": converted = quantity / 4.1667; break;
-                case "pt": converted = quantity / 2.1134; break;
-                case "qt": converted = quantity / 1.0567; break;
-                case "gal": converted = quantity * 3.7854; break;
-            }
-        }else if(merchant.units.length.includes(unit)){
-            switch(unit){
-                case "mm": converted = quantity / 1000; break;
-                case "cm": converted = quantity / 100; break;
-                case "m": converted = quantity; break;
-                case "in": converted = quantity / 39.3701; break;
-                case "ft": converted = quantity / 3.2808; break;
-            }
-        }else{
-            converted = quantity;
-        }
-    
-        return converted;
-    },
-
-    /*
-    Sets certain strands to repopulate everything the next time it is opened
-    Use for when any data is changed
-    item = whatever is being updated
-    */
-    updateData: function(item){
-        switch(item){
-            case "ingredient":
-                home.isPopulated = false;
-                ingredients.populateByProperty("category");
-                break;
-            case "recipe":
-                transactions.isPopulated = false;
-                recipeBook.populateRecipes();
-                break;
-            case "order":
-                orders.populate();
-                break;
-            case "transaction":
-                transactions.isPopulated = false;
-                transactions.display(Transaction);
-                analytics.newData = true;
-                break;
-        }
-    },
-
-    /*
-    Gets the indices of two dates from transactions
-    Inputs
-    transactions: transaction list to find indices on
-    from: starting date
-    to: ending date (default to now)
-    Output
-    Array containing starting index and ending index
-    Note: Will return false if it cannot find both necessary dates
-    */
-    transactionIndices(transactions, from, to = new Date()){
-        let indices = [];
-
-        for(let i = 0; i < transactions.length; i++){
-            if(transactions[i].date < to){
-                indices.push(i);
-                break;
-            }
-        }
-
-        for(let i = transactions.length - 1; i >= 0; i--){
-            if(transactions[i].date > from){
-                indices.push(i);
-                break;
-            }
-        }
-
-        if(indices.length < 2){
-            return false;
-        }
-
-        return indices;
-    },
-
-    /*
-    Converts the price of a unit to $/main unit
-    unitType = type of the unit (i.e. mass, volume)
-    unit = exact unit to convert from
-    price = price of the ingredient per unit in cents
-    */
-    convertPrice(unitType, unit, price){
-        if(unitType === "mass"){
-            switch(unit){
-                case "g": break;
-                case "kg": price /= 1000; break;
-                case "oz":  price /= 28.3495; break;
-                case "lb":  price /= 453.5924; break;
-            }
-        }else if(unitType === "volume"){
-            switch(unit){
-                case "ml": price *= 1000; break;
-                case "l": break;
-                case "tsp": price *= 202.8842; break;
-                case "tbsp": price *= 67.6278; break;
-                case "ozfl": price *= 33.8141; break;
-                case "cup": price *= 4.1667; break;
-                case "pt": price *= 2.1134; break;
-                case "qt": price *= 1.0567; break;
-                case "gal": price /= 3.7854; break;
-            }
-        }else if(unitType === "length"){
-            switch(unit){
-                case "mm": price *= 1000; break;
-                case "cm": price *= 100; break;
-                case "m": break;
-                case "in": price *= 39.3701; break;
-                case "ft": price *= 3.2808; break;
-            }
-        }
-
-        return price;
-    },
-
-    /*
-    Converts the price of unit back to the price per default unit
-    unitType = type of the unit (i.e. mass, volume)
-    unit = exact unit to convert to
-    price = price of the ingredient per unit in cents
-    */
-    reconvertPrice(unitType, unit, price){
-        if(unitType === "mass"){
-            switch(unit){
-                case "g": break;
-                case "kg": price *= 1000; break;
-                case "oz":  price *= 28.3495; break;
-                case "lb":  price *= 453.5924; break;
-            }
-        }else if(unitType === "volume"){
-            switch(unit){
-                case "ml": price /= 1000; break;
-                case "l": break;
-                case "tsp": price /= 202.8842; break;
-                case "tbsp": price /= 67.6278; break;
-                case "ozfl": price /= 33.8141; break;
-                case "cup": price /= 4.1667; break;
-                case "pt": price /= 2.1134; break;
-                case "qt": price /= 1.0567; break;
-                case "gal": price *= 3.7854; break;
-            }
-        }else if(unitType === "length"){
-            switch(unit){
-                case "mm": price /= 1000; break;
-                case "cm": price /= 100; break;
-                case "m": break;
-                case "in": price /= 39.3701; break;
-                case "ft": price /= 3.2808; break;
-            }
-        }
-
-    return price;
-}
-}
-
-if(window.screen.availWidth > 1000 && window.screen.availWidth <= 1400){
-    this.changeMenu();
-    document.getElementById("menuShifter2").style.display = "none";
-}
-
-controller.openStrand("home");
-},{"./Ingredient.js":1,"./Merchant.js":2,"./Order.js":3,"./Recipe.js":4,"./Transaction.js":5,"./analytics.js":6,"./home.js":8,"./ingredientDetails.js":9,"./ingredients.js":10,"./newIngredient.js":11,"./newOrder.js":12,"./newRecipe.js":13,"./newTransaction.js":14,"./orderDetails.js":15,"./orders.js":16,"./recipeBook.js":17,"./recipeDetails.js":18,"./transactionDetails.js":19,"./transactions.js":20}],8:[function(require,module,exports){
-let home = {
-    isPopulated: false,
-
-    display: function(){
-        if(!this.isPopulated){
-            this.drawRevenueCard();
-            this.drawRevenueGraph();
-            this.drawInventoryCheckCard();
-            this.drawPopularCard();
-
-            this.isPopulated = true;
-        }
-    },
-
-    drawRevenueCard: function(){
-        let today = new Date();
-        let firstOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-        let firstOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1, 1);
-        let lastMonthToDay = new Date(new Date().setMonth(today.getMonth() - 1));
-
-        let revenueThisMonth = merchant.revenue(controller.transactionIndices(merchant.transactions, firstOfMonth));
-        let revenueLastMonthToDay = merchant.revenue(controller.transactionIndices(merchant.transactions, firstOfLastMonth, lastMonthToDay));
-
-        document.getElementById("revenue").innerText = `$${revenueThisMonth.toLocaleString("en")}`;
-
-        let revenueChange = ((revenueThisMonth - revenueLastMonthToDay) / revenueLastMonthToDay) * 100;
-        
-        let img = "";
-        if(revenueChange >= 0){
-            img = "/shared/images/upArrow.png";
-        }else{
-            img = "/shared/images/downArrow.png";
-        }
-        document.querySelector("#revenueChange p").innerText = `${Math.abs(revenueChange).toFixed(2)}% vs last month`;
-        document.querySelector("#revenueChange img").src = img;
-    },
-
-    drawRevenueGraph: function(){
-        let monthAgo = new Date();
-        monthAgo.setMonth(monthAgo.getMonth() - 1);
-        
-        let dateIndices = controller.transactionIndices(merchant.transactions, monthAgo);
-
-        let revenue = [];
-        let dates = [];
-        let dayRevenue = 0;
-        let currentDate = merchant.transactions[dateIndices[0]].date;
-        for(let i = dateIndices[0]; i < dateIndices[1]; i++){
-            if(merchant.transactions[i].date.getDate() !== currentDate.getDate()){
-                revenue.push(dayRevenue / 100);
-                dayRevenue = 0;
-                dates.push(currentDate);
-                currentDate = merchant.transactions[i].date;
-            }
-
-            for(let j = 0; j < merchant.transactions[i].recipes.length; j++){
-                const recipe = merchant.transactions[i].recipes[j];
-
-                dayRevenue += recipe.recipe.price * recipe.quantity;
-            }
-        }
-
-        const trace = {
-            x: dates,
-            y: revenue,
-            mode: "lines+markers",
-            line: {
-                color: "rgb(255, 99, 107)"
-            }
-        }
-
-        const layout = {
-            title: "REVENUE",
-            xaxis: {
-                title: "DATE"
-            },
-            yaxis: {
-                title: "$"
-            }
-        }
-
-        Plotly.newPlot("graphCard", [trace], layout);
-    },
-
-    drawInventoryCheckCard: function(){
-        let num;
-        if(merchant.ingredients.length < 5){
-            num = merchant.ingredients.length;
-        }else{
-            num = 5;
-        }
-        let rands = [];
-        for(let i = 0; i < num; i++){
-            let rand = Math.floor(Math.random() * merchant.ingredients.length);
-
-            if(rands.includes(rand)){
-                i--;
-            }else{
-                rands[i] = rand;
-            }
-        }
-
-        let ul = document.querySelector("#inventoryCheckCard ul");
-        let template = document.getElementById("ingredientCheck").content.children[0];
-        while(ul.children.length > 0){
-            ul.removeChild(ul.firstChild);
-        }
-        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]];
-
-            ingredientCheck.ingredient = ingredient;
-            ingredientCheck.children[0].innerText = ingredient.ingredient.name;
-            ingredientCheck.children[1].children[0].onclick = ()=>{
-                input.value--;
-                input.changed = true;
-            };
-            if(ingredient.ingredient.specialUnit === "bottle"){
-                input.value = (ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2);
-                ingredientCheck.children[2].innerText = "BOTTLES";
-            }else{
-                input.value = ingredient.ingredient.convert(ingredient.quantity).toFixed(2);
-                ingredientCheck.children[2].innerText = ingredient.ingredient.unit.toUpperCase();
-            }
-
-            
-            ingredientCheck.children[1].children[2].onclick = ()=>{
-                input.value++;
-                input.changed = true;
-            }
-            input.onchange = ()=>{input.changed = true};
-            
-
-            ul.appendChild(ingredientCheck);
-        }
-
-        document.getElementById("inventoryCheck").onclick = ()=>{this.submitInventoryCheck()};
-    },
-
-    drawPopularCard: function(){
-        let thisMonth = new Date();
-        thisMonth.setDate(1);
-
-        let ingredientList = merchant.ingredientsSold(controller.transactionIndices(merchant.transactions, thisMonth));
-        if(ingredientList !== false){
-            ingredientList.sort((a, b)=>{
-                if(a.quantity < b.quantity){
-                    return 1;
-                }
-                if(a.quantity > b.quantity){
-                    return -1;
-                }
-
-                return 0;
-            });
-
-            let quantities = [];
-            let labels = [];
-            let colors = [];
-            let count = (ingredientList.length < 5) ? ingredientList.length - 1 : 4;
-            for(let i = count; i >= 0; i--){
-                const ingredientName = ingredientList[i].ingredient.name;
-                const ingredientQuantity = ingredientList[i].ingredient.convert(ingredientList[i].quantity);
-                const unitName = ingredientList[i].ingredient.unit;
-
-                quantities.push(ingredientList[i].quantity);
-                labels.push(`${ingredientName}: ${ingredientQuantity.toFixed(2)} ${unitName.toUpperCase()}`);
-                if(i === 0){
-                    colors.push("rgb(255, 99, 107");
-                }else{
-                    colors.push("rgb(179, 191, 209");
-                }
-            }
-
-            let trace = {
-                x: quantities,
-                type: "bar",
-                orientation: "h",
-                text: labels,
-                textposition: "auto",
-                hoverinfo: "none",
-                marker: {
-                    color: colors
-                }
-            }
-
-            let layout = {
-                title: "MOST POPULAR INGREDIENTS",
-                xaxis: {
-                    zeroline: false,
-                    title: "QUANTITY"
-                },
-                yaxis: {
-                    showticklabels: false
-                }
-            }
-            
-            Plotly.newPlot("popularIngredientsCard", [trace], layout);
-        }else{
-            document.getElementById("popularCanvas").style.display = "none";
-
-            let notice = document.createElement("p");
-            notice.innerText = "N/A";
-            notice.classList = "notice";
-            document.getElementById("popularIngredientsCard").appendChild(notice);
-        }
-    },
-
-    submitInventoryCheck: function(){
-        let lis = document.querySelectorAll("#inventoryCheckCard li");
-
-        let changes = [];
-        let fetchData = [];
-
-        for(let i = 0; i < lis.length; i++){
-            if(lis[i].children[1].children[1].value >= 0){
-                let merchIngredient = lis[i].ingredient;
-
-                if(lis[i].children[1].children[1].changed === true){
-                    let value = 0;
-                    if(merchIngredient.ingredient.specialUnit === "bottle"){
-                        value = parseFloat(lis[i].children[1].children[1].value) * merchIngredient.ingredient.unitSize;
-                    }else{
-                        value = controller.convertToMain(merchIngredient.ingredient.unit, parseFloat(lis[i].children[1].children[1].value));
-                    }
-                    
-
-                    changes.push({
-                        ingredient: merchIngredient.ingredient,
-                        quantity: value
-                    });
-
-                    fetchData.push({
-                        id: merchIngredient.ingredient.id,
-                        quantity: value
-                    });
-
-                    lis[i].children[1].children[1].changed = false;
-                }
-            }else{
-                banner.createError("CANNOT HAVE NEGATIVE INGREDIENTS");
-                return;
-            }
-        }
-        
-        if(fetchData.length > 0){
-            let loader = document.getElementById("loaderContainer");
-            loader.style.display = "flex";
-
-            fetch("/merchant/ingredients/update", {
-                method: "PUT",
-                headers: {
-                    "Content-Type": "application/json;charset=utf-8"
-                },
-                body: JSON.stringify(fetchData)
-            })
-                .then((response) => response.json())
-                .then((response)=>{
-                    if(typeof(response) === "string"){
-                        banner.createError(response);
-                    }else{
-                        merchant.editIngredients(changes);
-                        banner.createNotification("INGREDIENTS UPDATED");
-                    }
-                })
-                .catch((err)=>{})
-                .finally(()=>{
-                    loader.style.display = "none";
-                });
-        }
-    }
-}
-
-module.exports = home;
-},{}],9:[function(require,module,exports){
-let ingredientDetails = {
-    ingredient: {},
-    dailyUse: 0,
-
-    display: function(ingredient){
-        this.ingredient = ingredient;
-
-        if(this.ingredient.ingredient.specialUnit === "bottle"){
-            try{
-                let label = document.getElementById("ingredientUnitSizeLabel");
-                label.parentElement.removeChild(label);
-
-                let border = document.getElementById("bottleBorder");
-                border.parentElement.removeChild(border);
-            }catch(err){}
-        }
-
-        document.getElementById("ingredientDetailsCategory").innerText = ingredient.ingredient.category;
-
-        let categoryInput = document.getElementById("detailsCategoryInput");
-        categoryInput.value = "";
-        categoryInput.placeholder = ingredient.ingredient.category;
-
-        document.getElementById("ingredientDetailsName").innerText = ingredient.ingredient.name;
-        
-        let nameInput = document.getElementById("ingredientDetailsNameIn");
-        nameInput.value = "";
-        nameInput.placeholder = ingredient.ingredient.name;
-
-        //Display the stock quantity (and the edit input) based on the unit type
-        let stockInput = document.getElementById("ingredientInput");
-        let stockDisplay = document.getElementById("ingredientStock");
-        stockInput.value = "";
-        if(ingredient.ingredient.specialUnit === "bottle"){
-            let quantity = ingredient.ingredient.convert(ingredient.quantity);
-
-            stockDisplay.innerText = `${quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-            stockDisplay.innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`;
-            stockInput.placeholder = quantity.toFixed(2);
-        }else{
-            stockDisplay.innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-            stockInput.placeholder = ingredient.ingredient.convert(ingredient.quantity).toFixed(2);
-        }
-
-
-        let quantities = [];
-        let now = new Date();
-        for(let i = 1; i < 31; i++){
-            let endDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i)
-            let startDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i - 1);
-            let indices = controller.transactionIndices(merchant.transactions, startDay, endDay);
-
-            if(indices === false){
-                quantities.push(0);
-            }else{
-                quantities.push(merchant.singleIngredientSold(indices, ingredient));
-            }
-        }
-
-        let sum = 0;
-        for(let i = 0; i < quantities.length; i++){
-            sum += quantities[i];
-        }
-
-        let dailyUse = sum / quantities.length;
-        document.getElementById("dailyUse").innerText = `${ingredient.ingredient.convert(dailyUse).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-
-        let ul = document.getElementById("ingredientRecipeList");
-        let recipes = merchant.getRecipesForIngredient(ingredient.ingredient);
-        while(ul.children.length > 0){
-            ul.removeChild(ul.firstChild);
-        }
-        for(let i = 0; i < recipes.length; i++){
-            let li = document.createElement("li");
-            li.innerText = recipes[i].name;
-            li.onclick = ()=>{
-                controller.openStrand("recipeBook");
-                controller.openSidebar("recipeDetails", recipes[i]);
-            }
-            ul.appendChild(li);
-        }
-
-        let ingredientButtons = document.getElementById("ingredientButtons");
-        let units = [];
-        if(this.ingredient.ingredient.unitType !== "other"){
-            units = merchant.units[this.ingredient.ingredient.unitType];
-        }
-        while(ingredientButtons.children.length > 0){
-            ingredientButtons.removeChild(ingredientButtons.firstChild);
-        }
-        for(let i = 0; i < units.length; i++){
-            let button = document.createElement("button");
-            button.classList.add("unitButton");
-            button.innerText = units[i].toUpperCase();
-            button.onclick = ()=>{this.changeUnit(button, units[i])};
-            ingredientButtons.appendChild(button);
-
-            if(units[i] === this.ingredient.ingredient.unit){
-                button.classList.add("unitActive");
-            }
-        }
-
-        let add = document.querySelectorAll(".editAdd");
-        let remove = document.querySelectorAll(".editRemove");
-
-        for(let i = 0; i < add.length; i++){
-            add[i].style.display = "none";
-        }
-
-        for(let i = 0; i < remove.length; i++){
-            remove[i].style.display = "block";
-        }
-
-        document.getElementById("editSubmitButton").onclick = ()=>{this.editSubmit()};
-        document.getElementById("editCancelButton").onclick = ()=>{this.display(this.ingredient)};
-        document.getElementById("editIngBtn").onclick = ()=>{this.edit()};
-        document.getElementById("removeIngBtn").onclick = ()=>{this.remove()};
-    },
-
-    remove: function(){
-        for(let i = 0; i < merchant.recipes.length; i++){
-            for(let j = 0; j < merchant.recipes[i].ingredients.length; j++){
-                if(this.ingredient.ingredient === merchant.recipes[i].ingredients[j].ingredient){
-                    banner.createError("MUST REMOVE INGREDIENT FROM ALL RECIPES BEFORE REMOVING FROM INVENTORY");
-                    return;
-                }
-            }
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch(`/ingredients/remove/${this.ingredient.ingredient.id}`, {
-            method: "DELETE",
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    banner.createNotification("INGREDIENT REMOVED");
-                    merchant.editIngredients([this.ingredient], true);
-                }
-            })
-            .catch((err)=>{})
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    edit: function(){
-        let add = document.querySelectorAll(".editAdd");
-        let remove = document.querySelectorAll(".editRemove");
-
-        for(let i = 0; i < add.length; i++){
-            add[i].style.display = "flex";
-        }
-
-        for(let i = 0; i < remove.length; i++){
-            remove[i].style.display = "none";
-        }
-
-        if(this.ingredient.ingredient.specialUnit === "bottle"){
-            const mainDiv = document.getElementById("ingredientDetails");
-            const displayUnits = document.getElementById("displayUnitLabel");
-
-            let label = document.createElement("label");
-            label.innerText = `BOTTLE SIZE (${this.ingredient.ingredient.unit.toUpperCase()})`;
-            label.id = "ingredientUnitSizeLabel";
-            mainDiv.insertBefore(label, displayUnits);
-
-            const convQuant = this.ingredient.ingredient.convert(this.ingredient.ingredient.unitSize);
-
-            let input = document.createElement("input");
-            input.type = "number";
-            input.value = convQuant.toFixed(2);
-            input.id = "ingredientUnitSizeIn";
-            input.min = "0";
-            input.step = "0.01";
-            label.appendChild(input);
-
-            let border = document.createElement("div");
-            border.classList.add("lineBorder");
-            border.id="bottleBorder";
-            mainDiv.insertBefore(border, displayUnits);
-        }
-    },
-
-    editSubmit: function(){
-        //Update the ingredient unit depending on the type of unit
-        let ingredientButtons = document.querySelectorAll(".unitButton");
-        for(let i = 0; i < ingredientButtons.length; i++){
-            if(ingredientButtons[i].classList.contains("unitActive")){
-                const unit = ingredientButtons[i].innerText.toLowerCase();
-                this.ingredient.ingredient.unit = unit;
-
-                break;
-            }
-        }
-
-        //Update the ingredient quantity depending on the type of unit
-        const quantityElem = document.getElementById("ingredientInput");
-        if(quantityElem.value !== ""){
-            if(this.ingredient.ingredient.specialUnit === "bottle"){
-                let quantInMain = controller.convertToMain(
-                    this.ingredient.ingredient.unit,
-                    quantityElem.value * this.ingredient.ingredient.unitSize
-                );
-
-                this.ingredient.quantity = quantInMain / this.ingredient.ingredient.unitSize;
-            }else{
-                this.ingredient.quantity = controller.convertToMain(
-                    this.ingredient.ingredient.unit,
-                    Number(quantityElem.value)
-                );
-            }
-        }
-
-        const category = document.getElementById("detailsCategoryInput");
-        this.ingredient.ingredient.category = (category.value === "") ? this.ingredient.ingredient.category : category.value;
-
-        const name = document.getElementById("ingredientDetailsNameIn");
-        this.ingredient.ingredient.name = (name.value === "") ? this.ingredient.ingredient.name : name.value;
-
-        let data = {
-            id: this.ingredient.ingredient.id,
-            name: this.ingredient.ingredient.name,
-            quantity: this.ingredient.quantity,
-            category: this.ingredient.ingredient.category,
-            defaultUnit: this.ingredient.ingredient.unit
-        };
-
-        if(this.ingredient.ingredient.specialUnit === "bottle"){
-            const unitSize = document.getElementById("ingredientUnitSizeIn").value;
-            this.ingredient.ingredient.unitSize = controller.convertToMain(this.ingredient.ingredient.unit, unitSize);
-            data.unitSize = this.ingredient.ingredient.unitSize;
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/ingredients/update", {
-            method: "PUT",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(data)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    merchant.editIngredients([this.ingredient]);
-
-                    this.display(this.ingredient);
-
-                    banner.createNotification("INGREDIENT UPDATED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    changeUnit: function(newActive, unit){
-        let ingredientButtons = document.querySelectorAll(".unitButton");
-        for(let i = 0; i < ingredientButtons.length; i++){
-            ingredientButtons[i].classList.remove("unitActive");
-        }
-
-        newActive.classList.add("unitActive");
-    },
-
-    changeUnitDefault: function(){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        let id = this.ingredient.ingredient.id;
-        let unit = this.ingredient.ingredient.unit;
-        fetch(`/merchant/ingredients/update/${id}/${unit}`, {
-            method: "put",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-        })
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    banner.createNotification("INGREDIENT DEFAULT UNIT UPDATED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = ingredientDetails;
-},{}],10:[function(require,module,exports){
-const { populate } = require("./orders");
-
-let ingredients = {
-    isPopulated: false,
-    ingredients: [],
-
-    display: function(){
-        if(!this.isPopulated){
-            this.populateByProperty("category");
-
-            document.getElementById("ingredientSearch").oninput = ()=>{this.search()};
-            document.getElementById("ingredientClearButton").onclick = ()=>{this.clearSorting()};
-            document.getElementById("ingredientSelect").onchange = ()=>{this.sort()};
-
-            this.populateByProperty();
-
-            this.isPopulated = true;
-        }
-    },
-
-    populateByProperty: function(property){
-        let categories;
-        if(property === "category"){
-            categories = merchant.categorizeIngredients();
-        }else if(property === "unit"){
-            categories = merchant.unitizeIngredients();
-        }
-        
-        let ingredientStrand = document.getElementById("categoryList");
-        let categoryTemplate = document.getElementById("categoryDiv").content.children[0];
-        let ingredientTemplate = document.getElementById("ingredient").content.children[0];
-        this.ingredients = [];
-
-        while(ingredientStrand.children.length > 0){
-            ingredientStrand.removeChild(ingredientStrand.firstChild);
-        }
-
-        for(let i = 0; i < categories.length; i++){
-            let categoryDiv = categoryTemplate.cloneNode(true);
-            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]);
-            };
-            categoryDiv.children[1].style.display = "none";
-            ingredientStrand.appendChild(categoryDiv);
-
-            for(let j = 0; j < categories[i].ingredients.length; j++){
-                let ingredient = categories[i].ingredients[j];
-                let ingredientDiv = ingredientTemplate.cloneNode(true);
-
-                ingredientDiv.children[0].innerText = ingredient.ingredient.name;
-                ingredientDiv.onclick = ()=>{controller.openSidebar("ingredientDetails", ingredient)};
-                ingredientDiv._name = ingredient.ingredient.name.toLowerCase();
-                ingredientDiv._unit = ingredient.ingredient.unit.toLowerCase();
-
-                
-                if(ingredient.ingredient.specialUnit === "bottle"){
-                    ingredientDiv.children[2].innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`
-                }else{
-                    ingredientDiv.children[2].innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-                }
-
-                categoryDiv.children[1].appendChild(ingredientDiv);
-                this.ingredients.push(ingredientDiv);
-            }
-        }
-
-    },
-
-    displayIngredientsOnly: function(ingredients){
-        let ingredientDiv = document.getElementById("categoryList");
-
-        while(ingredientDiv.children.length > 0){
-            ingredientDiv.removeChild(ingredientDiv.firstChild);
-        }
-        for(let i = 0; i < ingredients.length; i++){
-            ingredientDiv.appendChild(ingredients[i]);
-        }
-    },
-
-    toggleCategory: function(div, button){
-        if(div.style.display === "none"){
-            button.innerHTML = '<svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="18 15 12 9 6 15"></polyline></svg>';
-            div.style.display = "flex";
-        }else if(div.style.display === "flex"){
-            button.innerHTML = '<svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"></polyline></svg>';
-            div.style.display = "none";
-        }
-    },
-
-    search: function(){
-        let input = document.getElementById("ingredientSearch").value.toLowerCase();
-        document.getElementById("ingredientSelect").selectedIndex = 0;
-
-        if(input === ""){
-            this.populateByProperty("category");
-            document.getElementById("ingredientClearButton").style.display = "none";
-            return;
-        }
-
-        let matchingIngredients = [];
-        for(let i = 0; i < this.ingredients.length; i++){
-            if(this.ingredients[i]._name.includes(input)){
-                matchingIngredients.push(this.ingredients[i]);
-            }
-        }
-
-        document.getElementById("ingredientClearButton").style.display = "inline";
-        this.displayIngredientsOnly(matchingIngredients);
-    },
-
-    sort: function(){
-        let sortType = document.getElementById("ingredientSelect").value;
-        
-        if(sortType === ""){
-            return;
-        }
-
-        document.getElementById("ingredientSearch").value = "";
-
-        if(sortType === "category"){
-            this.populateByProperty("category");
-            return;
-        }
-
-        if(sortType === "unit"){
-            this.populateByProperty("unit");
-            return;
-        }
-
-        document.getElementById("ingredientClearButton").style.display = "inline";
-        let sortedIngredients = this.ingredients.slice().sort((a, b)=> (a[sortType] > b[sortType]) ? 1 : -1);
-        this.displayIngredientsOnly(sortedIngredients);
-    },
-
-    clearSorting: function(button){
-        document.getElementById("ingredientSearch").value = "";
-        document.getElementById("ingredientSelect").selectedIndex = 0;
-        document.getElementById("ingredientClearButton").style.display = "none";
-
-        this.populateByProperty("category");
-    }
-}
-
-module.exports = ingredients;
-},{"./orders":16}],11:[function(require,module,exports){
-let newIngredient = {
-    display: function(Ingredient){
-        const selector = document.getElementById("unitSelector");
-
-        document.getElementById("newIngName").value = "";
-        document.getElementById("newIngCategory").value = "";
-        document.getElementById("newIngQuantity").value = 0;
-        document.getElementById("bottleSizeLabel").style.display = "none";
-        selector.value = "g";
-
-        selector.onchange = ()=>{this.unitChange()};
-        document.getElementById("submitNewIng").onclick = ()=>{this.submit(Ingredient)};
-    },
-
-    unitChange: function(){
-        const select = document.getElementById("unitSelector");
-        const bottleLabel = document.getElementById("bottleSizeLabel");
-        if(select.value === "bottle"){
-            bottleLabel.style.display = "block";
-        }else{
-            bottleLabel.style.display = "none";
-        }
-    },
-
-    submit: function(Ingredient){
-        let unitSelector = document.getElementById("unitSelector");
-        let options = document.querySelectorAll("#unitSelector option");
-        const quantityValue = document.getElementById("newIngQuantity").value;
-
-        let unit = unitSelector.value;
-
-        let newIngredient = {
-            ingredient: {
-                name: document.getElementById("newIngName").value,
-                category: document.getElementById("newIngCategory").value,
-                unitType: options[unitSelector.selectedIndex].getAttribute("type"),
-            },
-            quantity: controller.convertToMain(unit, quantityValue),
-            defaultUnit: unit
-        }
-
-        //Change the ingredient if it is a special unit type (ie "bottle")
-        if(unit === "bottle"){
-            const bottleUnit = document.getElementById("bottleUnits").value;
-            const bottleSize = controller.convertToMain(bottleUnit, document.getElementById("bottleSize").value);
-
-            newIngredient.ingredient.unitType = "volume";
-            newIngredient.ingredient.unitSize = bottleSize;
-            newIngredient.defaultUnit = bottleUnit;
-            newIngredient.ingredient.specialUnit = unit;
-            newIngredient.quantity = quantityValue * bottleSize;
-        }
-    
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/ingredients/create", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(newIngredient)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    merchant.editIngredients([{
-                        ingredient: new Ingredient(
-                            response.ingredient._id,
-                            response.ingredient.name,
-                            response.ingredient.category,
-                            response.ingredient.unitType,
-                            response.defaultUnit,
-                            merchant,
-                            response.ingredient.specialUnit,
-                            response.ingredient.unitSize
-                        ),
-                        quantity: response.quantity
-                    }]);
-
-                    banner.createNotification("INGREDIENT CREATED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = newIngredient;
-},{}],12:[function(require,module,exports){
-let newOrder = {
-    display: function(Order){
-        document.getElementById("sidebarDiv").classList.add("sidebarWide");
-        document.getElementById("newOrderIngredientList").style.display = "flex";
-
-        let selectedList = document.getElementById("selectedIngredientList");
-        while(selectedList.children.length > 0){
-            selectedList.removeChild(selectedList.firstChild);
-        }
-
-        let ingredientList = document.getElementById("newOrderIngredients");
-        while(ingredientList.children.length > 0){
-            ingredientList.removeChild(ingredientList.firstChild);
-        }
-
-        for(let i = 0; i < merchant.ingredients.length; i++){
-            let ingredient = document.createElement("button");
-            ingredient.classList = "newOrderIngredient";
-            ingredient.innerText = merchant.ingredients[i].ingredient.name;
-            ingredient.onclick = ()=>{this.addIngredient(merchant.ingredients[i].ingredient, ingredient)};
-            ingredientList.appendChild(ingredient);
-        }
-
-        document.getElementById("submitNewOrder").onclick = ()=>{this.submit(Order)};
-    },
-
-    addIngredient: function(ingredient, element){
-        element.style.display = "none";
-
-        let div = document.getElementById("selectedIngredient").content.children[0].cloneNode(true);
-        div.ingredient = ingredient;
-        div.children[0].children[1].onclick = ()=>{this.removeIngredient(div, element)};
-
-        //Display units depending on the whether it is a special unit
-        if(ingredient.specialUnit === "bottle"){
-            div.children[0].children[0].innerText = `${ingredient.name} (BOTTLES)`;
-        }else{
-            div.children[0].children[0].innerText = `${ingredient.name} (${ingredient.unit.toUpperCase()})`;
-        }
-
-        document.getElementById("selectedIngredientList").appendChild(div);
-    },
-
-    removeIngredient: function(selectedElement, element){
-        selectedElement.parentElement.removeChild(selectedElement);
-        element.style.display = "block";
-    },
-
-    submit: function(Order){
-        let date = document.getElementById("newOrderDate").value;
-        let taxes = document.getElementById("orderTaxes").value * 100;
-        let fees = document.getElementById("orderFees").value * 100;
-        let ingredients = document.getElementById("selectedIngredientList").children;
-
-        if(date === ""){
-            banner.createError("DATE IS REQUIRED FOR ORDERS");
-            return;
-        }
-
-        let data = {
-            name: document.getElementById("newOrderName").value,
-            date: date,
-            taxes: taxes,
-            fees: fees,
-            ingredients: []
-        }
-
-        for(let i = 0; i < ingredients.length; i++){
-            let quantity = ingredients[i].children[1].children[0].value;
-            let price = ingredients[i].children[1].children[1].value;
-
-            if(quantity === "" || price === ""){
-                banner.createError("MUST PROVIDE QUANTITY AND PRICE PER UNIT FOR ALL INGREDIENTS");
-                return;
-            }
-
-            if(quantity < 0 || price < 0){
-                banner.createError("QUANTITY AND PRICE MUST BE NON-NEGATIVE NUMBERS");
-            }
-
-            if(ingredients[i].ingredient.specialUnit === "bottle"){
-                const ppu = controller.convertPrice("volume", ingredients[i].ingredient.unit, (price * 100) / (ingredients[i].ingredient.convert(ingredients[i].ingredient.unitSize)));
-
-                data.ingredients.push({
-                    ingredient: ingredients[i].ingredient.id,
-                    quantity: quantity * ingredients[i].ingredient.unitSize,
-                    pricePerUnit: ppu,
-                });
-            }else{
-                data.ingredients.push({
-                    ingredient: ingredients[i].ingredient.id,
-                    quantity: controller.convertToMain(ingredients[i].ingredient.unit, quantity),
-                    pricePerUnit: controller.convertPrice(ingredients[i].ingredient.unitType, ingredients[i].ingredient.unit, price * 100)
-                });
-            }
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/order/create", {
-            method: "post",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(data)
-        })
-            .then((response)=>response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    let order = new Order(
-                        response._id,
-                        response.name,
-                        response.date,
-                        response.taxes,
-                        response.fees,
-                        response.ingredients,
-                        merchant
-                    );
-
-                    merchant.editOrders([order]);
-                    merchant.editIngredients(order.ingredients, false, true);
-                    banner.createNotification("NEW ORDER CREATED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = newOrder;
-},{}],13:[function(require,module,exports){
-let newRecipe = {
-    display: function(Recipe){
-        let ingredientsSelect = document.querySelector("#recipeInputIngredients select");
-        let categories = merchant.categorizeIngredients();
-
-        while(ingredientsSelect.children.length > 0){
-            ingredientsSelect.removeChild(ingredientsSelect.firstChild);
-        }
-
-        for(let i = 0; i < categories.length; i++){
-            let optgroup = document.createElement("optgroup");
-            optgroup.label = categories[i].name;
-            ingredientsSelect.appendChild(optgroup);
-
-            for(let j = 0; j < categories[i].ingredients.length; j++){
-                let option = document.createElement("option");
-                option.value = categories[i].ingredients[j].ingredient.id;
-                option.innerText = `${categories[i].ingredients[j].ingredient.name} (${categories[i].ingredients[j].ingredient.unit})`;
-                optgroup.appendChild(option);
-            }
-        }
-
-        document.getElementById("ingredientCount").onchange = ()=>{this.changeRecipeCount()};
-        document.getElementById("submitNewRecipe").onclick = ()=>{this.submit(Recipe)};
-    },
-
-    //Updates the number of ingredient inputs displayed for new recipes
-    changeRecipeCount: function(){
-        let newCount = document.getElementById("ingredientCount").value;
-        let ingredientsDiv = document.getElementById("recipeInputIngredients");
-        let oldCount = ingredientsDiv.children.length;
-
-        if(newCount > oldCount){
-            let newDivs = newCount - oldCount;
-
-            for(let i = 0; i < newDivs; i++){
-                let newNode = ingredientsDiv.children[0].cloneNode(true);
-                newNode.children[2].children[0].value = "";
-
-                ingredientsDiv.appendChild(newNode);
-            }
-
-            for(let i = 0; i < newCount; i++){
-                ingredientsDiv.children[i].children[0].innerText = `INGREDIENT ${i + 1}`;
-            }
-        }else if(newCount < oldCount){
-            let newDivs = oldCount - newCount;
-
-            for(let i = 0; i < newDivs; i++){
-                ingredientsDiv.removeChild(ingredientsDiv.children[ingredientsDiv.children.length-1]);
-            }
-        }
-    },
-
-    submit: function(Recipe){
-        let newRecipe = {
-            name: document.getElementById("newRecipeName").value,
-            price: document.getElementById("newRecipePrice").value,
-            ingredients: []
-        }
-
-        let inputs = document.querySelectorAll("#recipeInputIngredients > div");
-        for(let i = 0; i < inputs.length; i++){
-            for(let j = 0; j < merchant.ingredients.length; j++){
-                if(merchant.ingredients[j].ingredient.id === inputs[i].children[1].children[0].value){
-                    newRecipe.ingredients.push({
-                        ingredient: inputs[i].children[1].children[0].value,
-                        quantity: controller.convertToMain(merchant.ingredients[j].ingredient.unit, inputs[i].children[2].children[0].value)
-                    });
-
-                    break;
-                }
-            }
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/recipe/create", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(newRecipe)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    let recipe = new Recipe(
-                        response._id,
-                        response.name,
-                        response.price,
-                        response.ingredients,
-                        merchant,
-                    );
-                    
-                    merchant.editRecipes([recipe]);
-                    banner.createNotification("RECIPE CREATED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-}
-
-module.exports = newRecipe;
-},{}],14:[function(require,module,exports){
-let newTransaction = {
-    display: function(Transaction){
-        let recipeList = document.getElementById("newTransactionRecipes");
-        let template = document.getElementById("createTransaction").content.children[0];
-
-        while(recipeList.children.length > 0){
-            recipeList.removeChild(recipeList.firstChild);
-        }
-
-        for(let i = 0; i < merchant.recipes.length; i++){
-            let recipeDiv = template.cloneNode(true);
-            recipeDiv.recipe = merchant.recipes[i];
-            recipeList.appendChild(recipeDiv);
-
-            recipeDiv.children[0].innerText = merchant.recipes[i].name;
-        }
-
-        document.getElementById("submitNewTransaction").onclick = ()=>{this.submit(Transaction)};
-    },
-
-    submit: function(Transaction){
-        let recipeDivs = document.getElementById("newTransactionRecipes");
-        let date = document.getElementById("newTransactionDate").valueAsDate;
-        
-        if(date > new Date()){
-            banner.createError("CANNOT HAVE A DATE IN THE FUTURE");
-            return;
-        }
-        
-        let data = {
-            date: date,
-            recipes: [],
-            ingredientUpdates: {}
-        };
-
-        for(let i = 0; i < recipeDivs.children.length;  i++){
-            let quantity = recipeDivs.children[i].children[1].value;
-            const recipe = recipeDivs.children[i].recipe;
-            if(quantity !== "" && quantity > 0){
-                data.recipes.push({
-                    recipe: recipe.id,
-                    quantity: quantity
-                });
-
-                for(let j = 0; j < recipe.ingredients.length; j++){
-                    const ingredient = recipe.ingredients[j];
-
-                    if(data.ingredientUpdates[ingredient.ingredient.id]){
-                        data.ingredientUpdates[ingredient.ingredient.id] += ingredient.quantity * quantity;
-                    }else{
-                        data.ingredientUpdates[ingredient.ingredient.id] = ingredient.quantity * quantity;
-                    }
-                }
-            }else if(quantity < 0){
-                banner.createError("CANNOT HAVE NEGATIVE VALUES");
-                return;
-            }
-        }
-
-        if(data.recipes.length > 0){
-            let loader = document.getElementById("loaderContainer");
-            loader.style.display = "flex";
-
-            fetch("/transaction/create", {
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json;charset=utf-8"
-                },
-                body: JSON.stringify(data)
-            })
-                .then(response => response.json())
-                .then((response)=>{
-                    if(typeof(response) === "string"){
-                        banner.createError(response);
-                    }else{
-                        let transaction = new Transaction(
-                            response._id,
-                            response.date,
-                            response.recipes,
-                            merchant
-                        );
-                        merchant.editTransactions(transaction, data.ingredientUpdates);
-                        banner.createNotification("NEW TRANSACTION CREATED, INGREDIENTS UPDATED ACCORDINGLY");
-                    }
-                })
-                .catch((err)=>{
-                    banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-                })
-                .finally(()=>{
-                    loader.style.display = "none";
-                });
-        }
-    }
-}
-
-module.exports = newTransaction;
-},{}],15:[function(require,module,exports){
-let orderDetails = {
-    display: function(order){
-        document.getElementById("removeOrderBtn").onclick = ()=>{this.remove(order)};
-
-        document.getElementById("orderDetailName").innerText = order.name;
-        document.getElementById("orderDetailDate").innerText = order.date.toLocaleDateString("en-US");
-        document.getElementById("orderDetailTax").innerText = `$${(order.taxes / 100).toFixed(2)}`;
-        document.getElementById("orderDetailFee").innerText = `$${(order.fees / 100).toFixed(2)}`;
-
-        let ingredientList = document.getElementById("orderIngredients");
-        while(ingredientList.children.length > 0){
-            ingredientList.removeChild(ingredientList.firstChild);
-        }
-
-        let template = document.getElementById("orderIngredient").content.children[0];
-        let grandTotal = 0;
-        for(let i = 0; i < order.ingredients.length; i++){
-            let ingredientDiv = template.cloneNode(true);
-            let price = order.ingredients[i].pricePerUnit * order.ingredients[i].quantity;
-            grandTotal += price;
-
-            const ingredient = order.ingredients[i].ingredient;
-            
-            ingredientDiv.children[0].innerText = order.ingredients[i].ingredient.name;
-            ingredientDiv.children[2].innerText = `$${(price / 100).toFixed(2)}`;
-            
-            const ingredientDisplay = ingredientDiv.children[1];
-            if(ingredient.specialUnit === "bottle"){
-                const quantSold = order.ingredients[i].quantity / ingredient.unitSize;
-                const ppu = (order.ingredients[i].pricePerUnit * order.ingredients[i].quantity) / quantSold;
-
-                ingredientDisplay.innerText = `${quantSold.toFixed(0)} bottles x $${(ppu / 100).toFixed(2)}`;
-            }else{
-                const convertedQuantity = ingredient.convert(order.ingredients[i].quantity);
-                const convertedPrice = controller.reconvertPrice(order.ingredients[i].ingredient.unitType, order.ingredients[i].ingredient.unit, order.ingredients[i].pricePerUnit);
-
-                ingredientDisplay.innerText = `${convertedQuantity.toFixed(2)} ${ingredient.unit.toUpperCase()} x $${(convertedPrice / 100).toFixed(2)}`;
-            }
-
-            ingredientList.appendChild(ingredientDiv);
-        }
-
-        document.getElementById("orderDetailTotal").innerText = `$${(grandTotal / 100).toFixed(2)}`;
-        document.querySelector("#orderTotalPrice p").innerText = `$${((grandTotal + order.taxes + order.fees) / 100).toFixed(2)}`;
-    },
-
-    remove: function(order){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch(`/order/${order.id}`, {
-            method: "DELETE",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            }
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    for(let i = 0; i < order.ingredients.length; i++){
-                        order.ingredients[i].quantity = -order.ingredients[i].quantity;
-                    }
-
-                    merchant.editOrders([order], true);
-                    merchant.editIngredients(order.ingredients, false, true);
-                    banner.createNotification("ORDER REMOVED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = orderDetails;
-},{}],16:[function(require,module,exports){
-let orders = {
-    isPopulated: false,
-    isFetched: false,
-
-    display: async function(Order){
-        if(!this.isFetched){
-            let loader = document.getElementById("loaderContainer");
-            loader.style.display = "flex";
-
-            fetch("/order", {
-                method: "GET",
-                headers: {
-                    "Content-Type": "application/json;charset=utf-8"
-                },
-            })
-                .then((response) => response.json())
-                .then((response)=>{
-                    if(typeof(response) === "string"){
-                        banner.createError(response);
-                    }else{
-                        let newOrders = [];
-                        for(let i = 0; i < response.length; i++){
-                            newOrders.push(new Order(
-                                response[i]._id,
-                                response[i].name,
-                                response[i].date,
-                                response[i].taxes,
-                                response[i].fees,
-                                response[i].ingredients,
-                                merchant
-                            ));
-                        }
-                        merchant.editOrders(newOrders);
-
-                        document.getElementById("orderSubmitForm").onsubmit = ()=>{this.submitFilter(Order)};
-
-                        this.isFetched = true;
-                    }
-                })
-                .catch((err)=>{
-                    banner.createError("SOMETHING WENT WRONG. TRY REFRESHING THE PAGE");
-                })
-                .finally(()=>{
-                    loader.style.display = "none";
-                });
-        }
-
-        if(!this.isPopulated){
-            this.populate();
-            this.isPopulated = true;
-        }
-    },
-
-    populate: function(){
-        let listDiv = document.getElementById("orderList");
-        let template = document.getElementById("order").content.children[0];
-        let dateDropdown = document.getElementById("dateDropdownOrder");
-        let ingredientDropdown = document.getElementById("ingredientDropdown");
-
-        dateDropdown.style.display = "none";
-        ingredientDropdown.style.display = "none";
-
-        document.getElementById("dateFilterBtnOrder").onclick = ()=>{this.toggleDropdown(dateDropdown)};
-        document.getElementById("ingredientFilterBtn").onclick = ()=>{this.toggleDropdown(ingredientDropdown)};
-
-        for(let i = 0; i < merchant.ingredients.length; i++){
-            let checkbox = document.createElement("input");
-            checkbox.type = "checkbox";
-            checkbox.ingredient = merchant.ingredients[i].ingredient;
-            ingredientDropdown.appendChild(checkbox);
-
-            let label = document.createElement("label");
-            label.innerText = merchant.ingredients[i].ingredient.name;
-            label.for = checkbox;
-            ingredientDropdown.appendChild(label);
-
-            let brk = document.createElement("br");
-            ingredientDropdown.appendChild(brk);
-        }
-
-        while(listDiv.children.length > 0){
-            listDiv.removeChild(listDiv.firstChild);
-        }
-
-        for(let i = 0; i < merchant.orders.length; i++){
-            let row = template.cloneNode(true);
-            let totalCost = 0;
-            
-            for(let j = 0; j < merchant.orders[i].ingredients.length; j++){
-                const ingredient = merchant.orders[i].ingredients[j];
-                totalCost += ingredient.pricePerUnit * ingredient.quantity;
-            }
-
-            row.children[0].innerText = merchant.orders[i].name;
-            row.children[1].innerText = `${merchant.orders[i].ingredients.length} ingredients`;
-            row.children[2].innerText = new Date(merchant.orders[i].date).toLocaleDateString("en-US");
-            row.children[3].innerText = `$${((totalCost / 100) + (merchant.orders[i].taxes / 100) + (merchant.orders[i].fees / 100)).toFixed(2)}`;
-            row.order = merchant.orders[i];
-            row.onclick = ()=>{controller.openSidebar("orderDetails", merchant.orders[i])};
-            listDiv.appendChild(row);
-        }
-    },
-
-    submitFilter: function(){
-        event.preventDefault();
-
-        let data = {
-            startDate: document.getElementById("orderFilDate1").valueAsDate,
-            endDate: document.getElementById("orderFilDate2").valueAsDate,
-            ingredients: []
-        }
-
-        if(data.startDate >= data.endDate){
-            banner.createError("START DATE CANNOT BE AFTER END DATE");
-            return;
-        }
-
-        let ingredientChoices = document.getElementById("ingredientDropdown");
-        for(let i = 0; i < ingredientChoices.children.length; i += 3){
-            if(ingredientChoices.children[i].checked){
-                data.ingredients.push(ingredientChoices.children[i].ingredient.id);
-            }
-        }
-
-        if(data.ingredients.length === 0){
-            for(let i = 0; i < merchant.ingredients.length; i++){
-                data.ingredients.push(merchant.ingredients[i].ingredient.id);
-            }
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/order", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(data)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    let orderList = document.getElementById("orderList");
-                    let template = document.getElementById("order").content.children[0];
-
-                    while(orderList.children.length > 0){
-                        orderList.removeChild(orderList.firstChild);
-                    }
-
-                    for(let i = 0; i < response.length; i++){
-                        let orderDiv = template.cloneNode(true);
-                        let order = new Order(
-                            response[i]._id,
-                            response[i].name,
-                            response[i].date,
-                            response[i].taxes,
-                            response[i].fees,
-                            response[i].ingredients,
-                            merchant
-                        );
-
-                        let cost = 0;
-                        for(let j = 0; j < order.ingredients.length; j++){
-                            cost += (order.ingredients[j].price / 100) * order.ingredients[j].quantity;
-                        }
-
-                        orderDiv.children[0].innerText = order.name;
-                        orderDiv.children[1].innerText = `${order.ingredients.length} items`;
-                        orderDiv.children[2].innerText = order.date.toLocaleDateString();
-                        orderDiv.children[3].innerText = `$${cost.toFixed(2)}`;
-                        orderDiv.onclick = ()=>{controller.openSidebar("orderDetails", order)};
-                        orderList.appendChild(orderDiv);
-                    }
-                }
-            })
-            .catch((err)=>{
-                banner.createError("UNABLE TO DISPLAY THE ORDERS");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    toggleDropdown: function(dropdown){
-        event.preventDefault();
-        let polyline = dropdown.parentElement.children[0].children[1].children[0].children[0];
-
-        if(dropdown.style.display === "none"){
-            dropdown.style.display = "block";
-            polyline.setAttribute("points", "18 15 12 9 6 15");
-        }else{
-            dropdown.style.display = "none";
-            polyline.setAttribute("points", "6 9 12 15 18 9");
-        }
-    }
-}
-
-module.exports = orders;
-},{}],17:[function(require,module,exports){
-let recipeBook = {
-    isPopulated: false,
-    recipeDivList: [],
-
-    display: function(Recipe){
-        if(!this.isPopulated){
-            this.populateRecipes();
-
-            if(merchant.pos !== "none"){
-                document.getElementById("posUpdateRecipe").onclick = ()=>{this.posUpdate(Recipe)};
-            }
-            document.getElementById("recipeSearch").oninput = ()=>{this.search()};
-            document.getElementById("recipeClearButton").onclick = ()=>{this.clearSorting()};
-
-            this.populateRecipes();
-
-            this.isPopulated = true;
-        }
-    },
-
-    populateRecipes: function(){
-        let recipeList = document.getElementById("recipeList");
-        let template = document.getElementById("recipe").content.children[0];
-
-        this.recipeDivList = [];
-        while(recipeList.children.length > 0){
-            recipeList.removeChild(recipeList.firstChild);
-        }
-
-        for(let i = 0; i < merchant.recipes.length; i++){
-            let recipeDiv = template.cloneNode(true);
-            recipeDiv.onclick = ()=>{controller.openSidebar("recipeDetails", merchant.recipes[i])};
-            recipeDiv._name = merchant.recipes[i].name;
-            recipeList.appendChild(recipeDiv);
-
-            recipeDiv.children[0].innerText = merchant.recipes[i].name;
-            recipeDiv.children[1].innerText = `$${(merchant.recipes[i].price / 100).toFixed(2)}`;
-
-            this.recipeDivList.push(recipeDiv);
-        }
-    },
-
-    search: function(){
-        let input = document.getElementById("recipeSearch").value.toLowerCase();
-        let recipeList = document.getElementById("recipeList");
-        let clearButton = document.getElementById("recipeClearButton");
-
-        let matchingRecipes = [];
-        for(let i = 0; i < this.recipeDivList.length; i++){
-            if(this.recipeDivList[i]._name.toLowerCase().includes(input)){
-                matchingRecipes.push(this.recipeDivList[i]);
-            }
-        }
-
-        while(recipeList.children.length > 0){
-            recipeList.removeChild(recipeList.firstChild);
-        }
-        for(let i = 0; i < matchingRecipes.length; i++){
-            recipeList.appendChild(matchingRecipes[i]);
-        }
-
-        if(input === ""){
-            clearButton.style.display = "none";
-        }else{
-            clearButton.style.display = "inline";
-        }
-    },
-
-    clearSorting: function(){
-        document.getElementById("recipeSearch").value = "";
-        this.search();
-    },
-
-    posUpdate: function(Recipe){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-        let url = `/recipe/update/${merchant.pos}`;
-
-        fetch(url, {
-            method: "GET",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-        })
-            .then(response => response.json())
-            .then((response)=>{
-                let newRecipes = [];
-                for(let i = 0; i < response.new.length; i++){
-                    newRecipes.push(new Recipe(
-                        response.new[i]._id,
-                        response.new[i].name,
-                        response.new[i].price,
-                        merchant,
-                        []
-                    ));
-                }
-                if(newRecipes.length > 0){
-                    merchant.editRecipes(newRecipes);
-                }
-
-                let removeRecipes = [];
-                for(let i = 0; i < response.removed.length; i++){
-                    for(let j = 0; j < merchant.recipes.length; j++){
-                        if(response.removed[i]._id === merchant.recipes[j].id){
-                            removeRecipes.push(merchant.recipes[j], true);
-                            break;
-                        }
-                    }
-                }
-                if(removeRecipes.length > 0){
-                    merchant.editRecipes(removeRecipes, true);
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG.  PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    }
-}
-
-module.exports = recipeBook;
-},{}],18:[function(require,module,exports){
-let recipeDetails = {
-    recipe: {},
-
-    display: function(recipe){
-        this.recipe = recipe;
-
-        document.getElementById("recipeName").style.display = "block";
-        document.getElementById("recipeNameIn").style.display = "none";
-        document.querySelector("#recipeDetails h1").innerText = recipe.name;
-
-        let ingredientList = document.getElementById("recipeIngredientList");
-        while(ingredientList.children.length > 0){
-            ingredientList.removeChild(ingredientList.firstChild);
-        }
-
-        let template = document.getElementById("recipeIngredient").content.children[0];
-        for(let i = 0; i < recipe.ingredients.length; i++){
-            ingredientDiv = template.cloneNode(true);
-
-            ingredientDiv.children[0].innerText = recipe.ingredients[i].ingredient.name;
-            ingredientDiv.children[2].innerText = `${recipe.ingredients[i].ingredient.convert(recipe.ingredients[i].quantity).toFixed(2)} ${recipe.ingredients[i].ingredient.unit}`;
-            ingredientDiv.ingredient = recipe.ingredients[i].ingredient;
-            ingredientDiv.name = recipe.ingredients[i].ingredient.name;
-
-            ingredientList.appendChild(ingredientDiv);
-        }
-
-        document.getElementById("addRecIng").style.display = "none";
-
-        let price = document.getElementById("recipePrice");
-        price.children[1].style.display = "block";
-        price.children[2].style.display = "none";
-        price.children[1].innerText = `$${(recipe.price / 100).toFixed(2)}`;
-
-        document.getElementById("recipeUpdate").style.display = "none";
-
-        document.getElementById("editRecipeBtn").onclick = ()=>{this.edit()};
-        if(merchant.pos === "none"){
-            document.getElementById("removeRecipeBtn").onclick = ()=>{this.remove()};
-        }
-        document.getElementById("addRecIng").onclick = ()=>{this.displayAddIngredient()};
-        document.getElementById("recipeUpdate").onclick = ()=>{this.update()};
-    },
-
-    edit: function(){
-        let ingredientDivs = document.getElementById("recipeIngredientList");
-
-        if(merchant.pos === "none"){
-            let name = document.getElementById("recipeName");
-            let nameIn = document.getElementById("recipeNameIn");
-            name.style.display = "none";
-            nameIn.style.display = "block";
-            nameIn.value = this.recipe.name;
-
-            let price = document.getElementById("recipePrice");
-            price.children[1].style.display = "none";
-            price.children[2].style.display = "block";
-            price.children[2].value = parseFloat((this.recipe.price / 100).toFixed(2));
-        }
-
-        for(let i = 0; i < ingredientDivs.children.length; i++){
-            let div = ingredientDivs.children[i];
-
-            div.children[2].innerText = this.recipe.ingredients[i].ingredient.unit;
-            div.children[1].style.display = "block";
-            div.children[1].value = this.recipe.ingredients[i].ingredient.convert(this.recipe.ingredients[i].quantity).toFixed(2);
-            div.children[3].style.display = "block";
-            div.children[3].onclick = ()=>{div.parentElement.removeChild(div)};
-        }
-
-        document.getElementById("addRecIng").style.display = "flex";
-        document.getElementById("recipeUpdate").style.display = "flex";
-    },
-
-    update: function(){
-        this.recipe.name = document.getElementById("recipeNameIn").value || this.recipe.name;
-        this.recipe.price = Math.round((document.getElementById("recipePrice").children[2].value * 100)) || this.recipe.price;
-        this.recipe.ingredients = [];
-
-        let divs = document.getElementById("recipeIngredientList").children;
-        for(let i = 0; i < divs.length; i++){
-            if(divs[i].name === "new"){
-                let select = divs[i].children[0];
-                this.recipe.ingredients.push({
-                    ingredient: select.options[select.selectedIndex].ingredient,
-                    quantity: controller.convertToMain(select.options[select.selectedIndex].ingredient.unit, divs[i].children[1].value)
-                });
-            }else{
-                this.recipe.ingredients.push({
-                    ingredient: divs[i].ingredient,
-                    quantity: controller.convertToMain(divs[i].ingredient.unit, divs[i].children[1].value)
-                });
-            }
-        }
-
-        let data = {
-            id: this.recipe.id,
-            name: this.recipe.name,
-            price: this.recipe.price,
-            ingredients: []
-        }
-
-        for(let i = 0; i < this.recipe.ingredients.length; i++){
-            data.ingredients.push({
-                ingredient: this.recipe.ingredients[i].ingredient.id,
-                quantity: this.recipe.ingredients[i].quantity
-            });
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/recipe/update", {
-            method: "PUT",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(data)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    window.merchant.editRecipes([this.recipe]);
-                    banner.createNotification("RECIPE UPDATE");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    remove: function(){
-        fetch(`/merchant/recipes/remove/${this.recipe.id}`, {
-            method: "DELETE"
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    merchant.editRecipes([this.recipe], true);
-                    banner.createNotification("RECIPE REMOVED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            });
-    },
-
-    displayAddIngredient: function(){
-        let template = document.getElementById("addRecIngredient").content.children[0].cloneNode(true);
-        template.name = "new";
-        document.getElementById("recipeIngredientList").appendChild(template);
-
-        let categories = window.merchant.categorizeIngredients();
-
-        for(let i = 0; i < categories.length; i++){
-            let optGroup = document.createElement("optgroup");
-            optGroup.label = categories[i].name;
-            template.children[0].appendChild(optGroup);
-
-            for(let j = 0; j < categories[i].ingredients.length; j++){
-                let option = document.createElement("option");
-                option.innerText = `${categories[i].ingredients[j].ingredient.name} (${categories[i].ingredients[j].ingredient.unit})`;
-                option.ingredient = categories[i].ingredients[j].ingredient;
-                optGroup.appendChild(option);
-            }
-        }
-    }
-}
-
-module.exports = recipeDetails;
-},{}],19:[function(require,module,exports){
-let transactionDetails = {
-    transaction: {},
-
-    display: function(transaction){
-        this.transaction = transaction;
-
-        let recipeList = document.getElementById("transactionRecipes");
-        let template = document.getElementById("transactionRecipe").content.children[0];
-        let totalRecipes = 0;
-        let totalPrice = 0;
-
-        while(recipeList.children.length > 0){
-            recipeList.removeChild(recipeList.firstChild);
-        }
-
-        for(let i = 0; i < transaction.recipes.length; i++){
-            let recipe = template.cloneNode(true);
-            let price = transaction.recipes[i].quantity * transaction.recipes[i].recipe.price;
-
-            recipe.children[0].innerText = transaction.recipes[i].recipe.name;
-            recipe.children[1].innerText = `${transaction.recipes[i].quantity} x $${parseFloat(transaction.recipes[i].recipe.price / 100).toFixed(2)}`;
-            recipe.children[2].innerText = `$${(price / 100).toFixed(2)}`;
-            recipeList.appendChild(recipe);
-
-            totalRecipes += transaction.recipes[i].quantity;
-            totalPrice += price;
-        }
-
-        let months = ["January", "Fecbruary", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-        let days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-        let dateString = `${days[transaction.date.getDay()]}, ${months[transaction.date.getMonth()]} ${transaction.date.getDate()}, ${transaction.date.getFullYear()}`;
-
-        document.getElementById("transactionDate").innerText = dateString;
-        document.getElementById("transactionTime").innerText = transaction.date.toLocaleTimeString();
-        document.getElementById("totalRecipes").innerText = `${totalRecipes} recipes`;
-        document.getElementById("totalPrice").innerText = `$${(totalPrice / 100).toFixed(2)}`;
-
-        if(merchant.pos === "none"){
-            document.getElementById("removeTransBtn").onclick = ()=>{this.remove()};
-        }
-    },
-
-    remove: function(){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch(`/transaction/${this.transaction.id}`, {
-            method: "delete",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-        })
-            .then(response => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    let ingredients = {};
-                    for(let i = 0; i < this.transaction.recipes.length; i++){
-                        let recipe = this.transaction.recipes[i];
-                        for(let j = 0; j < recipe.recipe.ingredients.length; j++){
-                            ingredient = recipe.recipe.ingredients[j];
-
-                            ingredients[ingredient.ingredient.id] = ingredient.quantity * recipe.quantity;
-                        }
-                    }
-
-                    merchant.editTransactions(this.transaction, ingredients, true);
-                    banner.createNotification("TRANSACTION REMOVED");
-                }
-            })
-            .catch((err)=>{
-                banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-}
-
-module.exports = transactionDetails;
-},{}],20:[function(require,module,exports){
-let transactions = {
-    isPopulated: false,
-
-    display: function(Transaction){
-        if(!this.isPopulated){
-            let transactionsList = document.getElementById("transactionsList");
-            let dateDropdown = document.getElementById("dateDropdown");
-            let recipeDropdown = document.getElementById("recipeDropDown");
-            let template = document.getElementById("transaction").content.children[0];
-
-            let now = new Date();
-            let monthAgo = new Date(now.getFullYear(), now.getMonth() - 1, now.getDate());
-            document.getElementById("transFilDate1").valueAsDate = monthAgo;
-            document.getElementById("transFilDate2").valueAsDate = now;
-
-            dateDropdown.style.display = "none";
-            recipeDropdown.style.display = "none";
-
-            document.getElementById("dateFilterBtn").onclick = ()=>{this.toggleDropdown(dateDropdown)};
-            document.getElementById("recipeFilterBtn").onclick = ()=>{this.toggleDropdown(recipeDropdown)};
-
-            while(recipeDropdown.children.length > 0){
-                recipeDropdown.removeChild(recipeDropdown.firstChild);
-            }
-
-            for(let i = 0; i < merchant.recipes.length; i++){
-                let checkbox = document.createElement("input");
-                checkbox.type = "checkbox";
-                checkbox.recipe = merchant.recipes[i];
-                recipeDropdown.appendChild(checkbox);
-
-                let label = document.createElement("label");
-                label.innerText = merchant.recipes[i].name;
-                label.for = checkbox;
-                recipeDropdown.appendChild(label);
-
-                let brk = document.createElement("br");
-                recipeDropdown.appendChild(brk);
-            }
-
-            while(transactionsList.children.length > 0){
-                transactionsList.removeChild(transactionsList.firstChild);
-            }
-
-            let i = 0
-            while(i < merchant.transactions.length && i < 100){
-                let transactionDiv = template.cloneNode(true);
-                let transaction = merchant.transactions[i];
-
-                transactionDiv.onclick = ()=>{controller.openSidebar("transactionDetails", transaction)};
-                transactionsList.appendChild(transactionDiv);
-
-                let totalRecipes = 0;
-                let totalPrice = 0;
-
-                for(let j = 0; j < merchant.transactions[i].recipes.length; j++){
-                    totalRecipes += merchant.transactions[i].recipes[j].quantity;
-                    totalPrice += merchant.transactions[i].recipes[j].recipe.price * merchant.transactions[i].recipes[j].quantity;
-                }
-
-                transactionDiv.children[0].innerText = `${merchant.transactions[i].date.toLocaleDateString()} ${merchant.transactions[i].date.toLocaleTimeString()}`;
-                transactionDiv.children[1].innerText = `${totalRecipes} recipes sold`;
-                transactionDiv.children[2].innerText = `$${(totalPrice / 100).toFixed(2)}`;
-
-                i++;
-            }
-
-            document.getElementById("transFormSubmit").onsubmit = ()=>{this.submitFilter(Transaction)};
-
-            this.isPopulated = true;
-        }
-    },
-
-    submitFilter: function(Transaction){
-        event.preventDefault();
-
-        let data = {
-            startDate: document.getElementById("transFilDate1").valueAsDate,
-            endDate: document.getElementById("transFilDate2").valueAsDate,
-            recipes: []
-        }
-
-        if(data.startDate >= data.endDate){
-            banner.createError("START DATE CANNOT BE AFTER END DATE");
-            return;
-        }
-
-        let recipeChoices = document.getElementById("recipeDropDown");
-        for(let i = 0; i < recipeChoices.children.length; i += 3){
-            if(recipeChoices.children[i].checked){
-                data.recipes.push(recipeChoices.children[i].recipe.id);
-            }
-        }
-
-        if(data.recipes.length === 0){
-            for(let i = 0; i < merchant.recipes.length; i++){
-                data.recipes.push(merchant.recipes[i].id);
-            }
-        }
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/transaction", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json;charset=utf-8"
-            },
-            body: JSON.stringify(data)
-        })
-            .then((response) => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    banner.createError(response);
-                }else{
-                    let transactionList = document.getElementById("transactionsList");
-                    let template = document.getElementById("transaction").content.children[0];
-
-                    while(transactionList.children.length > 0){
-                        transactionList.removeChild(transactionList.firstChild);
-                    }
-
-                    for(let i = 0; i < response.length; i++){
-                        let transactionDiv = template.cloneNode(true);
-                        let recipeCount = 0;
-                        let cost = 0;
-                        let transaction = new Transaction(
-                            response[i]._id,
-                            response[i].date,
-                            response[i].recipes,
-                            merchant
-                        );
-
-                        for(let j = 0; j < transaction.recipes.length; j++){
-                            recipeCount += transaction.recipes[j].quantity;
-                            cost += transaction.recipes[j].quantity * transaction.recipes[j].recipe.price;
-                        }
-
-                        transactionDiv.children[0].innerText = `${transaction.date.toLocaleDateString()} ${transaction.date.toLocaleTimeString()}`;
-                        transactionDiv.children[1].innerText = `${recipeCount} recipes sold`;
-                        transactionDiv.children[2].innerText = `$${(cost / 100).toFixed(2)}`;
-                        transactionDiv.onclick = ()=>{controller.openSidebar("transactionDetails", transaction)};
-                        transactionList.appendChild(transactionDiv);
-                    }
-                }
-            })
-            .catch((err)=>{
-                banner.createError("UNABLE TO DISPLAY THE TRANSACTIONS");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    toggleDropdown: function(dropdown){
-        event.preventDefault();
-        let polyline = dropdown.parentElement.children[0].children[1].children[0].children[0];
-
-        if(dropdown.style.display === "none"){
-            dropdown.style.display = "block";
-            polyline.setAttribute("points", "18 15 12 9 6 15");
-        }else{
-            dropdown.style.display = "none";
-            polyline.setAttribute("points", "6 9 12 15 18 9");
-        }
-    }
-}
-
-module.exports = transactions;
-},{}]},{},[7]);
+console.error("Error: Parsing file /home/leemorgan/projects/subline/InventoryManagement/views/dashboardPage/js/Merchant.js: Identifier 'from' has already been declared (137:15)");

+ 159 - 35
views/dashboardPage/js/Merchant.js

@@ -1,3 +1,5 @@
+const transactions = require("./transactions");
+
 class Merchant{
     constructor(oldMerchant, transactions, modules){
         this._modules = modules;
@@ -69,12 +71,8 @@ class Merchant{
         return this._ingredients;
     }
 
-    addIngredient(ingredient){
-        if(ingredient.quantity <  0 || ingredient.quantity === undefined){
-            return false;
-        }
-
-        this.ingredients.push(ingredient);
+    addIngredient(ingredient, quantity){
+        this.ingredients.push({ingredient, quantity});
 
         this._modules.home.isPopulated = false;
         this._modules.ingredients.isPopulated = false;
@@ -92,6 +90,18 @@ class Merchant{
         this._modules.ingredients.isPopulated = false;
     }
 
+    updateIngredient(ingredient, quantity){
+        const index = this._ingredients.indexOf(ingredient);
+        if(index = undefined){
+            return false;
+        }
+
+        this._ingredients[index].quantity = quantity;
+
+        this._modules.home.isPopulated = false;
+        this._modules.ingredients.isPopulated = false;
+    }
+
     get recipes(){
         return this._recipes;
     }
@@ -115,12 +125,50 @@ class Merchant{
         this._modules.recipeBook.isPopulated = false;
     }
 
-    get transactions(){
-        return this._transactions;
+    getTransactions(from = 0, to = new Date()){
+        if(from > end){
+            return false;
+        }
+
+        if(from === 0){
+            from = this.transactions[0].date;
+        }
+
+        const {from, to} = this.getTransactionIndices(from, to);
+
+        return this.transactions.slice(from, to);
     }
 
     addTransaction(transaction){
         this._transactions.push(transaction);
+        this._transactions.sort((a, b)=>{
+            if(a.date > b.date){
+                return -1;
+            }
+            return 1;
+        });
+
+        let ingredients = {};
+        for(let i = 0; i < transaction.recipes.length; i++){
+            const recipe = transaction.recipes[i];
+            for(let j = 0; j < recipe.recipe.ingredients.length; j++){
+                const ingredient = recipe.ingredients[i];
+                if(ingredients[ingredient.ingredient.id]){
+                    ingredients[ingredient.ingredient.id] += recipe.quantity * ingredient.quantity;
+                }else{
+                    ingredients[ingredient.ingredient.id] = recipe.quantity * ingredient.quantity;
+                }
+            } 
+        }
+
+        const keys = Object.keys(ingredients);
+        for(let i = 0; i < keys.length; i++){
+            for(let j = 0; j < this._ingredients.length; j++){
+                if(keys[i] === this._ingredients[j].ingredient.id){
+                    this._ingredients.quantity -= ingredients[keys[i]];
+                }
+            }
+        }
 
         this._modules.home.isPopulated = false;
         this._modules.ingredients.isPopulated = false;
@@ -136,6 +184,28 @@ class Merchant{
 
         this._transactions.splice(index, 1);
 
+        let ingredients = {};
+        for(let i = 0; i < transaction.recipes.length; i++){
+            const recipe = transaction.recipes[i];
+            for(let j = 0; j < recipe.recipe.ingredients.length; j++){
+                const ingredient = recipe.recipe.ingredients[i];
+                if(ingredients[ingredient.ingredient.id]){
+                    ingredients[ingredient.ingredient.id] += ingredient.quantity * recipe.quantity;
+                }else{
+                    ingredients[ingredient.ingredient.id] = ingredient.quantity * recipe.quantity;
+                }
+            }
+        }
+
+        const keys = Object.keys(ingredients);
+        for(let i = 0; i < keys.length; i++){
+            for(let j = 0; j < this._ingredients.length; j++){
+                if(keys[i] === this._ingredients[j].ingredient.id){
+                    this._ingredients.quantity += ingredients[keys[i]];
+                }
+            }
+        }
+
         this._modules.home.isPopulated = false;
         this._modules.ingredients.isPopulated = false;
         this._modules.transactions.isPopulated = false;
@@ -146,9 +216,21 @@ class Merchant{
         return this._orders;
     }
 
-    addOrder(order){
+    addOrder(order, isNew = false){
         this._orders.push(order);
 
+        if(isNew){
+            for(let i = 0; i < order.ingredients.length; i++){
+                for(let j = 0; j < this._ingredients.length; j++){
+                    if(order.ingredients[i] === this._ingredients[j].ingredient){
+                        this._ingredients[j].quantity += order.ingredients[i].quantity;
+                        break;
+                    }
+                }
+            }
+        }
+
+        this._modules.ingredients.isPopulated = false;
         this._modules.orders.isPopulated = false;
     }
 
@@ -160,6 +242,15 @@ 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].quantity -= order.ingredients[i].quantity;
+                }
+            }
+        }
+
+        this._modules.ingredients.isPopulated = false;
         this._modules.orders.isPopulated = false;
     }
 
@@ -167,10 +258,15 @@ class Merchant{
         return this._units;
     }
 
-    revenue(indices){
-        let total = 0;
+    getRevenue(from, to = new Date()){
+        if(from === 0){
+            from = this.transactions[0].date;
+        }
 
-        for(let i = indices[0]; i <= indices[1]; i++){
+        const {start, end} = this.getTransactionIndices(from, to);
+
+        let total = 0;
+        for(let i = start; i <= end; i++){
             for(let j = 0; j < this.transactions[i].recipes.length; j++){
                 for(let k = 0; k < this.recipes.length; k++){
                     if(this.transactions[i].recipes[j].recipe === this.recipes[k]){
@@ -193,12 +289,12 @@ class Merchant{
             quantity: quantity of ingredient sold
         }]
     */
-    ingredientsSold(dateRange){
-        if(!dateRange){
-            return false;
+    getIngredientsSold(from = 0, to = new Date()){
+        if(from = 0){
+            from = this._ingredients[0].date;
         }
         
-        let recipes = this.recipesSold(dateRange);
+        let recipes = this.getRecipesSold(from, to);
         let ingredientList = [];
 
         for(let i = 0; i < recipes.length; i++){
@@ -225,14 +321,19 @@ class Merchant{
         return ingredientList;
     }
 
-    singleIngredientSold(dateRange, ingredient){
-        let total = 0;
+    getSingleIngredientSold(ingredient, from = 0, to = new Date()){
+        if(from === 0){
+            from = this._transactions[0].date;
+        }
 
-        for(let i = dateRange[0]; i < dateRange[1]; i++){
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
-                for(let k = 0; k < this.transactions[i].recipes[j].recipe.ingredients.length; k++){
-                    if(this.transactions[i].recipes[j].recipe.ingredients[k].ingredient === ingredient.ingredient){
-                        total += this.transactions[i].recipes[j].recipe.ingredients[k].quantity;
+        const {start, end} = this.getTransactionIndices(from, to);
+
+        let total = 0;
+        for(let i = start; i < end; i++){
+            for(let j = 0; j < this._transactions[i].recipes.length; j++){
+                for(let k = 0; k < this._transactions[i].recipes[j].recipe.ingredients.length; k++){
+                    if(this._transactions[i].recipes[j].recipe.ingredients[k].ingredient === ingredient.ingredient){
+                        total += this._transactions[i].recipes[j].recipe.ingredients[k].quantity;
                         break;
                     }
                 }
@@ -252,24 +353,29 @@ class Merchant{
             quantity: quantity of the recipe sold
         }]
     */
-    recipesSold(dateRange){
-        let recipeList = [];
+    getRecipesSold(from = 0, to = new Date()){
+        if(from = 0){
+            from = this._transactions[0].date;
+        }
 
-        for(let i = dateRange[0]; i <= dateRange[1]; i++){
-            for(let j = 0; j < this.transactions[i].recipes.length; j++){
+        const {start, end} = this.getTransactionIndices(from, to);
+
+        let recipeList = [];
+        for(let i = start; i <= end; i++){
+            for(let j = 0; j < this._transactions[i].recipes.length; j++){
                 let exists = false;
                 for(let k = 0; k < recipeList.length; k++){
-                    if(recipeList[k].recipe === this.transactions[i].recipes[j].recipe){
+                    if(recipeList[k].recipe === this._transactions[i].recipes[j].recipe){
                         exists = true;
-                        recipeList[k].quantity += this.transactions[i].recipes[j].quantity;
+                        recipeList[k].quantity += this._transactions[i].recipes[j].quantity;
                         break;
                     }
                 }
 
                 if(!exists){
                     recipeList.push({
-                        recipe: this.transactions[i].recipes[j].recipe,
-                        quantity: this.transactions[i].recipes[j].quantity
+                        recipe: this._transactions[i].recipes[j].recipe,
+                        quantity: this._transactions[i].recipes[j].quantity
                     });
                 }
             }
@@ -346,16 +452,34 @@ class Merchant{
     getRecipesForIngredient(ingredient){
         let recipes = [];
 
-        for(let i = 0; i < this.recipes.length; i++){
-            for(let j = 0; j < this.recipes[i].ingredients.length; j++){
-                if(this.recipes[i].ingredients[j].ingredient === ingredient){
-                    recipes.push(this.recipes[i]);
+        for(let i = 0; i < this._recipes.length; i++){
+            for(let j = 0; j < this._recipes[i].ingredients.length; j++){
+                if(this._recipes[i].ingredients[j].ingredient === ingredient){
+                    recipes.push(this._recipes[i]);
                 }
             }
         }
 
         return recipes;
     }
+
+    getTransactionIndices(from, to){
+        for(let i = 0; i < this.transactions.length; i++){
+            if(this.transactions[i].date >= from){
+                from = i;
+                break;
+            }
+        }
+        
+        for(let i = this.transactions.length - 1; i >= 0; i--){
+            if(transactions[i].date <= to){
+                to = i;
+                break;
+            }
+        }
+
+        return {from: from, to: to};
+    }
 }
 
 module.exports = Merchant;

+ 1 - 3
views/dashboardPage/js/analytics.js

@@ -11,9 +11,7 @@ let analytics = {
         if(this.transactions.length === 0 || this.newData === true){
             let startDate = new Date();
             startDate.setMonth(startDate.getMonth() - 1);
-            const dateIndices = controller.transactionIndices(merchant.transactions, startDate);
-
-            this.transactions = merchant.transactions.slice(dateIndices[0], dateIndices[1] + 1);
+            this.transactions = merchant.getTransactions(startDate);
         }
 
         let slider = document.getElementById("analSlider");

+ 43 - 43
views/dashboardPage/js/dashboard.js

@@ -245,26 +245,26 @@ controller = {
     Use for when any data is changed
     item = whatever is being updated
     */
-    updateData: function(item){
-        switch(item){
-            case "ingredient":
-                home.isPopulated = false;
-                ingredients.populateByProperty("category");
-                break;
-            case "recipe":
-                transactions.isPopulated = false;
-                recipeBook.populateRecipes();
-                break;
-            case "order":
-                orders.populate();
-                break;
-            case "transaction":
-                transactions.isPopulated = false;
-                transactions.display(Transaction);
-                analytics.newData = true;
-                break;
-        }
-    },
+    // updateData: function(item){
+    //     switch(item){
+    //         case "ingredient":
+    //             home.isPopulated = false;
+    //             ingredients.populateByProperty("category");
+    //             break;
+    //         case "recipe":
+    //             transactions.isPopulated = false;
+    //             recipeBook.populateRecipes();
+    //             break;
+    //         case "order":
+    //             orders.populate();
+    //             break;
+    //         case "transaction":
+    //             transactions.isPopulated = false;
+    //             transactions.display(Transaction);
+    //             analytics.newData = true;
+    //             break;
+    //     }
+    // },
 
     /*
     Gets the indices of two dates from transactions
@@ -276,29 +276,29 @@ controller = {
     Array containing starting index and ending index
     Note: Will return false if it cannot find both necessary dates
     */
-    transactionIndices(transactions, from, to = new Date()){
-        let indices = [];
-
-        for(let i = 0; i < transactions.length; i++){
-            if(transactions[i].date < to){
-                indices.push(i);
-                break;
-            }
-        }
-
-        for(let i = transactions.length - 1; i >= 0; i--){
-            if(transactions[i].date > from){
-                indices.push(i);
-                break;
-            }
-        }
-
-        if(indices.length < 2){
-            return false;
-        }
-
-        return indices;
-    },
+    // transactionIndices(transactions, from, to = new Date()){
+    //     let indices = [];
+
+    //     for(let i = 0; i < transactions.length; i++){
+    //         if(transactions[i].date < to){
+    //             indices.push(i);
+    //             break;
+    //         }
+    //     }
+
+    //     for(let i = transactions.length - 1; i >= 0; i--){
+    //         if(transactions[i].date > from){
+    //             indices.push(i);
+    //             break;
+    //         }
+    //     }
+
+    //     if(indices.length < 2){
+    //         return false;
+    //     }
+
+    //     return indices;
+    // },
 
     /*
     Converts the price of a unit to $/main unit

+ 12 - 12
views/dashboardPage/js/home.js

@@ -18,8 +18,8 @@ let home = {
         let firstOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1, 1);
         let lastMonthToDay = new Date(new Date().setMonth(today.getMonth() - 1));
 
-        let revenueThisMonth = merchant.revenue(controller.transactionIndices(merchant.transactions, firstOfMonth));
-        let revenueLastMonthToDay = merchant.revenue(controller.transactionIndices(merchant.transactions, firstOfLastMonth, lastMonthToDay));
+        const revenueThisMonth = merchant.getRevenue(firstOfMonth);
+        const revenueLastMonthToDay = merchant.getRevenue(firstOfLastMonth, lastMonthToDay);
 
         document.getElementById("revenue").innerText = `$${revenueThisMonth.toLocaleString("en")}`;
 
@@ -39,22 +39,20 @@ let home = {
         let monthAgo = new Date();
         monthAgo.setMonth(monthAgo.getMonth() - 1);
         
-        let dateIndices = controller.transactionIndices(merchant.transactions, monthAgo);
-
         let revenue = [];
         let dates = [];
         let dayRevenue = 0;
-        let currentDate = merchant.transactions[dateIndices[0]].date;
-        for(let i = dateIndices[0]; i < dateIndices[1]; i++){
-            if(merchant.transactions[i].date.getDate() !== currentDate.getDate()){
+        const transactions = merchant.getTransactions(monthAgo);
+        for(let i = 0; i < transactions.length; i++){
+            if(transactions[i].date.getDate() !== currentDate.getDate()){
                 revenue.push(dayRevenue / 100);
                 dayRevenue = 0;
                 dates.push(currentDate);
-                currentDate = merchant.transactions[i].date;
+                currentDate = transactions[i].date;
             }
 
-            for(let j = 0; j < merchant.transactions[i].recipes.length; j++){
-                const recipe = merchant.transactions[i].recipes[j];
+            for(let j = 0; j < transactions[i].recipes.length; j++){
+                const recipe = transactions[i].recipes[j];
 
                 dayRevenue += recipe.recipe.price * recipe.quantity;
             }
@@ -142,7 +140,7 @@ let home = {
         let thisMonth = new Date();
         thisMonth.setDate(1);
 
-        let ingredientList = merchant.ingredientsSold(controller.transactionIndices(merchant.transactions, thisMonth));
+        const ingredientList = merchant.getIngredientsSold(thisMonth);
         if(ingredientList !== false){
             ingredientList.sort((a, b)=>{
                 if(a.quantity < b.quantity){
@@ -260,7 +258,9 @@ let home = {
                     if(typeof(response) === "string"){
                         banner.createError(response);
                     }else{
-                        merchant.editIngredients(changes);
+                        for(let i = 0; i < changes.length; i++){
+                            merchant.updateIngredient(changes[i].ingredient, changes[i].quantity);
+                        }
                         banner.createNotification("INGREDIENTS UPDATED");
                     }
                 })

+ 4 - 8
views/dashboardPage/js/ingredientDetails.js

@@ -48,13 +48,8 @@ let ingredientDetails = {
         for(let i = 1; i < 31; i++){
             let endDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i)
             let startDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i - 1);
-            let indices = controller.transactionIndices(merchant.transactions, startDay, endDay);
 
-            if(indices === false){
-                quantities.push(0);
-            }else{
-                quantities.push(merchant.singleIngredientSold(indices, ingredient));
-            }
+            quantities.push(merchant.getSingleIngredientSold(startDay, endDay, ingredient));
         }
 
         let sum = 0;
@@ -138,8 +133,8 @@ let ingredientDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
+                    merchant.removeIngredient(this.ingredient);
                     banner.createNotification("INGREDIENT REMOVED");
-                    merchant.editIngredients([this.ingredient], true);
                 }
             })
             .catch((err)=>{})
@@ -251,7 +246,8 @@ let ingredientDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    merchant.editIngredients([this.ingredient]);
+                    merchant.updateIngredient(this.ingredient, this.ingredient.quantity);
+                    //ingredient updates
 
                     this.display(this.ingredient);
 

+ 12 - 13
views/dashboardPage/js/newIngredient.js

@@ -66,19 +66,18 @@ let newIngredient = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    merchant.editIngredients([{
-                        ingredient: new Ingredient(
-                            response.ingredient._id,
-                            response.ingredient.name,
-                            response.ingredient.category,
-                            response.ingredient.unitType,
-                            response.defaultUnit,
-                            merchant,
-                            response.ingredient.specialUnit,
-                            response.ingredient.unitSize
-                        ),
-                        quantity: response.quantity
-                    }]);
+                    const ingredient = new Ingredient(
+                        response.ingredient._id,
+                        response.ingredient.name,
+                        response.ingredient.category,
+                        response.ingredient.unitType,
+                        response.defaultUnit,
+                        merchant,
+                        response.ingredient.specialUnit,
+                        response.ingredient.unitSize
+                    )
+
+                    merchant.addIngredient(ingredient, response.quantity);
 
                     banner.createNotification("INGREDIENT CREATED");
                 }

+ 2 - 2
views/dashboardPage/js/newOrder.js

@@ -120,8 +120,8 @@ let newOrder = {
                         merchant
                     );
 
-                    merchant.editOrders([order]);
-                    merchant.editIngredients(order.ingredients, false, true);
+                    merchant.addOrder(order, true);
+                    
                     banner.createNotification("NEW ORDER CREATED");
                 }
             })

+ 2 - 2
views/dashboardPage/js/newRecipe.js

@@ -88,7 +88,7 @@ let newRecipe = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    let recipe = new Recipe(
+                    const recipe = new Recipe(
                         response._id,
                         response.name,
                         response.price,
@@ -96,7 +96,7 @@ let newRecipe = {
                         merchant,
                     );
                     
-                    merchant.editRecipes([recipe]);
+                    merchant.addRecipe(recipe);
                     banner.createNotification("RECIPE CREATED");
                 }
             })

+ 3 - 12
views/dashboardPage/js/newTransaction.js

@@ -41,16 +41,6 @@ let newTransaction = {
                     recipe: recipe.id,
                     quantity: quantity
                 });
-
-                for(let j = 0; j < recipe.ingredients.length; j++){
-                    const ingredient = recipe.ingredients[j];
-
-                    if(data.ingredientUpdates[ingredient.ingredient.id]){
-                        data.ingredientUpdates[ingredient.ingredient.id] += ingredient.quantity * quantity;
-                    }else{
-                        data.ingredientUpdates[ingredient.ingredient.id] = ingredient.quantity * quantity;
-                    }
-                }
             }else if(quantity < 0){
                 banner.createError("CANNOT HAVE NEGATIVE VALUES");
                 return;
@@ -73,13 +63,14 @@ let newTransaction = {
                     if(typeof(response) === "string"){
                         banner.createError(response);
                     }else{
-                        let transaction = new Transaction(
+                        const transaction = new Transaction(
                             response._id,
                             response.date,
                             response.recipes,
                             merchant
                         );
-                        merchant.editTransactions(transaction, data.ingredientUpdates);
+
+                        merchant.addTransaction(transaction);
                         banner.createNotification("NEW TRANSACTION CREATED, INGREDIENTS UPDATED ACCORDINGLY");
                     }
                 })

+ 1 - 5
views/dashboardPage/js/orderDetails.js

@@ -59,12 +59,8 @@ let orderDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    for(let i = 0; i < order.ingredients.length; i++){
-                        order.ingredients[i].quantity = -order.ingredients[i].quantity;
-                    }
 
-                    merchant.editOrders([order], true);
-                    merchant.editIngredients(order.ingredients, false, true);
+                    merchant.removeOrder(order);
                     banner.createNotification("ORDER REMOVED");
                 }
             })

+ 4 - 5
views/dashboardPage/js/orders.js

@@ -18,9 +18,8 @@ let orders = {
                     if(typeof(response) === "string"){
                         banner.createError(response);
                     }else{
-                        let newOrders = [];
                         for(let i = 0; i < response.length; i++){
-                            newOrders.push(new Order(
+                            const order = new Order(
                                 response[i]._id,
                                 response[i].name,
                                 response[i].date,
@@ -28,12 +27,12 @@ let orders = {
                                 response[i].fees,
                                 response[i].ingredients,
                                 merchant
-                            ));
+                            );
+
+                            merchant.addOrder(order);
                         }
-                        merchant.editOrders(newOrders);
 
                         document.getElementById("orderSubmitForm").onsubmit = ()=>{this.submitFilter(Order)};
-
                         this.isFetched = true;
                     }
                 })

+ 13 - 16
views/dashboardPage/js/recipeBook.js

@@ -84,31 +84,28 @@ let recipeBook = {
         })
             .then(response => response.json())
             .then((response)=>{
-                let newRecipes = [];
                 for(let i = 0; i < response.new.length; i++){
-                    newRecipes.push(new Recipe(
+                    const recipe = new Recipe(
                         response.new[i]._id,
                         response.new[i].name,
                         response.new[i].price,
                         merchant,
                         []
-                    ));
-                }
-                if(newRecipes.length > 0){
-                    merchant.editRecipes(newRecipes);
+                    );
+
+                    merchant.addRecipe(recipe);
                 }
 
-                let removeRecipes = [];
                 for(let i = 0; i < response.removed.length; i++){
-                    for(let j = 0; j < merchant.recipes.length; j++){
-                        if(response.removed[i]._id === merchant.recipes[j].id){
-                            removeRecipes.push(merchant.recipes[j], true);
-                            break;
-                        }
-                    }
-                }
-                if(removeRecipes.length > 0){
-                    merchant.editRecipes(removeRecipes, true);
+                    const recipe = new Recipe(
+                        response.removed[i]._id,
+                        response.removed[i].name,
+                        response.removed[i].price,
+                        merchant,
+                        []
+                    );
+
+                    merchant.removeRecipe(recipe);
                 }
             })
             .catch((err)=>{

+ 3 - 3
views/dashboardPage/js/recipeDetails.js

@@ -122,7 +122,7 @@ let recipeDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    window.merchant.editRecipes([this.recipe]);
+                    //Edit Recipe here
                     banner.createNotification("RECIPE UPDATE");
                 }
             })
@@ -143,7 +143,7 @@ let recipeDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    merchant.editRecipes([this.recipe], true);
+                    merchant.removeRecipe(this.recipe);
                     banner.createNotification("RECIPE REMOVED");
                 }
             })
@@ -157,7 +157,7 @@ let recipeDetails = {
         template.name = "new";
         document.getElementById("recipeIngredientList").appendChild(template);
 
-        let categories = window.merchant.categorizeIngredients();
+        let categories = merchant.categorizeIngredients();
 
         for(let i = 0; i < categories.length; i++){
             let optGroup = document.createElement("optgroup");

+ 1 - 11
views/dashboardPage/js/transactionDetails.js

@@ -55,17 +55,7 @@ let transactionDetails = {
                 if(typeof(response) === "string"){
                     banner.createError(response);
                 }else{
-                    let ingredients = {};
-                    for(let i = 0; i < this.transaction.recipes.length; i++){
-                        let recipe = this.transaction.recipes[i];
-                        for(let j = 0; j < recipe.recipe.ingredients.length; j++){
-                            ingredient = recipe.recipe.ingredients[j];
-
-                            ingredients[ingredient.ingredient.id] = ingredient.quantity * recipe.quantity;
-                        }
-                    }
-
-                    merchant.editTransactions(this.transaction, ingredients, true);
+                    merchant.removeTransaction(this.transaction);
                     banner.createNotification("TRANSACTION REMOVED");
                 }
             })

+ 0 - 213
views/shared/validation.js

@@ -1,213 +0,0 @@
-let validator = {
-    /*
-    ingredient = {
-        ingredient: {
-            name: name of ingredient,
-            category: category of ingredient,
-            unit: unit measure for ingredient
-        },
-        quantity: quantity of ingredient for current merchant
-    }
-    */
-    ingredient: function(ingredient, createBanner = true){
-        let errors = [];
-        if(!this.isSanitary(ingredient.ingredient.name) ||
-        !this.isSanitary(ingredient.ingredient.category) ||
-        !this.isSanitary(ingredient.ingredient.unit)){
-            errors.push("Contains illegal characters");
-        }
-
-        if(isNaN(ingredient.quantity) || ingredient.quantity === ""){
-            errors.push("Must enter a valid number");
-        }
-
-        if(ingredient.quantity < 0){
-            banner.createError("Quantity cannot be a negative number");
-        }
-
-        if(errors.length > 0){
-            if(createBanner){
-                for(let i = 0; i < errors.length; i++){
-                    banner.createError(errors[i]);
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    },
-
-    ingredientQuantity: function(quantity, createBanner = true){
-        let errors = [];
-
-        if(isNaN(quantity) || quantity === ""){
-            errors.push("Must enter a valid number");
-        }
-
-        if(quantity < 0){
-            banner.createError("Quantity cannot be a negative number");
-        }
-
-        if(errors.length > 0){
-            if(createBanner){
-                for(let i = 0; i < errors.length; i++){
-                    banner.createError(errors[i]);
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    },
-
-    merchant: {
-        password: function(pass, confirmPass, createBanner = true){
-            if(pass !== confirmPass){
-                if(createBanner){
-                    banner.createError("Your passwords do not match");
-                }
-                return false;
-            }
-
-            if(pass.length < 15){
-                if(createBanner){
-                    banner.createError("Your password must contain at least 15 characters");
-                }
-                return false;
-            }
-
-            return true;
-        }
-    },
-
-    transaction: {
-        date: function(from, to = new Date(), createBanner = true){
-            let errors = [];
-            let today = new Date();
-
-            if(from > to){
-                errors.push("Starting date must be before ending date");
-            }
-
-            if(from > today || to > today.setDate(today.getDate() + 1)){
-                errors.push("Cannot choose a date in the future");
-            }
-
-            if(errors.length > 0){
-                if(createBanner){
-                    for(let i = 0; i < errors.length; i++){
-                        banner.createError(errors[i]);
-                    }
-
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    },
-
-    recipe: function(newRecipe, createBanner = true){
-        let errors = [];
-
-        if(!validator.isSanitary(newRecipe.name)){
-            errors.push("Name contains invalid characters");
-        }
-
-        if(newRecipe.price < 0){
-            errors.push("Price must contain a non-negative number");
-        }
-
-        if(newRecipe.ingredients.length === 0){
-            errors.push("Must include at least one ingredient");
-        }
-
-        let checkSet = new Set();
-        for(let i = 0; i < newRecipe.ingredients.length; i++){
-            if(newRecipe.ingredients[i].quantity < 0){
-                errors.push("Quantity must contain a non-negative number");
-                break;
-            }
-
-            checkSet.add(newRecipe.ingredients[i].ingredient);
-        }
-
-        if(checkSet.size !== newRecipe.ingredients.length){
-            errors.push("Recipe contains duplicate ingredients");
-        }
-
-        if(isNaN(newRecipe.price) || newRecipe.price === "" || newRecipe.price< 0){
-            errors.push("Must enter a valid price");
-        }
-
-        if(errors.length > 0){
-            if(createBanner){
-                for(let i = 0; i < errors.length; i++){
-                    banner.createError(errors[i]);
-                }
-
-                return false;
-            }
-        }
-
-        return true;
-    },
-
-    order: function(order, createBanner = true){
-        let errors = [];
-
-        if(!validator.isSanitary(order.name, false)){
-            errors.push("Your string contains illegal characters");
-        }
-
-        let now = new Date()
-        if(order.date > now){
-            errors.push("Cannot have a date/time in the future");
-        }
-
-        for(let i = 0; i < order.ingredients.length; i++){
-            if(order.ingredients[i].quantity < 0){
-                errors.push("Quantity cannot be negative");
-                break;
-            }
-
-            if(order.ingredients[i].price < 0){
-                errors.push("Price cannot be negative");
-                break;
-            }
-
-            if(order.ingredients[i].price === "" || order.ingredients[i].quantity === ""){
-                errors.push("Incomplete information");
-            }
-        }
-
-        if(errors.length > 0){
-            if(createBanner){
-                for(let i = 0; i < errors.length; i++){
-                    banner.createError(errors[i]);
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    },
-
-    isSanitary: function(str, createBanner = true){
-        let disallowed = ["\\", "<", ">", "$", "{", "}", "(", ")"];
-
-        for(let i = 0; i < disallowed.length; i++){
-            if(str.includes(disallowed[i])){
-                if(createBanner){
-                    banner.createError("Your string contains illegal characters");
-                }
-                return false;
-            }
-        }
-
-        return true;
-    }
-}