Update front and backend models to include taxes and fees. Add new inputs to new order.

models/order.js

@@ -12,6 +12,14 @@ const OrderSchema = new mongoose.Schema({
         default: Date.now,
         required: true
     },
+    taxes: {
+        type: Number,
+        required: true
+    },
+    fees: {
+        type: Number,
+        required: true
+    },
     ingredients: [{
         ingredient: {
             type: mongoose.Schema.Types.ObjectId,

views/dashboardPage/bundle.js

@@ -441,7 +441,7 @@ class Merchant{
 module.exports = Merchant;
 },{"./Ingredient.js":1,"./Recipe.js":4,"./Transaction.js":5}],3:[function(require,module,exports){
 class Order{
-    constructor(id, name, date, ingredients, parent){
+    constructor(id, name, date, taxes, fees, ingredients, parent){
         this.id = id;
         this.name = name;
         this.date = new Date(date);
@@ -2071,6 +2071,8 @@ let newOrder = {
                         response._id,
                         response.name,
                         response.date,
+                        response.taxes,
+                        response.fees,
                         response.ingredients,
                         merchant
                     );
@@ -2406,6 +2408,8 @@ let orders = {
                                 response[i]._id,
                                 response[i].name,
                                 response[i].date,
+                                response[i].taxes,
+                                response[i].fees,
                                 response[i].ingredients,
                                 merchant
                             ));
@@ -2531,6 +2535,8 @@ let orders = {
                             response[i]._id,
                             response[i].name,
                             response[i].date,
+                            response[i].taxes,
+                            response[i].fees,
                             response[i].ingredients,
                             merchant
                         );

views/dashboardPage/js/Order.js

@@ -1,5 +1,5 @@
 class Order{
-    constructor(id, name, date, ingredients, parent){
+    constructor(id, name, date, taxes, fees, ingredients, parent){
         this.id = id;
         this.name = name;
         this.date = new Date(date);

views/dashboardPage/js/newOrder.js

@@ -115,6 +115,8 @@ let newOrder = {
                         response._id,
                         response.name,
                         response.date,
+                        response.taxes,
+                        response.fees,
                         response.ingredients,
                         merchant
                     );

views/dashboardPage/js/orders.js

@@ -23,6 +23,8 @@ let orders = {
                                 response[i]._id,
                                 response[i].name,
                                 response[i].date,
+                                response[i].taxes,
+                                response[i].fees,
                                 response[i].ingredients,
                                 merchant
                             ));
@@ -148,6 +150,8 @@ let orders = {
                             response[i]._id,
                             response[i].name,
                             response[i].date,
+                            response[i].taxes,
+                            response[i].fees,
                             response[i].ingredients,
                             merchant
                         );

views/dashboardPage/sidebars/newOrder.ejs

@@ -28,6 +28,14 @@
         <input id="newOrderTime" type="time">
     </label>
 
+    <label>TAXES:
+        <input id="orderTaxes" type="number" min="0" step="0.01">
+    </label>
+
+    <label>OTHER FEES:
+        <input id="orderFees" type="number" min="0" step="0.01">
+    </label>
+
     <div id="selectedIngredientList"></div>
 
     <button id="submitNewOrder" class="button">CREATE</button>