Pārlūkot izejas kodu

New orders and new transactions now set the date to the beginning of the day on the frontend before sending the data to the backend.

Lee Morgan 5 gadi atpakaļ
vecāks
revīzija
8cd32f3ed3

+ 10 - 6
views/dashboardPage/bundle.js

@@ -2092,15 +2092,17 @@ let newOrder = {
     },
 
     submit: function(){
-        let date = document.getElementById("newOrderDate").value;
+        let date = document.getElementById("newOrderDate").valueAsDate;
         let taxes = document.getElementById("orderTaxes").value * 100;
         let fees = document.getElementById("orderFees").value * 100;
         let ingredients = document.getElementById("selectedIngredientList").children;
-
-        if(date === ""){
+        
+        if(date === null){
             controller.createBanner("DATE IS REQUIRED FOR ORDERS", "error");
             return;
         }
+    
+        date.setHours(0, 0, 0, 0);
 
         let data = {
             name: document.getElementById("newOrderName").value,
@@ -2412,11 +2414,13 @@ let newTransaction = {
     submit: function(Transaction){
         let recipeDivs = document.getElementById("newTransactionRecipes");
         let date = document.getElementById("newTransactionDate").valueAsDate;
-        
-        if(date > new Date()){
-            controller.createBanner("CANNOT HAVE A DATE IN THE FUTURE", "error");
+
+        if(date === null){
+            controller.createBanner("DATE IS REQUIRED FOR TRANSACTIONS", "error");
             return;
         }
+
+        date.setHours(0, 0, 0, 0);
         
         let data = {
             date: date,

+ 5 - 3
views/dashboardPage/js/sidebars/newOrder.js

@@ -43,15 +43,17 @@ let newOrder = {
     },
 
     submit: function(){
-        let date = document.getElementById("newOrderDate").value;
+        let date = document.getElementById("newOrderDate").valueAsDate;
         let taxes = document.getElementById("orderTaxes").value * 100;
         let fees = document.getElementById("orderFees").value * 100;
         let ingredients = document.getElementById("selectedIngredientList").children;
-
-        if(date === ""){
+        
+        if(date === null){
             controller.createBanner("DATE IS REQUIRED FOR ORDERS", "error");
             return;
         }
+    
+        date.setHours(0, 0, 0, 0);
 
         let data = {
             name: document.getElementById("newOrderName").value,

+ 5 - 3
views/dashboardPage/js/sidebars/newTransaction.js

@@ -22,11 +22,13 @@ let newTransaction = {
     submit: function(Transaction){
         let recipeDivs = document.getElementById("newTransactionRecipes");
         let date = document.getElementById("newTransactionDate").valueAsDate;
-        
-        if(date > new Date()){
-            controller.createBanner("CANNOT HAVE A DATE IN THE FUTURE", "error");
+
+        if(date === null){
+            controller.createBanner("DATE IS REQUIRED FOR TRANSACTIONS", "error");
             return;
         }
+
+        date.setHours(0, 0, 0, 0);
         
         let data = {
             date: date,