From 1f073bce9de383a03ca58b2a7574570abb820fe3 Mon Sep 17 00:00:00 2001 From: Stacy Date: Mon, 22 Apr 2024 17:19:08 +0800 Subject: [PATCH 1/4] Modified about-us page --- about-us.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/about-us.php b/about-us.php index 04b7976..7be0321 100644 --- a/about-us.php +++ b/about-us.php @@ -183,7 +183,7 @@ -
+ -
+ @@ -437,7 +437,7 @@ -
+ -- 2.40.1 From fea65700018b3c9606dd71c8e58e0c016a8fe882 Mon Sep 17 00:00:00 2001 From: Stacy Date: Mon, 22 Apr 2024 17:22:59 +0800 Subject: [PATCH 2/4] Changed the icon --- admin/login.php | 3 ++- admin/order-history.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/login.php b/admin/login.php index f3565b9..4577757 100644 --- a/admin/login.php +++ b/admin/login.php @@ -31,7 +31,8 @@ if ($_SESSION["isLoggedIn"] == true and $_SESSION["user_type"] == "admin"){ - + + diff --git a/admin/order-history.php b/admin/order-history.php index 5846190..f3b9085 100644 --- a/admin/order-history.php +++ b/admin/order-history.php @@ -46,7 +46,8 @@ $allorders = json_encode($orders, true); - + + -- 2.40.1 From 31910967a442834b71acb49d32197b54a1f3f52a Mon Sep 17 00:00:00 2001 From: Stacy Date: Tue, 23 Apr 2024 08:58:19 +0800 Subject: [PATCH 3/4] Modal spacing issues --- user-profile.php | 6 +++--- vendor-settings.php | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/user-profile.php b/user-profile.php index e7d66fb..334725b 100644 --- a/user-profile.php +++ b/user-profile.php @@ -250,7 +250,7 @@ if ($_SESSION["isVendor"] == true) {
- +
@@ -362,7 +362,7 @@ if ($_SESSION["isVendor"] == true) {
- + @@ -447,7 +447,7 @@ if ($_SESSION["isVendor"] == true) {
- +
diff --git a/vendor-settings.php b/vendor-settings.php index e81fa6c..3d976e4 100644 --- a/vendor-settings.php +++ b/vendor-settings.php @@ -21,6 +21,12 @@ if ($_SESSION["userId"] <> "") { $_SESSION["isLoggedIn"] = false; header("location: login.php"); } + +if ($_SESSION["isCustomer"] == true) { + header("location: user-profile.php"); +} + + ?> @@ -220,7 +226,7 @@ if ($_SESSION["userId"] <> "") {
-
Contact number
+
Contact nubmer
@@ -298,7 +304,7 @@ if ($_SESSION["userId"] <> "") {
- +
@@ -414,7 +420,7 @@ if ($_SESSION["userId"] <> "") {
- + @@ -499,7 +505,7 @@ if ($_SESSION["userId"] <> "") {
- +
@@ -513,7 +519,7 @@ if ($_SESSION["userId"] <> "") {
- +
@@ -565,7 +571,7 @@ if ($_SESSION["userId"] <> "") {
- + -- 2.40.1 From 3a0f07e6fafbdb8c3bf993c8dc59bb8673ad0818 Mon Sep 17 00:00:00 2001 From: Stacy Date: Tue, 23 Apr 2024 09:10:36 +0800 Subject: [PATCH 4/4] Product Single page CSS & Double click add to cart UI issue --- header.php | 28 +++++++--- product-left-sidebar.php | 109 ++++++++++++++++++++++----------------- 2 files changed, 85 insertions(+), 52 deletions(-) diff --git a/header.php b/header.php index 27c737d..2d002dc 100644 --- a/header.php +++ b/header.php @@ -140,6 +140,8 @@ if ($_SESSION["userId"] <> "") { line-height: 1; } + +
@@ -180,6 +182,7 @@ if ($_SESSION["userId"] <> "") {
+ +
@@ -308,6 +312,7 @@ if ($_SESSION["userId"] <> "") {
+
@@ -428,19 +433,30 @@ if ($_SESSION["userId"] <> "") {
- + + + Unit Price:
Subtotal:
-
-
-
- -
+
+
+
- +
+ +
+ +
- + + +
diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 2849855..996e769 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -490,25 +490,31 @@ if (isset($_GET['id'])) { $product_price = (!empty($product_details['sale_price'])) ? $product_details['sale_price'] : $product_details['regular_price'] ; if ($_SESSION["isLoggedIn"]) { if ($product_details['product_type'] === "variable") { - echo '
-
'; + echo '
-
'; echo ''; - echo '
+
'; - echo '
'; + echo '" id="qty-input" />'; + echo '
+
'; + echo '
'; echo ''; echo '
'; } else { if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) { - echo '
-
'; + echo '
-
'; echo ''; - echo '
+
'; - // echo '
'; - echo '
'; + echo '" id="qty-input" />'; + echo '
+
'; + echo '
'; echo '
'; @@ -518,7 +524,8 @@ if (isset($_GET['id'])) { } } else { echo ''; + echo '
'; } ?> -
-
-
- -
+
- -
- -
- `; + + product + +
+ ${response.items[0].product.name} + + Unit Price: ${response.items[0].price} + + Subtotal: ${totalAmount} + +
+
-
+ +
+
+ + +
+ +
+ `; getLatestOrders() updateCartItemCount() cartList.appendChild(newOrder); @@ -1166,23 +1177,29 @@ if (isset($_GET['id'])) { var totalAmount = response.items[0].price * updatedQuantity; // If the cart item already exists, update its content using innerHTML cartItem.innerHTML = ` - - product - -
- ${response.items[0].product.name} - - Unit Price: ${response.items[0].price} - - Subtotal: ${totalAmount} -
-
-
- -
+
-
- x -
- `; + + product + +
+ ${response.items[0].product.name} + + Unit Price: ${response.items[0].price} + + Subtotal: ${totalAmount} + +
+
-
+ +
+
+ + +
+ +
+ `; document.getElementById(`qty-input-${response.items[0]._id}`).value = updatedQuantity; } else { // If the cart item doesn't exist, create a new one -- 2.40.1