From 3e8caa1e283a2bf01f6a5bb4e070d06f9690d698 Mon Sep 17 00:00:00 2001 From: mark H Date: Thu, 30 May 2024 10:03:49 +0800 Subject: [PATCH] obanana rating --- header.php | 10 +- product-left-sidebar.php | 183 ++- shop-list-left-sidebar.php | 1001 ++++++++------- user-history.php | 2426 +++++++++++++++++++++++++++--------- user-profile.php | 1438 +++++++++++---------- 5 files changed, 3319 insertions(+), 1739 deletions(-) diff --git a/header.php b/header.php index 4df2f85..05c060e 100644 --- a/header.php +++ b/header.php @@ -689,11 +689,11 @@ if ($_SESSION["userId"] <> "") { @@ -253,40 +253,41 @@ function updateWishItemCount() { - -
-
-
Vendor Search Results
- -
- More Vendors> -
-
- -
+
+
+
Vendor Search Results
+ + +
+
+
- +
-
+
+ -
- +
    - +
@@ -295,131 +296,144 @@ function updateWishItemCount() {
+ // // Attach event listener to search form or button + // document.getElementById("search-form").addEventListener("submit", function(event) { + // event.preventDefault(); // Prevent default form submission + // let searchQuery = document.getElementById("search-input").value; + // console.log(searchQuery + " search clicked"); + // // Make AJAX request to fetch products based on search query + // // You need to implement this part in a similar way to loading products + // }); + }); +
@@ -786,77 +818,117 @@ maxPriceInput.addEventListener('input', function() {
+ +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
Handbag leather purse for women +
Handbag leather purse + for women
@@ -1096,7 +1179,8 @@ maxPriceInput.addEventListener('input', function() { Size
    -
  • S
    • +
  • S
  • M
  • X
  • XL
    • @@ -1109,7 +1193,8 @@ maxPriceInput.addEventListener('input', function() {
- +
@@ -1121,7 +1206,7 @@ maxPriceInput.addEventListener('input', function() {
- + - +
diff --git a/user-history.php b/user-history.php index f602828..d204e41 100644 --- a/user-history.php +++ b/user-history.php @@ -23,7 +23,8 @@ if ($_SESSION["isVendor"] == true) { oBanana B2B - Elevate Your Business - + @@ -33,7 +34,7 @@ if ($_SESSION["isVendor"] == true) { - + @@ -45,7 +46,7 @@ if ($_SESSION["isVendor"] == true) { - + @@ -57,123 +58,144 @@ if ($_SESSION["isVendor"] == true) { - + - + - - @@ -186,6 +208,152 @@ if ($_SESSION["isVendor"] == true) {
+ @@ -231,7 +399,7 @@ if ($_SESSION["isVendor"] == true) {
-
+
-
+
- alt="vendor image"> + + alt="vendor image">
@@ -290,7 +460,8 @@ if ($_SESSION["isVendor"] == true) {
-->
@@ -298,16 +469,31 @@ if ($_SESSION["isVendor"] == true) {
-
All Orders -
-
To Pay -
-
To Ship -
-
To Receive -
-
Complete -
+
+ All Orders + +
+
+ To Pay + +
+
+ To Ship + +
+
+ To Receive + +
+
+ Complete + +
@@ -315,7 +501,7 @@ if ($_SESSION["isVendor"] == true) { - - + + No Order/s Yet.

'; - ?> - + ?> + @@ -422,7 +623,7 @@ if ($_SESSION["isVendor"] == true) {
- +
@@ -440,7 +641,7 @@ if ($_SESSION["isVendor"] == true) { - - - - - - - - - - + ?> + + + + + + + - - + + No To Pay Order/s Yet.

'; - ?> - + ?> + @@ -507,7 +723,7 @@ if ($_SESSION["isVendor"] == true) {
- ' data-bs-toggle="modal" + data-bs-target="#productDetails"> + + - product - " + alt="product"> + - " alt="product"> - " + alt="product"> + - + + + + +
- +
@@ -527,7 +743,7 @@ if ($_SESSION["isVendor"] == true) { - - - - - - - - - - - - - + + + No To Ship Order/s Yet.

'; - ?> - + ?> + @@ -594,7 +825,7 @@ if ($_SESSION["isVendor"] == true) {
- ' data-bs-toggle="modal" + data-bs-target="#productDetails"> + + - product - " + alt="product"> + - " alt="product"> - " + alt="product"> + -
- +
@@ -613,7 +844,7 @@ if ($_SESSION["isVendor"] == true) { - - - - - - - - - - - - - + + + - No To Receive Order/s Yet.

'; - ?> - + ?> + @@ -720,250 +978,1141 @@ if ($_SESSION["isVendor"] == true) { $totalAmount += $order['total_amount']; ?> - - - - - - - - - - - + - - - -
@@ -178,31 +184,39 @@ if ($_SESSION["isVendor"] == true) {
-
- Edit Detail +
+ Edit Detail
- alt="vendor image"> -
+ + alt="vendor image"> +
+
Account Information
-
+
E-mail address
    -
    • +
  • +
-
+
Contact number
    • @@ -210,32 +224,43 @@ if ($_SESSION["isVendor"] == true) {
-
+
-
Address
+
Address
- -
- Name: - - - -
-
- Contact #: -
-
- Address: - - - - - - - -
- + +
+ Name: + + + + +
+
+ Contact #: + +
+
+ Address: + + + + + + + +
+
@@ -253,67 +278,98 @@ if ($_SESSION["isVendor"] == true) {
- +
$customer) { ?> - $address) { ?> - -
-
-
-
- - > - -
- -
- - > - -
-
- - -
-
-
-
- - - - -
-
- - -
- - -
-
-
+ $address) { ?> + +
+
+
+
+ + > + +
+
+ + > +
- + + +
+
+
+ +
+ + + + +
+
+ + +
+ + +
+
+
+ +
+
- + +
@@ -327,23 +383,29 @@ if ($_SESSION["isVendor"] == true) {
- +
- +
- - + +
- +
- +
@@ -365,7 +427,8 @@ if ($_SESSION["isVendor"] == true) {
- +
@@ -385,42 +448,50 @@ if ($_SESSION["isVendor"] == true) {
- - + + - +
- - + +
- - + + + -
- - + +
- - + + @@ -429,7 +500,8 @@ if ($_SESSION["isVendor"] == true) { -
- - -
-
- - -
-
- - -
-
- - + + +
+
+ + +
+
+ + +
- + +
+
+ + +
+
+ + +
+
+ + -
@@ -1358,7 +1516,7 @@ if ($_SESSION["isVendor"] == true) {
- +
- " + data-value=' '> + + - product - " + alt="product"> + - " alt="product"> - " + alt="product"> + - - - Received - -
+ + + + Received + +
- ' data-bs-toggle="modal" + data-bs-target="#productDetails"> + + - product - " + alt="product"> + - " alt="product"> - " + alt="product"> + + ?> - - + + Refund Requested'; + echo 'Refund Requested'; } elseif ($order['return_order']['status'] === 'To Ship') { - echo 'For Refund'; + echo 'For Refund'; } else { $orderDate = strtotime($order['updatedAt']); $sevenDaysAfterOrder = strtotime('+7 days', $orderDate); // Seven days after the order date - if ($currentDate >= $sevenDaysAfterOrder) { + if ($currentDate >= $sevenDaysAfterOrder || $order['isRate']=== true ) { echo ''; - } else { - echo 'Return/Refund'; - } - } - ?> -