From c530e8c7d7fa8bee54d2c7b5937ab634cc0ef6aa Mon Sep 17 00:00:00 2001 From: Jun Barroga Date: Fri, 5 Apr 2024 11:08:15 +0800 Subject: [PATCH 1/2] Modified the Application of Price Matrix When Updating Order --- product-left-sidebar.php | 70 +++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/product-left-sidebar.php b/product-left-sidebar.php index ca03584..9c6821e 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -1004,49 +1004,47 @@ if (isset($_GET['id'])) { var updatedQuantity = existingQuantity + newQuantity; // Check if the updated quantity exceeds the previous price matrix - var newProductPrice = productPrice; // Assume the initial productPrice - var foundNewPrice = false; - if (priceMatrix.length > 0) { - for (var i = 0; i < priceMatrix.length; i++) { - for (var j = 0; j < priceMatrix[i].length; j++) { - if (updatedQuantity <= parseInt(priceMatrix[i][j].quantity)) { - newProductPrice = parseFloat(priceMatrix[i][j].price); - foundNewPrice = true; - break; - } - } - if (foundNewPrice) { - break; - } - } + var newProductPrice = productPrice; +var foundNewPrice = false; +if (priceMatrix.length > 0) { + for (var i = 0; i < priceMatrix.length; i++) { + for (var j = 0; j < priceMatrix[i].length; j++) { + if (updatedQuantity <= parseInt(priceMatrix[i][j].quantity)) { + newProductPrice = parseFloat(priceMatrix[i][j].price); + foundNewPrice = true; + break; } + } + if (foundNewPrice) { + break; + } + } +} - // Update product price if a new price is found in the price matrix - if (foundNewPrice) { - productPrice = newProductPrice; - } +// Update product price if a new price is found in the price matrix +if (foundNewPrice) { + productPrice = newProductPrice; +} - var updateData = { - quantity: updatedQuantity, - price: productPrice // Update the price for the item - }; +var updateData = { + quantity: updatedQuantity, + price: productPrice // Update the price for the item +}; - updateOrderXhr.send(JSON.stringify(updateData)); +updateOrderXhr.send(JSON.stringify(updateData)); - var patchTotalAmountXhr = new XMLHttpRequest(); - patchTotalAmountXhr.open("PATCH", `https:///api/v1/orders/${orderId}`, true); - patchTotalAmountXhr.setRequestHeader("Content-Type", "application/json"); - patchTotalAmountXhr.setRequestHeader("Authorization", "Bearer " + token); +// Patch the total amount of the order with the updated price and quantity +var patchTotalAmountXhr = new XMLHttpRequest(); +patchTotalAmountXhr.open("PATCH", `https:///api/v1/orders/${orderId}`, true); +patchTotalAmountXhr.setRequestHeader("Content-Type", "application/json"); +patchTotalAmountXhr.setRequestHeader("Authorization", "Bearer " + token); - var originalPrice = document.getElementById("productPrice").innerText; - var totalAmount = originalPrice * updatedQuantity; - console.log(originalPrice); - console.log(totalAmount); - var patchData = { - total_amount: totalAmount - }; +var totalAmount = productPrice * updatedQuantity; +var patchData = { + total_amount: totalAmount +}; - patchTotalAmountXhr.send(JSON.stringify(patchData)); +patchTotalAmountXhr.send(JSON.stringify(patchData)); } -- 2.40.1 From d056602c30b90a7e54e5c2766d3d36f05c68e730 Mon Sep 17 00:00:00 2001 From: Jun Barroga Date: Tue, 16 Apr 2024 10:04:25 +0800 Subject: [PATCH 2/2] Apply Price Matrix, Admin Payout Token Renew, Admin Login Redirections --- admin/login.php | 2 +- admin/login_action_admin.php | 41 +++++ admin/token-renew.php | 11 ++ admin/vendor-profile.php | 42 +++-- login_action.php | 2 +- product-left-sidebar.php | 307 +++++++++++++++++++---------------- 6 files changed, 249 insertions(+), 156 deletions(-) create mode 100644 admin/login_action_admin.php create mode 100644 admin/token-renew.php diff --git a/admin/login.php b/admin/login.php index 41be8d6..f3565b9 100644 --- a/admin/login.php +++ b/admin/login.php @@ -81,7 +81,7 @@ if ($_SESSION["isLoggedIn"] == true and $_SESSION["user_type"] == "admin"){ -
+
diff --git a/admin/login_action_admin.php b/admin/login_action_admin.php new file mode 100644 index 0000000..b916649 --- /dev/null +++ b/admin/login_action_admin.php @@ -0,0 +1,41 @@ + 0) { + $_SESSION["isCustomer"] = true; + } + $result = vendorExists($_SESSION["email"]); + if ($result > 0) { + $_SESSION["isVendor"] = true; + } + header("location: index.php"); + } else { + // $_SESSION["loginError"] = "Invalid email or password. Please try again."; + header("location: login.php?error=1"); + } + + + // $_SESSION["token"] = $result; + // $result = profile($_SESSION["token"]); + // $_SESSION["userId"] = $result["profile"]["userId"]; + // $result = customerExists($_SESSION["email"]); + // if($result>0){ + // $_SESSION["isCustomer"] = true; + // } + // $result = vendorExists($_SESSION["email"]); + // if($result>0){ + // $_SESSION["isVendor"] = true; + // } + // header("location: $url") +?> \ No newline at end of file diff --git a/admin/token-renew.php b/admin/token-renew.php new file mode 100644 index 0000000..104fa25 --- /dev/null +++ b/admin/token-renew.php @@ -0,0 +1,11 @@ + diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php index 2c2df12..28c69a0 100644 --- a/admin/vendor-profile.php +++ b/admin/vendor-profile.php @@ -65,21 +65,20 @@ foreach ($vendorPayouts as $payout) { } } -$token = $_SESSION["token"]; +if (isset($_SESSION["token"])) { + $token = $_SESSION["token"]; + $token_parts = explode(".", $token); + $token_payload = base64_decode($token_parts[1]); + $token_data = json_decode($token_payload); -$token_parts = explode(".", $token); -$token_payload = base64_decode($token_parts[1]); -$token_data = json_decode($token_payload); + $issued_at_time = $token_data->iat; + $expiration_time = $token_data->exp; + $renewal_time = $issued_at_time + 3300; -$expiration_time = $token_data->exp; -$issued_at_time = $token_data->iat; - -$renewal_time = $issued_at_time + 3300; - - -if (time() >= $renewal_time) { - $token = loginRenew($_SESSION["email"], $_SESSION["password"], $token); - $_SESSION["token"] = $token; + if (time() >= $renewal_time || time() >= $expiration_time) { + header("Location: token-renew.php"); + exit; + } } // $token = loginRenew($_SESSION["email"], $_SESSION["password"], $token); // $_SESSION["token"] = $token; @@ -115,6 +114,23 @@ if (time() >= $renewal_time) { + diff --git a/login_action.php b/login_action.php index adb9c4e..0530f51 100644 --- a/login_action.php +++ b/login_action.php @@ -19,7 +19,7 @@ if ($result > 0) { $_SESSION["isVendor"] = true; } - header("location: $url"); + header("location: index.php"); } else { // $_SESSION["loginError"] = "Invalid email or password. Please try again."; header("location: login.php?error=1"); diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 9c6821e..2484b5d 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -215,7 +215,8 @@ if (isset($_GET['id'])) { right: 15px; bottom: 0; border-radius: 0 0 10px 10px; - } + } + /* 02-21-2024 Stacy added css for addtocart & wishlist */ @@ -276,17 +277,17 @@ if (isset($_GET['id'])) {
'; - echo $_SESSION["SuccessfullySent"]; - echo '
'; - unset($_SESSION["SuccessfullySent"]); - echo " "; - } + } ?>
@@ -325,7 +326,8 @@ if (isset($_GET['id'])) { $productImage = $i; } ?> - +
@@ -378,16 +380,16 @@ if (isset($_GET['id'])) {
As low as 0) { - echo '' . $product_details['regular_price'] . ''; - echo '' . $product_details['sale_price'] . ''; - } elseif (!isset($product_details['regular_price']) || $product_details['regular_price'] <= 0) { - echo 'Contact Seller for Price'; - } else { - echo '' . $product_details['regular_price'] . ''; - } - // 02-13-24 Jun Jihad Removed Logic to DIsplay Price Range of Variable Products + // 02-13-24 Jun Jihad Removed Logic to DIsplay Price Range of Variable Products + if (isset($product_details['sale_price']) && $product_details['sale_price'] > 0) { + echo '' . $product_details['regular_price'] . ''; + echo '' . $product_details['sale_price'] . ''; + } elseif (!isset($product_details['regular_price']) || $product_details['regular_price'] <= 0) { + echo 'Contact Seller for Price'; + } else { + echo '' . $product_details['regular_price'] . ''; + } + // 02-13-24 Jun Jihad Removed Logic to DIsplay Price Range of Variable Products ?>
@@ -396,7 +398,7 @@ if (isset($_GET['id'])) {
- + @@ -405,7 +407,7 @@ if (isset($_GET['id'])) { VARIATION
@@ -594,10 +597,10 @@ if (isset($_GET['id'])) { - '/> + ' /> " id="qty-input" min="" /> - '/> + ' />
@@ -774,11 +777,29 @@ if (isset($_GET['id'])) { // April 3, 2024 Jun Jihad Apply Matrix var productPrice; var foundPrice = false; - + + // if (priceMatrix.length > 0) { + // for (var i = 0; i < priceMatrix.length; i++) { + // for (var j = 0; j < priceMatrix[i].length; j++) { + // if (quantityValue <= parseInt(priceMatrix[i][j].quantity)) { + // productPrice = parseFloat(priceMatrix[i][j].price); + // foundPrice = true; + // break; + // } + // } + // if (foundPrice) { + // break; + // } + // } + // } + if (priceMatrix.length > 0) { for (var i = 0; i < priceMatrix.length; i++) { for (var j = 0; j < priceMatrix[i].length; j++) { - if (quantityValue <= parseInt(priceMatrix[i][j].quantity)) { + var currentQuantity = parseFloat(priceMatrix[i][j].quantity); + var nextQuantity = (j < priceMatrix[i].length - 1) ? parseFloat(priceMatrix[i][j + 1].quantity) : Infinity; + + if (quantityValue >= currentQuantity && quantityValue < nextQuantity) { productPrice = parseFloat(priceMatrix[i][j].price); foundPrice = true; break; @@ -789,10 +810,11 @@ if (isset($_GET['id'])) { } } } - + + if (!foundPrice) { productPrice = parseFloat(document.getElementById("productNewPrice") ? document.getElementById("productNewPrice").innerText : document.getElementById("productPrice").innerText); - } + } var productData = { product: { product_image: document.getElementById("mainProductImage").getAttribute('src'), @@ -865,7 +887,7 @@ if (isset($_GET['id'])) { shipping_fee: shippingFee, }; - console.log("Request data:", requestData); + console.log("Request data:", requestData); // const token = ''; xhr.open("POST", "https:///api/v1/orders", true); xhr.setRequestHeader("Content-Type", "application/json", ); @@ -875,7 +897,7 @@ if (isset($_GET['id'])) { if (xhr.status === 201) { var response = JSON.parse(xhr.responseText); - console.log("Response:", response); + console.log("Response:", response); // Update the cart dynamically var cartList = document.querySelector(".eccart-pro-items"); @@ -945,24 +967,24 @@ if (isset($_GET['id'])) { } function updateOrder(orderId, existingItemId) { - var updateOrderXhr = new XMLHttpRequest(); - // const token = ''; - updateOrderXhr.open("PUT", `https:///api/v1/orders/${orderId}/items/${existingItemId}`, true); - updateOrderXhr.setRequestHeader("Content-Type", "application/json"); - updateOrderXhr.setRequestHeader("Authorization", "Bearer " + token); - updateOrderXhr.onreadystatechange = function() { - if (updateOrderXhr.readyState === 4) { - if (updateOrderXhr.status === 200) { - var response = JSON.parse(updateOrderXhr.responseText); - console.log("Order updated:", response); + var updateOrderXhr = new XMLHttpRequest(); + // const token = ''; + updateOrderXhr.open("PUT", `https:///api/v1/orders/${orderId}/items/${existingItemId}`, true); + updateOrderXhr.setRequestHeader("Content-Type", "application/json"); + updateOrderXhr.setRequestHeader("Authorization", "Bearer " + token); + updateOrderXhr.onreadystatechange = function() { + if (updateOrderXhr.readyState === 4) { + if (updateOrderXhr.status === 200) { + var response = JSON.parse(updateOrderXhr.responseText); + console.log("Order updated:", response); - var cartItem = document.getElementById(`order_${response._id}`); + var cartItem = document.getElementById(`order_${response._id}`); - if (cartItem) { - var updatedQuantity = response.items[0].quantity; - var totalAmount = response.items[0].price * updatedQuantity; - // If the cart item already exists, update its content using innerHTML - cartItem.innerHTML = ` + if (cartItem) { + var updatedQuantity = response.items[0].quantity; + var totalAmount = response.items[0].price * updatedQuantity; + // If the cart item already exists, update its content using innerHTML + cartItem.innerHTML = ` product @@ -980,72 +1002,73 @@ if (isset($_GET['id'])) { x
`; - document.getElementById(`qty-input-${response.items[0]._id}`).value = updatedQuantity; - } else { - // If the cart item doesn't exist, create a new one - console.log("Error updating order:", updateOrderXhr.responseText); - } + document.getElementById(`qty-input-${response.items[0]._id}`).value = updatedQuantity; + } else { + // If the cart item doesn't exist, create a new one + console.log("Error updating order:", updateOrderXhr.responseText); + } - getLatestOrders(); - updateCartItemCount(); - document.getElementById("addToCartMessage").innerText = "Product added to cart!"; - setTimeout(function() { - document.getElementById("addToCartMessage").innerText = ""; - }, 1000); - } else { - // Handle error response from the server - console.log("Error response from the server"); - console.log(xhr.responseText); // Log the server's response - } - } - }; - var existingQuantity = parseInt(existingOrder.items[0].quantity, 10); - var newQuantity = parseInt(quantityValue, 10); - var updatedQuantity = existingQuantity + newQuantity; + getLatestOrders(); + updateCartItemCount(); + document.getElementById("addToCartMessage").innerText = "Product added to cart!"; + setTimeout(function() { + document.getElementById("addToCartMessage").innerText = ""; + }, 1000); + } else { + // Handle error response from the server + console.log("Error response from the server"); + console.log(xhr.responseText); // Log the server's response + } + } + }; + var existingQuantity = parseInt(existingOrder.items[0].quantity, 10); + var newQuantity = parseInt(quantityValue, 10); + var updatedQuantity = existingQuantity + newQuantity; - // Check if the updated quantity exceeds the previous price matrix - var newProductPrice = productPrice; -var foundNewPrice = false; -if (priceMatrix.length > 0) { - for (var i = 0; i < priceMatrix.length; i++) { - for (var j = 0; j < priceMatrix[i].length; j++) { - if (updatedQuantity <= parseInt(priceMatrix[i][j].quantity)) { - newProductPrice = parseFloat(priceMatrix[i][j].price); - foundNewPrice = true; - break; - } - } - if (foundNewPrice) { - break; - } - } -} + // Check if the updated quantity exceeds the previous price matrix + var newProductPrice = productPrice; + var foundNewPrice = false; + if (priceMatrix.length > 0) { + for (var i = 0; i < priceMatrix.length; i++) { + for (var j = 0; j < priceMatrix[i].length; j++) { + var currentQuantity = parseFloat(priceMatrix[i][j].quantity); + var nextQuantity = (j < priceMatrix[i].length - 1) ? parseFloat(priceMatrix[i][j + 1].quantity) : Infinity; + if (updatedQuantity >= currentQuantity && updatedQuantity < nextQuantity) { + newProductPrice = parseFloat(priceMatrix[i][j].price); + foundNewPrice = true; + break; + } + } + if (foundNewPrice) { + break; + } + } + } -// Update product price if a new price is found in the price matrix -if (foundNewPrice) { - productPrice = newProductPrice; -} + if (foundNewPrice) { + productPrice = newProductPrice; + } -var updateData = { - quantity: updatedQuantity, - price: productPrice // Update the price for the item -}; + var updateData = { + quantity: updatedQuantity, + price: productPrice // Update the price for the item + }; -updateOrderXhr.send(JSON.stringify(updateData)); + updateOrderXhr.send(JSON.stringify(updateData)); -// Patch the total amount of the order with the updated price and quantity -var patchTotalAmountXhr = new XMLHttpRequest(); -patchTotalAmountXhr.open("PATCH", `https:///api/v1/orders/${orderId}`, true); -patchTotalAmountXhr.setRequestHeader("Content-Type", "application/json"); -patchTotalAmountXhr.setRequestHeader("Authorization", "Bearer " + token); + // Patch the total amount of the order with the updated price and quantity + var patchTotalAmountXhr = new XMLHttpRequest(); + patchTotalAmountXhr.open("PATCH", `https:///api/v1/orders/${orderId}`, true); + patchTotalAmountXhr.setRequestHeader("Content-Type", "application/json"); + patchTotalAmountXhr.setRequestHeader("Authorization", "Bearer " + token); -var totalAmount = productPrice * updatedQuantity; -var patchData = { - total_amount: totalAmount -}; + var totalAmount = productPrice * updatedQuantity; + var patchData = { + total_amount: totalAmount + }; -patchTotalAmountXhr.send(JSON.stringify(patchData)); - } + patchTotalAmountXhr.send(JSON.stringify(patchData)); + } @@ -1542,14 +1565,14 @@ patchTotalAmountXhr.send(JSON.stringify(patchData));
- "> + "> " /> " /> - + - + - +
@@ -1581,10 +1604,12 @@ patchTotalAmountXhr.send(JSON.stringify(patchData));
- +
">
- + - '; } else { echo ''; -- 2.40.1