From 7ab78b909b5a24d3449fa3db0f07be31f5570c60 Mon Sep 17 00:00:00 2001 From: Stacy Date: Tue, 26 Mar 2024 15:42:06 +0800 Subject: [PATCH 1/3] Added "All Order" tab on customer's purchase history, Modified user refund history & vendor refund history --- user-history.php | 234 +++++++++++------- user-refund-history.php | 490 ++++++++++++++++++++++++++++++++++---- vendor-refund-history.php | 414 +++++++++++++++++++++++++++++--- 3 files changed, 972 insertions(+), 166 deletions(-) diff --git a/user-history.php b/user-history.php index 7f6f97f..48f3692 100644 --- a/user-history.php +++ b/user-history.php @@ -65,22 +65,24 @@ if ($_SESSION["userId"] <> "") { font-weight: 400; /* margin: 2px; */ text-align: center; - margin-right: -25px; + /* margin-right: -25px; */ } .tab i { font-size: 15px; /* padding-left: 3px; */ } .tableView:hover { - background-color: #f5f5f5; + /* background-color: #f5f5f5; */ + background-color: #e5e5e5; } .tab-content { border: none; + margin-top: -30px; } - .theadTitle { + /* .theadTitle { background-color: #dddddd; - padding-top: -50px; - } + padding-top: -90px; + } */ @media only screen and (max-width: 640px) { #tableTitle { @@ -98,6 +100,32 @@ if ($_SESSION["userId"] <> "") { font-size: 10px; } } + + /* for status buttons */ + @media only screen and (max-width: 10000px) { + .tab { + font-size: 15px; + width: 11rem; + } + } + @media only screen and (max-width: 685px) { + .tab { + font-size: 11px; + width: 7rem; + } + .tab i { + font-size: 10px; + } + } + @media only screen and (max-width: 566px) { + .tab { + font-size: 0px; + width: 5rem; + } + .tab i { + font-size: 14px; + } + } + +
diff --git a/vendor-refund-history.php b/vendor-refund-history.php index ac67554..a8fd9bb 100644 --- a/vendor-refund-history.php +++ b/vendor-refund-history.php @@ -57,6 +57,9 @@ if (is_array($vendorOrderss)) { + + + @@ -66,13 +69,92 @@ if (is_array($vendorOrderss)) { + + +
From 3219755a31caf12cb7ee787474f5eea506cc37db Mon Sep 17 00:00:00 2001 From: Stacy Date: Tue, 26 Mar 2024 15:52:38 +0800 Subject: [PATCH 2/3] Modified product image preview --- index.php | 30 +++++++++++++++--------------- shop-list-left-sidebar.php | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/index.php b/index.php index c951910..a57d7ac 100644 --- a/index.php +++ b/index.php @@ -224,9 +224,9 @@ if ($_SESSION["userId"] <> "") { $vendorOfProduct = getVendorbyId($forAll[$pid]['vendor_api_id']); ?>
-
+
-
+
"> @@ -237,7 +237,7 @@ if ($_SESSION["userId"] <> "") { if (!empty($image_urls)) { $first_image_url = trim($image_urls[0]); ?> - edit + edit "") { $vendorOfProduct = getVendorbyId($electronics[$pid]['vendor_api_id']); ?>
-
+
-
+
"> @@ -357,7 +357,7 @@ if ($_SESSION["userId"] <> "") { if (!empty($image_urls)) { $first_image_url = trim($image_urls[0]); ?> - edit + edit "") { $vendorOfProduct = getVendorbyId($smartHome[$pid]['vendor_api_id']); ?>
-
+
-
+
"> @@ -479,7 +479,7 @@ if ($_SESSION["userId"] <> "") { if (!empty($image_urls)) { $first_image_url = trim($image_urls[0]); ?> - edit + edit "") { $vendorOfProduct = getVendorbyId($forVehicle[$pid]['vendor_api_id']); ?>
-
+
-
+
"> @@ -599,7 +599,7 @@ if ($_SESSION["userId"] <> "") { if (!empty($image_urls)) { $first_image_url = trim($image_urls[0]); ?> - edit + edit "") { $vendorOfProduct = getVendorbyId($newArrival[$pid]['vendor_api_id']); ?>
-
+
-
+
"> @@ -1224,7 +1224,7 @@ if ($_SESSION["userId"] <> "") { if (!empty($image_urls)) { $first_image_url = trim($image_urls[0]); ?> - edit + edit - edit + edit From 951859d61049bdc0d13b6fc77ca51cd5cb0b7b1e Mon Sep 17 00:00:00 2001 From: Stacy Date: Tue, 26 Mar 2024 15:53:32 +0800 Subject: [PATCH 3/3] Shows customer email in the email field of register customer --- register_customer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/register_customer.php b/register_customer.php index 186462c..e518d27 100644 --- a/register_customer.php +++ b/register_customer.php @@ -1,5 +1,9 @@