Просмотр исходного кода

Main orders page displays price including taxes and fees

Lee Morgan 5 лет назад
Родитель
Сommit
491b8426eb

+ 2 - 0
controllers/orderData.js

@@ -32,6 +32,8 @@ module.exports = {
             {$project: {
                 name: 1,
                 date: 1,
+                taxes: 1,
+                fees: 1,
                 ingredients: 1
             }}
         ])

+ 3 - 1
views/dashboardPage/bundle.js

@@ -445,6 +445,8 @@ class Order{
         this.id = id;
         this.name = name;
         this.date = new Date(date);
+        this.taxes = taxes;
+        this.fees = fees;
         this.ingredients = [];
         this.parent = parent;
 
@@ -2472,7 +2474,7 @@ let orders = {
             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).toFixed(2)}`;
+            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);

+ 2 - 0
views/dashboardPage/js/Order.js

@@ -3,6 +3,8 @@ class Order{
         this.id = id;
         this.name = name;
         this.date = new Date(date);
+        this.taxes = taxes;
+        this.fees = fees;
         this.ingredients = [];
         this.parent = parent;
 

+ 1 - 1
views/dashboardPage/js/orders.js

@@ -88,7 +88,7 @@ let orders = {
             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).toFixed(2)}`;
+            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);