As low as
0) {
- echo '₱' . $product_details['regular_price'] . '';
- echo '₱' . $product_details['sale_price'] . '';
+ 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 {
@@ -763,6 +762,7 @@ if (isset($_GET['id'])) {
console.log("Button clicked");
login(email, password, function(token) {
+ var priceMatrix = ;
var quantityValue = document.getElementById("qty-input").value;
var minimumOrder = ;
var shippingFee = "";
@@ -771,19 +771,42 @@ if (isset($_GET['id'])) {
alert("The minimum order quantity is " + minimumOrder);
}
+ // 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 (!foundPrice) {
+ productPrice = parseFloat(document.getElementById("productNewPrice") ? document.getElementById("productNewPrice").innerText : document.getElementById("productPrice").innerText);
+ }
var productData = {
product: {
product_image: document.getElementById("mainProductImage").getAttribute('src'),
product_id: document.getElementById("product_Id").value,
name: document.getElementById("productTitle").innerText,
},
- price: document.getElementById("productNewPrice") ? document.getElementById("productNewPrice").innerText : document.getElementById("productPrice").innerText,
+ price: productPrice,
quantity: quantityValue,
vendor_id: "",
vendor_name: "",
};
+ // April 3, 2024 Jun Jihad Apply Matrix
- console.log("Product data:", productData); // Debugging statement
+ console.log("Product data:", productData);
var totalAmount = productData.price * productData.quantity;
@@ -793,7 +816,7 @@ if (isset($_GET['id'])) {
name: " ",
};
- console.log("Customer data:", customerData); // Debugging statement
+ console.log("Customer data:", customerData);
// Check if the product is already in the order API
var existingOrder;
@@ -842,7 +865,7 @@ if (isset($_GET['id'])) {
shipping_fee: shippingFee,
};
- console.log("Request data:", requestData); // Debugging statement
+ console.log("Request data:", requestData);
// const token = '';
xhr.open("POST", "https:///api/v1/orders", true);
xhr.setRequestHeader("Content-Type", "application/json", );
@@ -852,7 +875,7 @@ if (isset($_GET['id'])) {
if (xhr.status === 201) {
var response = JSON.parse(xhr.responseText);
- console.log("Response:", response); // Debugging statement
+ console.log("Response:", response);
// Update the cart dynamically
var cartList = document.querySelector(".eccart-pro-items");
@@ -922,24 +945,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; // Use the correct quantity from the updated order
- 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 = `
@@ -957,50 +980,74 @@ 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;
- var updateData = {
- quantity: updatedQuantity,
- };
+ // 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;
+ }
+ }
+ }
- updateOrderXhr.send(JSON.stringify(updateData));
+ // Update product price if a new price is found in the price matrix
+ if (foundNewPrice) {
+ productPrice = newProductPrice;
+ }
- 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 updateData = {
+ quantity: updatedQuantity,
+ price: productPrice // Update the price for the item
+ };
- var originalPrice = document.getElementById("productPrice").innerText;
- var totalAmount = originalPrice * updatedQuantity;
- console.log(originalPrice);
- console.log(totalAmount);
- var patchData = {
- total_amount: totalAmount
- };
+ updateOrderXhr.send(JSON.stringify(updateData));
- patchTotalAmountXhr.send(JSON.stringify(patchData));
- }
+ 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
+ };
+
+ patchTotalAmountXhr.send(JSON.stringify(patchData));
+ }
diff --git a/user-history.php b/user-history.php
index 48f3692..a0601a8 100644
--- a/user-history.php
+++ b/user-history.php
@@ -597,13 +597,22 @@ if ($_SESSION["userId"] <> "") {
@@ -362,7 +362,8 @@ $products = productList();
console.log("Session Token:", sessionToken);
login(email, password, function() {
// Removed the call to updateSessionToken
- window.open("vendor-uploads-add-product-action.php" + productId, "_self");
+ // window.open("vendor-uploads-add-product-action.php" + productId, "_self");
+ window.location.href = "vendor-uploads-add-product-action.php?productId=" + productId;
});
}
diff --git a/vendor-uploads.php b/vendor-uploads.php
index a60d129..432200c 100644
--- a/vendor-uploads.php
+++ b/vendor-uploads.php
@@ -196,7 +196,7 @@ $array = json_decode($result, true);
-
+
@@ -396,15 +396,24 @@ $array = json_decode($result, true);
- $pair) : ?>
-
-
+
-
+
+ $pair) : ?>
+
+
+
+
+
@@ -413,19 +422,19 @@ $array = json_decode($result, true);
-
+
-
style="background-color: blue;">
+
+
style="background-color: blue;">
@@ -721,7 +730,7 @@ $array = json_decode($result, true);
Promise.all(promises)
.then(filenames => {
- const updatedImages = existingImages.concat(filenames.map(filename => `https:///images/storage/product_uploads/${filename}`));
+ const updatedImages = existingImages.concat(filenames.map(filename => `https:///images/storage/product_uploads/${encodeURIComponent(filename)}`));
if (!Array.isArray(updatedImages)) {
console.error('Updated images is not an array:', updatedImages);