Bug Fix: uploading an ingredient spreadsheet was not correctly handling bottle items.

controllers/ingredientData.js

@@ -197,6 +197,9 @@ module.exports = {
             }
 
             if(array[i][locations.bottle] === true){
+                let quantity = array[i][locations.quantity] * array[i][locations.bottleSize];
+                merchantItem.quantity = helper.convertQuantityToBaseUnit(quantity, array[i][locations.unit]);
+                
                 ingredient.unitType = "volume";
                 ingredient.specialUnit = "bottle";
                 ingredient.unitSize = helper.convertQuantityToBaseUnit(array[i][locations.bottleSize], array[i][locations.unit]);

controllers/orderData.js

@@ -6,6 +6,7 @@ const helper = require("./helper.js");
 const ObjectId = require("mongoose").Types.ObjectId;
 const xlsx = require("xlsx");
 const fs = require("fs");
+const { base } = require("../models/merchant.js");
 
 module.exports = {
     /*