diff --git a/user-history.php b/user-history.php index a0601a8..3ceed23 100644 --- a/user-history.php +++ b/user-history.php @@ -53,13 +53,13 @@ if ($_SESSION["userId"] <> "") { .tab.active { background-color: #ffffff; /* Set your desired background color for the active tab */ - color: #ffaa00; + color: #3474d4; /* Set your desired text color for the active tab */ - border: 1px solid #ffaa00 + border: 1px solid #3474d4 /* Set your desired border color for the active tab */ } .tab { - background-color: #ffaa00; + background-color: #3474d4; color: #ffffff; font-family: "Poppins, sans-serif"; font-weight: 400; @@ -79,10 +79,27 @@ if ($_SESSION["userId"] <> "") { border: none; margin-top: -30px; } - /* .theadTitle { - background-color: #dddddd; - padding-top: -90px; - } */ + + .tableView { + td:nth-child(2) { + max-width: 250px; + } + td:nth-child(6) { + white-space: nowrap; + } + td:nth-child(7) { + white-space: nowrap; + } + } + + .Title { + th:nth-child(4) { + white-space: nowrap; + } + th:nth-child(6) { + white-space: nowrap; + } + } @media only screen and (max-width: 640px) { #tableTitle { @@ -307,7 +324,7 @@ if ($_SESSION["userId"] <> "") { - + @@ -348,7 +365,7 @@ if ($_SESSION["userId"] <> "") { product - + @@ -374,8 +391,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
- - + + @@ -406,7 +423,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -429,8 +446,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -463,7 +480,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -486,8 +503,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -517,29 +534,25 @@ if ($_SESSION["userId"] <> "") { - - + - - - - - + + + + + - + + "") {
Image Name Quantity
- - product +
+ product Received
- - + + @@ -588,7 +601,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -985,9 +998,11 @@ if ($_SESSION["userId"] <> "") { -
+
- product + + product +
    @@ -1007,9 +1022,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -1031,9 +1048,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -1055,9 +1074,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -1079,9 +1100,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    diff --git a/user-refund-history.php b/user-refund-history.php index 34b6abe..9cda15c 100644 --- a/user-refund-history.php +++ b/user-refund-history.php @@ -54,13 +54,13 @@ if ($_SESSION["userId"] <> "") { .tab.active { background-color: #ffffff; /* Set your desired background color for the active tab */ - color: #ffaa00; + color: #3474d4; /* Set your desired text color for the active tab */ - border: 1px solid #ffaa00 + border: 1px solid #3474d4 /* Set your desired border color for the active tab */ } .tab { - background-color: #ffaa00; + background-color: #3474d4; color: #ffffff; font-family: "Poppins, sans-serif"; font-weight: 400; @@ -80,10 +80,27 @@ if ($_SESSION["userId"] <> "") { border: none; margin-top: -30px; } - /* .theadTitle { - background-color: #dddddd; - padding-top: -90px; - } */ + + .tableView { + td:nth-child(2) { + max-width: 250px; + } + td:nth-child(6) { + white-space: nowrap; + } + td:nth-child(7) { + white-space: nowrap; + } + } + + .Title { + th:nth-child(4) { + white-space: nowrap; + } + th:nth-child(6) { + white-space: nowrap; + } + } @media only screen and (max-width: 640px) { #tableTitle { @@ -321,8 +338,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -357,7 +374,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -382,8 +399,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -416,7 +433,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -441,8 +458,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -475,7 +492,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -500,8 +517,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -534,7 +551,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -562,8 +579,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -596,7 +613,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -624,8 +641,8 @@ if ($_SESSION["userId"] <> "") {
Image Name Quantity
product
- - + + @@ -657,7 +674,7 @@ if ($_SESSION["userId"] <> "") { ?> - + @@ -932,27 +949,33 @@ if ($_SESSION["userId"] <> "") { if (jsonObject.return_order.status === 'To Approve') { modal.innerHTML = ` - -
-
- product + -
-
    -
  • Quantity: ${jsonObject.items[0].quantity}
  • -
  • Unit Price: ${jsonObject.items[0].price}
  • -
  • Price: ${jsonObject.total_amount}
  • -
  • Refund Status: ${jsonObject.return_order.status}
  • -
  • Refund Reason: ${jsonObject.return_order.reason}
  • -
  • Refund Proof:
  • -
  • product
  • -
  • Date: ${formattedDate}
  • -
-
-
`; +
+
+ + product + +
+
+
    +
  • Quantity: ${jsonObject.items[0].quantity}
  • +
  • Unit Price: ${jsonObject.items[0].price}
  • +
  • Price: ${jsonObject.total_amount}
  • +
  • Refund Status: ${jsonObject.return_order.status}
  • +
  • Refund Reason: ${jsonObject.return_order.reason}
  • +
  • Refund Proof:
  • +
  • + + product + +
  • +
  • Date: ${formattedDate}
  • +
+
+
`; } if (jsonObject.return_order.status === 'To Ship') { @@ -961,9 +984,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -973,7 +998,11 @@ if ($_SESSION["userId"] <> "") {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -986,9 +1015,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -998,7 +1029,11 @@ if ($_SESSION["userId"] <> "") {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -1011,9 +1046,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -1023,7 +1060,11 @@ if ($_SESSION["userId"] <> "") {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -1036,9 +1077,11 @@ if ($_SESSION["userId"] <> "") {
-
+
- product + + product +
    @@ -1048,7 +1091,11 @@ if ($_SESSION["userId"] <> "") {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
diff --git a/vendor-refund-history.php b/vendor-refund-history.php index a8fd9bb..52efb5a 100644 --- a/vendor-refund-history.php +++ b/vendor-refund-history.php @@ -71,13 +71,13 @@ if (is_array($vendorOrderss)) { .tab.active { background-color: #ffffff; /* Set your desired background color for the active tab */ - color: #ffaa00; + color: #3474d4; /* Set your desired text color for the active tab */ - border: 1px solid #ffaa00 + border: 1px solid #3474d4 /* Set your desired border color for the active tab */ } .tab { - background-color: #ffaa00; + background-color: #3474d4; color: #ffffff; font-family: "Poppins, sans-serif"; font-weight: 400; @@ -97,10 +97,27 @@ if (is_array($vendorOrderss)) { border: none; margin-top: -30px; } - /* .theadTitle { - background-color: #dddddd; - padding-top: -90px; - } */ + + .tableView { + td:nth-child(2) { + max-width: 250px; + } + td:nth-child(6) { + white-space: nowrap; + } + td:nth-child(7) { + white-space: nowrap; + } + } + + .Title { + th:nth-child(4) { + white-space: nowrap; + } + th:nth-child(6) { + white-space: nowrap; + } + } @media only screen and (max-width: 640px) { #tableTitle { @@ -295,11 +312,11 @@ if (is_array($vendorOrderss)) {
--> -
+
Image Name Quantity
product
- + @@ -330,7 +347,7 @@ if (is_array($vendorOrderss)) { ?> - + @@ -354,7 +371,7 @@ if (is_array($vendorOrderss)) {
Image Name Quantity
product
- + @@ -381,19 +398,19 @@ if (is_array($vendorOrderss)) { - - - - - - - + + + + + + + - + @@ -411,7 +428,7 @@ if (is_array($vendorOrderss)) {
Image Name Quantity
product
product - Approve Refund + Approve Refund
- + @@ -440,7 +457,7 @@ if (is_array($vendorOrderss)) { ?> - + @@ -464,7 +481,7 @@ if (is_array($vendorOrderss)) {
Image Name Quantity
product
- + @@ -490,16 +507,16 @@ if (is_array($vendorOrderss)) { - - - - - - - + + + + + + + - +
Image Name Quantity
product
product Received @@ -518,7 +535,7 @@ if (is_array($vendorOrderss)) { - + @@ -546,7 +563,7 @@ if (is_array($vendorOrderss)) { ?> - + @@ -573,7 +590,7 @@ if (is_array($vendorOrderss)) {
Image Name Quantity
product
- + @@ -601,7 +618,7 @@ if (is_array($vendorOrderss)) { ?> - + @@ -867,7 +884,7 @@ if (is_array($vendorOrderss)) { if (data && data !== "") { // Update the status in the table without reloading the page // document.querySelector(`[data-order-id="${orderId}"] .order-status`).innerText = 'COMPLETED'; - // location.reload(); + location.reload(); } else { alert('Failed to update order status'); @@ -973,9 +990,12 @@ if (is_array($vendorOrderss)) { -
+
- product + + product +
    @@ -985,7 +1005,11 @@ if (is_array($vendorOrderss)) {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -998,9 +1022,12 @@ if (is_array($vendorOrderss)) {
-
+
- product + + product +
    @@ -1010,7 +1037,11 @@ if (is_array($vendorOrderss)) {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -1023,9 +1054,12 @@ if (is_array($vendorOrderss)) {
-
+
- product + + product +
    @@ -1035,7 +1069,11 @@ if (is_array($vendorOrderss)) {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -1048,9 +1086,12 @@ if (is_array($vendorOrderss)) {
-
+
- product + + product +
    @@ -1060,7 +1101,11 @@ if (is_array($vendorOrderss)) {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
@@ -1073,9 +1118,12 @@ if (is_array($vendorOrderss)) {
-
+
- product + + product +
    @@ -1085,7 +1133,11 @@ if (is_array($vendorOrderss)) {
  • Refund Status: ${jsonObject.return_order.status}
  • Refund Reason: ${jsonObject.return_order.reason}
  • Refund Proof:
  • -
  • product
  • +
  • + + product + +
  • Date: ${formattedDate}
Image Name Quantity
product