Merge branch 'prod' of https://github.com/AMTuttle02/HomeTeamCreativity into prod

Author: AMTuttle02

react/src/CheckoutDetails.jsx

@@ -48,6 +48,7 @@ function CheckoutDetails() {
                     body: JSON.stringify({ order_id: oID }),
                 });
                 const data = await response.json();
+                console.log(data);
 
                 for (let i = 0; i < data.length; ++i) {
                     let categories = data[i].categories
@@ -57,7 +58,7 @@ function CheckoutDetails() {
 
                     for (let j = 0; j < categories.length; ++j) {
                         if (discount.categories.includes(categories[j])) {
-                            orderTotal += (data[i].price * 1);
+                            orderTotal += (data[i].price * 1 * data[i].product_quantity);
                             j = categories.length;
                         }
                     }
@@ -67,16 +68,24 @@ function CheckoutDetails() {
             }
         }
 
+        console.log("Initial");
+        console.log(finalAmount);
         if (discount.type === 'percent') {
             let percent = (discount.amount * 1) / 100;
             finalAmount = (orderTotal * 1 * percent).toFixed(2);
-            if (finalAmount * 1 > discount.maximum_allowed * 1) {
-                finalAmount = (discount.maximum_allowed * 1).toFixed(2);
-            }
         } else if (discount.type === 'amount') {
             finalAmount = (discount.amount * 1).toFixed(2);
         }
 
+        console.log("After calculation")
+
+        if (finalAmount * 1 > discount.maximum_allowed * 1) {
+            finalAmount = (discount.maximum_allowed * 1).toFixed(2);
+        }
+        if (orderTotal * 1 < discount.minimum_required * 1) {
+            finalAmount = 0;
+        }
+
         if (finalAmount > 0) {
             setDiscount(finalAmount);
         } else {
@@ -95,10 +104,6 @@ function CheckoutDetails() {
             .then((response) => response.json())
             .then((data) => {
               if (data) {
-                // verify minimum amount required is hit
-                if (order.total_cost < data.minimum_required) {
-                    throw(order.total_cost);
-                }
                 // verify code is active
                 if (currentDateTime.toLocaleString() < formatTime(data.start_time) || currentDateTime.toLocaleString() > formatTime(data.end_time)) {
                     throw(data.start_time + " - " + data.end_time);
@@ -193,10 +198,11 @@ function CheckoutDetails() {
             else if (userId) {
                 oID = 0;
             }
+            const total = onlineTotalCost(order.total_cost).toFixed(2);
             fetch("/api/updateOrderInfo.php", {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ first, last, email, shipping, dbLocation, order_id: oID}),
+                body: JSON.stringify({ first, last, email, shipping, dbLocation, order_id: oID, total, discount}),
             })
             .then((response) => response.json())
             .then((data) => {