Przeglądaj źródła

Update frontend submiting of new order to include taxes and fees

Lee Morgan 5 lat temu
rodzic
commit
7026dfef85

+ 4 - 5
views/dashboardPage/bundle.js

@@ -2004,21 +2004,20 @@ let newOrder = {
 
     submit: function(Order){
         let date = document.getElementById("newOrderDate").value;
-        let time = document.getElementById("newOrderTime").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;
         }
-        
-        if(time !== ""){
-            date = `${date}T${time}`;
-        }
 
         let data = {
             name: document.getElementById("newOrderName").value,
             date: date,
+            taxes: taxes,
+            fees: fees,
             ingredients: []
         }
 

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

@@ -48,21 +48,20 @@ let newOrder = {
 
     submit: function(Order){
         let date = document.getElementById("newOrderDate").value;
-        let time = document.getElementById("newOrderTime").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;
         }
-        
-        if(time !== ""){
-            date = `${date}T${time}`;
-        }
 
         let data = {
             name: document.getElementById("newOrderName").value,
             date: date,
+            taxes: taxes,
+            fees: fees,
             ingredients: []
         }
 

+ 0 - 4
views/dashboardPage/sidebars/newOrder.ejs

@@ -24,10 +24,6 @@
         <input id="newOrderDate" type="date">
     </label>
 
-    <label>TIME:
-        <input id="newOrderTime" type="time">
-    </label>
-
     <label>TAXES:
         <input id="orderTaxes" type="number" min="0" step="0.01">
     </label>