diff --git a/admin/left-main-sidebar.php b/admin/left-main-sidebar.php index ecffa77..e5c14bc 100644 --- a/admin/left-main-sidebar.php +++ b/admin/left-main-sidebar.php @@ -1,4 +1,14 @@ -
+ + +
diff --git a/admin/login.php b/admin/login.php index 41be8d6..f3565b9 100644 --- a/admin/login.php +++ b/admin/login.php @@ -81,7 +81,7 @@ if ($_SESSION["isLoggedIn"] == true and $_SESSION["user_type"] == "admin"){ -
+
diff --git a/admin/login_action_admin.php b/admin/login_action_admin.php new file mode 100644 index 0000000..b916649 --- /dev/null +++ b/admin/login_action_admin.php @@ -0,0 +1,41 @@ + 0) { + $_SESSION["isCustomer"] = true; + } + $result = vendorExists($_SESSION["email"]); + if ($result > 0) { + $_SESSION["isVendor"] = true; + } + header("location: index.php"); + } else { + // $_SESSION["loginError"] = "Invalid email or password. Please try again."; + header("location: login.php?error=1"); + } + + + // $_SESSION["token"] = $result; + // $result = profile($_SESSION["token"]); + // $_SESSION["userId"] = $result["profile"]["userId"]; + // $result = customerExists($_SESSION["email"]); + // if($result>0){ + // $_SESSION["isCustomer"] = true; + // } + // $result = vendorExists($_SESSION["email"]); + // if($result>0){ + // $_SESSION["isVendor"] = true; + // } + // header("location: $url") +?> \ No newline at end of file diff --git a/admin/token-renew.php b/admin/token-renew.php new file mode 100644 index 0000000..104fa25 --- /dev/null +++ b/admin/token-renew.php @@ -0,0 +1,11 @@ + diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php index 5e07d7e..11acc9f 100644 --- a/admin/vendor-profile.php +++ b/admin/vendor-profile.php @@ -65,21 +65,20 @@ foreach ($vendorPayouts as $payout) { } } -$token = $_SESSION["token"]; +if (isset($_SESSION["token"])) { + $token = $_SESSION["token"]; + $token_parts = explode(".", $token); + $token_payload = base64_decode($token_parts[1]); + $token_data = json_decode($token_payload); -$token_parts = explode(".", $token); -$token_payload = base64_decode($token_parts[1]); -$token_data = json_decode($token_payload); + $issued_at_time = $token_data->iat; + $expiration_time = $token_data->exp; + $renewal_time = $issued_at_time + 3300; -$expiration_time = $token_data->exp; -$issued_at_time = $token_data->iat; - -$renewal_time = $issued_at_time + 3300; - - -if (time() >= $renewal_time) { - $token = loginRenew($_SESSION["email"], $_SESSION["password"], $token); - $_SESSION["token"] = $token; + if (time() >= $renewal_time || time() >= $expiration_time) { + header("Location: token-renew.php"); + exit; + } } // $token = loginRenew($_SESSION["email"], $_SESSION["password"], $token); // $_SESSION["token"] = $token; @@ -115,6 +114,23 @@ if (time() >= $renewal_time) { + diff --git a/checkouttest.php b/checkouttest.php index 9b8f509..2255fb1 100644 --- a/checkouttest.php +++ b/checkouttest.php @@ -226,9 +226,13 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
Name: + + +
+
Contact #: @@ -269,7 +273,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
- +
">
- + - '; } else { echo ''; diff --git a/shop-list-left-sidebar.php b/shop-list-left-sidebar.php index cf42a52..265aa73 100644 --- a/shop-list-left-sidebar.php +++ b/shop-list-left-sidebar.php @@ -213,8 +213,11 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
- - + + + +
@@ -321,7 +324,7 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate ?>
-
+
"> - edit + edit - edit + edit @@ -445,224 +448,227 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
-
-
-

Filter Products By

-
-
- -
-
-

Category

-
-
- +
- - - - - -
+
+
+

Filter Products By

- - - +
+
+

Category

+
+
+
+ + + +
+ + +
-
-
    -
  • -
    - S -
    -
    • -
  • -
    - M -
    -
    • -
  • -
    - L -
    -
    • -
  • -
    - XL -
    -
    • -
  • -
    - XXL -
    -
    • -
-
-
--> - - + + + + + +
@@ -781,21 +787,22 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
+
- +
- 3 +
- 4 +
diff --git a/shop-list-left-sidebar2.php b/shop-list-left-sidebar2.php index dd9b201..2151d22 100644 --- a/shop-list-left-sidebar2.php +++ b/shop-list-left-sidebar2.php @@ -138,8 +138,8 @@ if ($_SESSION["userId"] <> "") {
- - + +
@@ -156,6 +156,27 @@ if ($_SESSION["userId"] <> "") {
+ @@ -359,248 +380,250 @@ if ($_SESSION["userId"] <> "") {
-
-
-

Filter Products By

-
-
- -
-
-

Category

-
-
-
- - - -
- +
+
+

Category

+
+
+
+ - -
  • -
    - More - Categories -
    -
    • + +
    + -
    -
    - -
    -
    --> - - + - - +
    +
    +
    --> + + + + +
    @@ -724,16 +747,16 @@ if ($_SESSION["userId"] <> "") {
    - +
    - 3 +
    - 4 +
    diff --git a/user-history.php b/user-history.php index 3ceed23..ed80055 100644 --- a/user-history.php +++ b/user-history.php @@ -7,6 +7,7 @@ if ($_SESSION["userId"] <> "") { $customer_data = getCustomerbyLoginId($_SESSION["userId"]); } else { $_SESSION["isLoggedIn"] = false; + header("location: login.php"); } ?> @@ -323,7 +324,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -342,29 +343,23 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it - if (isset($order['status']) && isset($order['items'][0]['product'])) { + if (isset($order['status']) && (strtoupper($order['status']) === 'TO PAY') || (strtoupper($order['status']) === 'TO SHIP') + || (strtoupper($order['status']) === 'TO RECEIVE') || (strtoupper($order['status']) === 'COMPLETED') + && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> - - + @@ -374,16 +369,31 @@ if ($_SESSION["userId"] <> "") { - - -

    No Purchased Order/s Yet.

    '; + } } } + // } else if (empty($order['status'])) { + // echo '

    No Purchased Order/s Yet.

    '; + // } ?> + + No Order/s Yet.

    '; + ?> + + +
    Image Name
    - '; - // } else { - // echo 'product'; - // } - ?> - product - product
    product
    @@ -391,7 +401,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -410,12 +420,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['status']) && (strtoupper($order['status']) === 'TO PAY') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Pay Order/s Yet.

    '; + ?> + + +
    Image Name
    @@ -446,7 +470,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -467,12 +491,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['status']) && (strtoupper($order['status']) === 'TO SHIP') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Ship Order/s Yet.

    '; + ?> + + +
    Image Name
    @@ -503,7 +541,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -523,12 +561,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['status']) && (strtoupper($order['status']) === 'TO RECEIVE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Receive Order/s Yet.

    '; + ?> + + +
    Image Name
    @@ -567,7 +619,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -587,12 +639,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['status']) && (strtoupper($order['status']) === 'COMPLETED') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> @@ -831,6 +885,18 @@ if ($_SESSION["userId"] <> "") { } ?> + + No Completed Order/s Yet.

    '; + ?> + + +
    Image Name
    diff --git a/user-profile.php b/user-profile.php index e3ae4f4..b9e01b6 100644 --- a/user-profile.php +++ b/user-profile.php @@ -9,6 +9,7 @@ if ($_SESSION["userId"] <> "") { $customer_data = getCustomerbyLoginId($_SESSION["userId"]); } else { $_SESSION["isLoggedIn"] = false; + header("location: login.php"); } ?> @@ -513,7 +514,7 @@ if ($_SESSION["userId"] <> "") { }) .then(response => { if (response.ok) { - location.reload(); + // location.reload(); // filter the delete action document.getElementById('form-check-' + addressIndex).remove(); } else { diff --git a/user-refund-history.php b/user-refund-history.php index 9cda15c..b5f6722 100644 --- a/user-refund-history.php +++ b/user-refund-history.php @@ -9,6 +9,7 @@ if ($_SESSION["userId"] <> "") { $customer_data = getCustomerbyLoginId($_SESSION["userId"]); } else { $_SESSION["isLoggedIn"] = false; + header("location: login.php"); } ?> @@ -338,7 +339,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -359,6 +360,7 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; @@ -367,6 +369,7 @@ if ($_SESSION["userId"] <> "") { if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO APPROVE') || (strtoupper($order['return_order']['status']) === 'TO SHIP') || (strtoupper($order['return_order']['status']) === 'TO RECEIVE') || (strtoupper($order['return_order']['status']) === 'TO REFUND') || (strtoupper($order['return_order']['status']) === 'RETURN COMPLETE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No Refund/s Yet.

    '; + ?> + + +
    Image Name
    @@ -399,7 +414,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -420,12 +435,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO APPROVE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Approve Refund/s Yet.

    '; + ?> + + +
    Image Name
    @@ -458,7 +487,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -479,12 +508,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO SHIP') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Ship Refund/s Yet.

    '; + ?> + + +
    Image Name
    @@ -517,7 +560,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -538,12 +581,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO RECEIVE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Receive Refund/s Yet.

    '; + ?> + + +
    Image Name
    @@ -579,7 +636,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -600,12 +657,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO REFUND') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No To Refund/s Yet.

    '; + ?> + + +
    Image Name
    @@ -641,7 +712,7 @@ if ($_SESSION["userId"] <> "") {
    - + @@ -661,12 +732,14 @@ if ($_SESSION["userId"] <> "") { $customer = $customer_data[0]; $orders = getOrderbyCustomerId($customer['_id']); $totalAmount = 0; + $orderExist = false; if ($orders) { $order_data = json_decode($orders, true); $_SESSION['cart_items'] = $order_data; foreach ($order_data as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'RETURN COMPLETE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> "") { } ?> + + No Completed Refund/s Yet.

    '; + ?> + + +
    Image Name
    diff --git a/vendor-dashboard.php b/vendor-dashboard.php index 38ae990..4223c08 100644 --- a/vendor-dashboard.php +++ b/vendor-dashboard.php @@ -265,7 +265,7 @@ if (is_array($vendorOrderss)) { } ?> --> - + @@ -463,7 +463,7 @@ if (is_array($vendorOrderss)) { } ?> --> - + diff --git a/vendor-refund-history.php b/vendor-refund-history.php index 52efb5a..7d52a7c 100644 --- a/vendor-refund-history.php +++ b/vendor-refund-history.php @@ -311,11 +311,12 @@ if (is_array($vendorOrderss)) {
    Return Complete
    --> + +
    - - + @@ -335,11 +336,13 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; //for checking if order exist foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO APPROVE') || (strtoupper($order['return_order']['status']) === 'TO SHIP') || (strtoupper($order['return_order']['status']) === 'TO RECEIVE') || (strtoupper($order['return_order']['status']) === 'TO REFUND') || (strtoupper($order['return_order']['status']) === 'RETURN COMPLETE') && isset($order['items'][0]['product'])) { + $orderExist = true; //if there's an order, orderExist will be set to true $totalAmount += $order['total_amount']; ?> + + No Refund/s Yet.

    '; + ?> + + +
    Image Name
    -
    - + + +
    - + @@ -390,9 +405,11 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO APPROVE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> + + No To Approve Refund/s Yet.

    '; + ?> + + +
    Image Name
    + +
    - - + @@ -447,9 +476,11 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO SHIP') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> + + No To Ship Refund/s Yet.

    '; + ?> + + +
    Image Name
    + +
    - - + @@ -499,9 +542,11 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO RECEIVE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> + + No To Receive Refund/s Yet.

    '; + ?> + + +
    Image Name
    + +
    - - + @@ -553,9 +611,11 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'TO REFUND') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> + + No To Refund/s Yet.

    '; + ?> + + +
    Image Name
    + +
    - - + @@ -608,9 +680,11 @@ if (is_array($vendorOrderss)) { $order = $vendorOrders; $orderArray = json_encode($order, true); $orderItems = json_decode($orderArray, true); + $orderExist = false; foreach ($orderItems as $order) { // Ensure that the required data is available before accessing it if (isset($order['return_order']['status']) && (strtoupper($order['return_order']['status']) === 'RETURN COMPLETE') && isset($order['items'][0]['product'])) { + $orderExist = true; $totalAmount += $order['total_amount']; ?> + + No Refund/s Complete Yet.

    '; + ?> + + +
    Image Name
    diff --git a/vendor-settings.php b/vendor-settings.php index 55a579d..30dd44c 100644 --- a/vendor-settings.php +++ b/vendor-settings.php @@ -629,7 +629,7 @@ if ($_SESSION["userId"] <> "") {