From b400d75494c79c69ba25ae3c482f4599d7169154 Mon Sep 17 00:00:00 2001
From: Stacy <stacyjoycemapano@gmail.com>
Date: Thu, 7 Mar 2024 10:53:15 +0800
Subject: [PATCH 1/2] <li>

---
 category-slider.php        |  59 ++---
 index.php                  |  29 ++-
 product-left-sidebar.php   |  26 ++-
 shop-list-left-sidebar.php |  45 +++-
 user-profile.php           | 426 ++++++++++++++++++++++++++++++++++++-
 vendor-settings.php        |   9 +
 6 files changed, 538 insertions(+), 56 deletions(-)

diff --git a/category-slider.php b/category-slider.php
index a47c0ac..2984ea7 100644
--- a/category-slider.php
+++ b/category-slider.php
@@ -11,6 +11,7 @@
     <meta name="description" content="Best ecommerce html template for single and multi vendor store.">
     <meta name="author" content="ashishmaraviya">
 
+    <!-- CATEGORY-SLIDER -->
     <!-- site Favicon -->
     <link rel="icon" href="assets/images/favicon/favicon.png" sizes="32x32" />
     <link rel="apple-touch-icon" href="assets/images/favicon/favicon.png" />
@@ -42,9 +43,17 @@
             border-radius: 10px;
             color: #ffffff;
         }
-        #sidebar-category:hover .ec-sidebar-block-item{
+        #sidebar-category:hover .ec-sidebar-block-items{
             color: #ffffff;
         }
+        .ec-sidebar-block-items {
+            height: 40px; 
+            padding-top:10px; 
+            font-size:15px; 
+            }
+        #best-sellers-title.bs-title:hover{
+            color: #ffaa00;
+        }
     </style>
    
 </head>
@@ -64,8 +73,8 @@
                             <ul> 
                                 <li>
                                     <a href="search_product_action.php?category=Electronics">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rs-headset" style="padding-right:10px; padding-top:2px;"></i>Electronics</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rs-headset" style="padding-right:15px; padding-top:2px;"></i>Electronics</div></a>
                                     <!-- <ul style="display: block;">
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">Shirt <span title="Available Stock">- 25</span></a>
@@ -91,8 +100,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Solar">
-                                        <div class="ec-sidebar-block-item" id="sidebar-category-content">
-                                            <i class="fi fi-rr-square" style="padding-right:10px; padding-top:2px;"></i>Solar</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rr-square" style="padding-right:15px; padding-top:3px;"></i>Solar</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">Sports <span title="Available Stock">- 25</span></a>
@@ -118,8 +127,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=E-bike">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rs-bike" style="padding-right:10px; padding-top:2px;"></i>E-Bike</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rs-bike" style="padding-right:15px; padding-top:2px;"></i>E-Bike</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">Earrings <span title="Available Stock">- 50</span></a>
@@ -141,8 +150,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=E-vehicle">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rs-car-side" style="padding-right:10px; padding-top:2px;"></i>E-Vehicle</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rs-car-side" style="padding-right:15px; padding-top:2px;"></i>E-Vehicle</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">Clothes perfume<span title="Available Stock">- 4 pcs</span></a>
@@ -169,8 +178,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Appliance">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rr-calculator" style="padding-right:10px; padding-top:2px;"></i>Appliance</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rr-calculator" style="padding-right:15px; padding-top:2px;"></i>Appliance</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">shampoo<span title="Available Stock"></span></a>
@@ -197,8 +206,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Smart Home">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rs-screen" style="padding-right:10px; padding-top:2px;"></i>Smart Home</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rs-screen" style="padding-right:15px; padding-top:2px;"></i>Smart Home</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">Sunglasses <span title="Available Stock">- 20</span></a>
@@ -216,8 +225,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Home">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rr-home" style="padding-right:10px; padding-top:2px;"></i>Home</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rr-home" style="padding-right:15px; padding-top:2px;"></i>Home</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">shopping bag <span title="Available Stock">- 25</span></a>
@@ -244,8 +253,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Apparell">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rr-user" style="padding-right:10px; padding-top:2px;"></i>Apparel</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rr-user" style="padding-right:15px; padding-top:2px;"></i>Apparel</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">shopping bag <span title="Available Stock">- 25</span></a>
@@ -272,8 +281,8 @@
                             <ul>
                                 <li>
                                     <a href="search_product_action.php?category=Heavy Equipment">
-                                        <div class="ec-sidebar-block-item">
-                                            <i class="fi fi-rr-tool-box" style="padding-right:10px; padding-top:2px;"></i>Heavy Equipment</div></a>
+                                        <div class="ec-sidebar-block-items" id="sidebar-category-content" style="display:flex; height: 40px; font-size:15px;">
+                                            <i class="fi fi-rr-tool-box" style="padding-right:15px; padding-top:2px;"></i>Heavy Equipment</div></a>
                                     <!-- <ul>
                                         <li>
                                             <div class="ec-sidebar-sub-item"><a href="shop-left-sidebar-col-4.php">shopping bag <span title="Available Stock">- 25</span></a>
@@ -307,21 +316,15 @@
                         <div class="ec-sb-pro-sl">
                             <div>
                                 <?php
-                                $productBestSellers = simpleProducts("");
-                                $array = array_filter($productBestSellers, function ($var) {
-                                    return (fnmatch("Solar*", $var['product_category']) || fnmatch("E-bike*", $var['product_category'])
-                                        || fnmatch("Appliance*", $var['product_category']) || fnmatch("E-Vehicle*", $var['product_category'])
-                                        || fnmatch("Electronics*", $var['product_category']) || fnmatch("Smart Home*", $var['product_category'])
-                                        || fnmatch("Heavy Equipment*", $var['product_category']) || fnmatch("Home*", $var['product_category']));
-                                });
-                                $bestSellers = array_values($array);
+                                $bestSellers = simpleProducts("");
+                                
                                 for ($x = 0; $x <= 3; $x++) {
                                     $pid = rand(0, count($bestSellers) - 1);
                                 ?>
                                     <div class="ec-sb-pro-sl-item">
                                         <a href="product-left-sidebar.php?id=<?php echo $bestSellers[$pid]["_id"]; ?>" class="sidekka_pro_img"><img src="<?php echo $bestSellers[$pid]["product_image"] ?>" alt="product" /></a>
                                         <div class="ec-pro-content">
-                                            <h5 class="ec-pro-title"><a href="product-left-sidebar.php?id=<?php echo $bestSellers[$pid]["_id"]; ?>"><?php echo $bestSellers[$pid]["product_name"] ?></a></h5>
+                                            <h5 class="ec-pro-title"><a id="best-sellers-title" class="bs-title" href="product-left-sidebar.php?id=<?php echo $bestSellers[$pid]["_id"]; ?>"><?php echo $bestSellers[$pid]["product_name"] ?></a></h5>
                                             <!-- <div class="ec-pro-rating">
                                                 <i class="ecicon eci-star fill"></i>
                                                 <i class="ecicon eci-star fill"></i>
diff --git a/index.php b/index.php
index 6c735f1..c951910 100644
--- a/index.php
+++ b/index.php
@@ -256,7 +256,7 @@ if ($_SESSION["userId"] <> "") {
                                                         <div class="ec-pro-actions" style="bottom: -36px;">
                                                             <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
                                                             <?php if (isset($forAll[$pid]["sale_price"]) && $forAll[$pid]["sale_price"] > 0) : ?>
-                                                                <button title="Add To Cart" style="display:none;" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($forAll[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($forAll[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
                                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($forAll[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
                                                                 
                                                             <?php elseif (isset($forAll[$pid]["regular_price"]) && $forAll[$pid]["regular_price"] != "") : ?>
@@ -377,11 +377,11 @@ if ($_SESSION["userId"] <> "") {
                                                         <div class="ec-pro-actions" style="bottom: -36px;">
                                                             <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
                                                             <?php if (isset($electronics[$pid]["sale_price"]) && $electronics[$pid]["sale_price"] > 0) : ?>
-                                                                <button title="Add To Cart" style="display:none;" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Carttt</button>
                                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
                                                                 
                                                             <?php elseif (isset($electronics[$pid]["regular_price"]) && $electronics[$pid]["regular_price"] != "") : ?>
-                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Carttt</button>
                                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($electronics[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
                                                                 
                                                             <?php else : ($electronics[$pid]["regular_price"] == "" || $electronics[$pid]["regular_price"] == null) ?>
@@ -498,7 +498,7 @@ if ($_SESSION["userId"] <> "") {
                                                         <div class="ec-pro-actions"style="bottom: -36px;">
                                                             <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
                                                             <?php if (isset($smartHome[$pid]["sale_price"]) && $smartHome[$pid]["sale_price"] > 0) : ?>
-                                                                <button title="Add To Cart" style="display:none;" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($smartHome[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($smartHome[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
                                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($smartHome[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
                                                                 
                                                             <?php elseif (isset($smartHome[$pid]["regular_price"]) && $smartHome[$pid]["regular_price"] != "") : ?>
@@ -618,7 +618,7 @@ if ($_SESSION["userId"] <> "") {
                                                         <div class="ec-pro-actions"style="bottom: -36px;">
                                                             <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
                                                             <?php if (isset($forVehicle[$pid]["sale_price"]) && $forVehicle[$pid]["sale_price"] > 0) : ?>
-                                                                <button title="Add To Cart" style="display:none;" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($forVehicle[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($forVehicle[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
                                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($forVehicle[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
                                                                 
                                                             <?php elseif (isset($forVehicle[$pid]["regular_price"]) && $forVehicle[$pid]["regular_price"] != "") : ?>
@@ -1240,8 +1240,23 @@ if ($_SESSION["userId"] <> "") {
                                         </a> -->
                                         <!-- raymart edit action feb 14 2024 -->
                                         <div class="ec-pro-actions"style="bottom: -36px;">
-                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
-                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                            <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+                                            <?php if (isset($newArrival[$pid]["sale_price"]) && $newArrival[$pid]["sale_price"] > 0) : ?>
+                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                
+                                            <?php elseif (isset($newArrival[$pid]["regular_price"]) && $newArrival[$pid]["regular_price"] != "") : ?>
+                                                <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                
+                                            <?php else : ($newArrival[$pid]["regular_price"] == "" || $newArrival[$pid]["regular_price"] == null) ?>
+                                                <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                            
+                                            <?php endif; ?>
+                                            <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+
+                                            <!-- <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a> -->
                                         </div>
                                         <!-- <div class="ec-pro-actions">
                                             <button title="Add To Cart" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
diff --git a/product-left-sidebar.php b/product-left-sidebar.php
index 5162c56..7316195 100644
--- a/product-left-sidebar.php
+++ b/product-left-sidebar.php
@@ -74,6 +74,7 @@ if (isset($_GET['id'])) {
     <link rel="stylesheet" href="assets/css/plugins/countdownTimer.css" />
     <link rel="stylesheet" href="assets/css/plugins/slick.min.css" />
     <link rel="stylesheet" href="assets/css/plugins/bootstrap.css" />
+    <link rel="stylesheet" href="assets/css/plugins/nouislider.css" />
 
     <!-- Main Style -->
     <link rel="stylesheet" href="assets/css/style.css" />
@@ -503,8 +504,8 @@ if (isset($_GET['id'])) {
                                                                 echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; 
                                                                 echo '" id="qty-input" />';
                                                                 echo '<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div>';
-                                                                echo '<div id="addToCartMessage"></div>';
-                                                                echo '<button class="btn btn-primary" id="addToCartButton" style="background:#ffaa00; margin-left:55px;"><i class="fi-rr-shopping-bag" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Add To Cart</button>';
+                                                                // echo '<div id="addToCartMessage" style="border:1px solid red;"></div>';
+                                                                echo '<div> <div id="addToCartMessage" style="padding-left:45px;"></div> <button class="btn btn-primary" id="addToCartButton" style="background:#ffaa00; margin-left:55px;"><i class="fi-rr-shopping-bag" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Add To Cart</button></div>';
                                                                 echo '<div class="ec-single-wishlist">
                                                                     <a class="ec-btn-group wishlist" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart" style="color:#B80F0A; font-size:20px;"></i></a>
                                                                 </div>';
@@ -1511,9 +1512,24 @@ if (isset($_GET['id'])) {
                                     </div> -->
                                     <!-- 02-21-2024 Stacy commented out -->
                                     <!-- 02-21-2024 Stacy added  -->
-                                    <div class="ec-pro-actions">
-                                        <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
-                                        <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                    <div class="ec-pro-actions" style="bottom: -36px;">
+                                        <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+                                        <?php if (isset($similar_products[$pid]["sale_price"]) && $similar_products[$pid]["sale_price"] > 0) : ?>
+                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                            
+                                        <?php elseif (isset($similar_products[$pid]["regular_price"]) && $similar_products[$pid]["regular_price"] != "") : ?>
+                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                            
+                                        <?php else : ($similar_products[$pid]["regular_price"] == "" || $similar_products[$pid]["regular_price"] == null) ?>
+                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                        
+                                        <?php endif; ?>
+                                        <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+                                        
+                                        <!-- <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                        <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($similar_products[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a> -->
                                     </div>
                                     <!-- 02-21-2024 Stacy added  -->
                                 </div>
diff --git a/shop-list-left-sidebar.php b/shop-list-left-sidebar.php
index e8987b8..de45a38 100644
--- a/shop-list-left-sidebar.php
+++ b/shop-list-left-sidebar.php
@@ -169,12 +169,17 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
             <div></div>
         </div>
     </div>
+
+    <!-- Header -->
     <?php include "header.php" ?>
-    <?php include "category-slider.php" ?>
+
     <!-- ekka Cart Start -->
 
     <!-- ekka Cart End -->
 
+    <!-- Category Slider -->
+    <?php include "category-slider.php" ?>
+
     <!-- Ec breadcrumb start -->
     <div class="sticky-header-next-sec  ec-breadcrumb section-space-mb">
         <div class="container">
@@ -339,9 +344,24 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
                                                         <img class="main-image" src="<?php echo   $product_image  ?>" alt="Product" />
                                                         <img class="hover-image" src="<?php echo   $product_image  ?>" alt="Product" />
                                                     </a> -->
-                                                    <div class="ec-pro-actions">
-                                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($productWithoutSpecs), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
-                                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($productWithoutSpecs), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                    <div class="ec-pro-actions" style="bottom: -36px;">
+                                                        <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+                                                        <?php if (isset($product["sale_price"]) && $product["sale_price"] > 0) : ?>
+                                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($product), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($product), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                            
+                                                        <?php elseif (isset($product["regular_price"]) && $product["regular_price"] != "") : ?>
+                                                            <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($product), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($product), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                            
+                                                        <?php else : ($product["regular_price"] == "" || $product["regular_price"] == null) ?>
+                                                            <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($product), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
+                                                        
+                                                        <?php endif; ?>
+                                                        <!-- 02-29-2024 Stacy disabling hover add to cart if there's no price -->
+                                                        
+                                                        <!-- <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($productWithoutSpecs), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
+                                                        <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($productWithoutSpecs), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a> -->
                                                     </div>
                                                 </div>
                                             </div>
@@ -482,19 +502,24 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
                                                 </div>
                                             </li>
                                             <li>
-                                                <div>
-                                                    <label for="minPrice">Min Price:</label>
-                                                    <input type="number" name="minPrice" id="minPrice" value="<?php echo isset($_POST['minPrice']) ? $_POST['minPrice'] : (isset($_GET['minPrice']) ? $_GET['minPrice'] : ''); ?>" />
+                                                <div style="padding-top:10px;">
+                                                    <label for="minPrice" style="margin-bottom:-5px;">Min Price:</label>
+                                                    <input style="height:40px" type="number" name="minPrice" id="minPrice" value="<?php echo isset($_POST['minPrice']) ? $_POST['minPrice'] : (isset($_GET['minPrice']) ? $_GET['minPrice'] : ''); ?>" />
                                                 </div>
                                             </li>
                                             <li>
                                                 <div>
-                                                    <label for="maxPrice">Max Price:</label>
-                                                    <input type="number" name="maxPrice" id="maxPrice" value="<?php echo isset($_POST['maxPrice']) ? $_POST['maxPrice'] : (isset($_GET['maxPrice']) ? $_GET['maxPrice'] : ''); ?>" />
+                                                    <label for="maxPrice" style="margin-bottom:-5px;">Max Price:</label>
+                                                    <input style="height:40px" type="number" name="maxPrice" id="maxPrice" value="<?php echo isset($_POST['maxPrice']) ? $_POST['maxPrice'] : (isset($_GET['maxPrice']) ? $_GET['maxPrice'] : ''); ?>" />
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div style="padding-top:10px;">
+                                                    <button style="font-size:12px; height:30px; width:60px;" class="btn-primary" type="submit">Apply</button>
                                                 </div>
                                             </li>
                                         </ul>
-                                        <button type="submit">Apply</button>
+                                        <!-- <button type="submit">Apply</button> -->
                                     </form>
                                     <!-- <form method="POST" action="<?php echo $_SERVER['PHP_SELF'] . '?' . http_build_query(array_merge($_GET, $_POST)); ?>">
 
diff --git a/user-profile.php b/user-profile.php
index d62a6bc..aca6627 100644
--- a/user-profile.php
+++ b/user-profile.php
@@ -45,6 +45,9 @@ if ($_SESSION["userId"] <> "") {
     <link rel="stylesheet" href="assets/css/style2.css" />
     <link rel="stylesheet" href="assets/css/responsive.css" />
 
+    <!-- FONTAWESOME -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
     <!-- Background css -->
     <link rel="stylesheet" id="bg-switcher-css" href="assets/css/backgrounds/bg-4.css">
 
@@ -84,6 +87,25 @@ if ($_SESSION["userId"] <> "") {
             background-color: rgba(0, 0, 0, 0.6);
             border-radius: 5px;
         }
+
+        #editDelete:hover i{
+            color: #ffaa00;
+            cursor: pointer;
+        }
+        #edit_modal .cover-upload:after{
+            background-color: orange;
+        }
+        .ec-user-account .ec-vendor-block-bg {
+            width: 100%;
+            height: 200px;
+            background-image: none;
+            background-size: cover;
+            background-position: center;
+            background-repeat: no-repeat;
+            background-blend-mode: overlay;
+            background-color: rgba(0, 0, 0, 0.6);
+            border-radius: 5px;
+        }
     </style>
 </head>
 
@@ -106,7 +128,7 @@ if ($_SESSION["userId"] <> "") {
     <!-- ekka Cart End -->
 
     <!-- Category Sidebar start -->
-    <?php include "category-slider.php" ?>
+    <?php #include "category-slider.php" ?>
 
     <!-- Ec breadcrumb start -->
     <div class="sticky-header-next-sec  ec-breadcrumb section-space-mb">
@@ -241,7 +263,8 @@ if ($_SESSION["userId"] <> "") {
                         <form id="addressForm">
                             <?php foreach ($customer_data as $customer_index => $customer) { ?>
                                 <?php foreach ($customer['address'] as $address_index => $address) { ?>
-                                    <div class="card mb-3">
+                                    <!-- added id -->
+                                    <div class="card mb-3" id="form-check-<?php echo $address_index ?>">
                                         <div class="card-body">
                                             <div class="selectCon">
                                                 <div class="selectWrap" style="display: flex; justify-content: center; align-items: center; width: 50%;">
@@ -251,7 +274,7 @@ if ($_SESSION["userId"] <> "") {
                                                     </label>
                                                 </div>
 
-                                                <div class="selectWrap" style="display: flex; justify-content: center; align-items: center; width: 50%;">
+                                                <div class="selectWrap" style="display: flex; justify-content: center; align-items: center; width: 50%; margin-left:-20px;">
                                                     <input type="radio" style="padding-left: 0px !important; margin: 0px 0px !important;" name="selectedShippingAddress[<?php echo $customer_index; ?>]" id="shipping_address_<?php echo $customer_index; ?>_<?php echo $address_index; ?>" value="<?php echo $customer_index; ?>_<?php echo $address_index; ?>" class="form-check-input" onchange="updateAddressShipping('<?php echo $customer['_id']; ?>', <?php echo $address_index; ?>, true)" <?php echo $address["shipping"] ? 'checked' : ''; ?>>
                                                     <label class="form-check-label" style="margin: 0px 10px !important;" for="shipping_address_<?php echo $customer_index; ?>_<?php echo $address_index; ?>">
                                                         Shipping Address
@@ -259,10 +282,23 @@ if ($_SESSION["userId"] <> "") {
                                                 </div>
                                             </div>
 
-
+                                            <!-- 03-01-2024 Stacy modified this block of code -->
                                             <div class="container">
                                                 <div class="row">
-                                                    <div class="col-md-12 mx-auto"> <!-- Adjust the column size as needed -->
+                                                    <div class="col-md-12 mx-auto" > <!-- Adjust the column size as needed -->
+                                                        <div id="editDelete" style="display:flex; float:right; width:20px; margin-right:-10px;" > 
+                                                        <?php
+                                                        $address['id'] =$address_index;
+                                                        $jsonAddress = json_encode($address)?>
+                                                            <a href="javascript:0" data-bs-toggle="modal" data-value=' <?php echo $jsonAddress; ?>' data-bs-target="#thirdModal">
+                                                            <i class="fa-regular fa-pen-to-square" style="font-size:15px; float:right;"></i></a>
+                                                            <!-- <i class="fa-regular fa-trash-can" style="font-size:15px; float:right;"></i> -->
+                                                        </div>
+                                                        <div id="editDelete" style="display:flex; float:right; width:20px; margin-top:20px; margin-right:-20px; margin-top:30px;"> 
+                                                            <!-- <i class="fa-solid fa-pen" style="font-size:15px; float:right;"></i></a> -->
+                                                            <i onclick="deleteAddress('<?php echo $customer['_id']; ?>', <?php echo $address_index; ?>, true)"
+                                                                class="fa-regular fa-trash-can" style="font-size:15px; float:right;"></i>
+                                                        </div>
                                                         <label class="form-check-label" for="address_<?php echo $customer_index; ?>_<?php echo $address_index; ?>">
                                                             <?php echo $address['first_name']; ?> <?php echo $address['last_name']; ?><br>
                                                             <?php echo $address['address_1']; ?> <?php echo $address['address_2']; ?>
@@ -270,6 +306,7 @@ if ($_SESSION["userId"] <> "") {
                                                             <?php echo $address['province']; ?> <?php echo $address['country']; ?><br>
                                                             Phone: <?php echo $address['phone']; ?>
                                                         </label>
+            
                                                     </div>
                                                 </div>
                                             </div>
@@ -284,6 +321,7 @@ if ($_SESSION["userId"] <> "") {
             </div>
         </div>
 
+        <!-- secondModal -->
         <div class="modal fade" id="secondModal" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog modal-dialog-centered modal-sm" role="document" style="max-width: 800px;">
                 <div class="modal-content">
@@ -329,7 +367,7 @@ if ($_SESSION["userId"] <> "") {
                             </div>
                             <div class="form-group">
                                 <label for="addressCountry" class="text-dark font-weight-medium pt-3 mb-2">Country</label>
-                                <input type="text" class="form-control" id="addressCountry">
+                                <input type="text" class="form-control" id="addressCountry" >
                             </div>
                             <button type="button" class="btn btn-primary" id="submitBtn">Submit</button>
 
@@ -339,6 +377,91 @@ if ($_SESSION["userId"] <> "") {
                 </div>
             </div>
         </div>
+
+        <!-- 03-01-2024 Stacy added thirdModal -->
+        <div class="modal fade" id="thirdModal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered modal-sm" role="document" style="max-width: 800px;">
+                <div class="modal-content">
+                    <div class="modal-body" style="overflow-y: auto; max-height: 90vh;">
+                        <form>
+                            <div class="form-group">
+
+                                <label for="addressFirstName" class="text-dark font-weight-medium pt-3 mb-2">First Name</label>
+                                <input type="text" class="form-control" 
+                                id="addressFirstName2" 
+                                value="<?php echo $address['first_name']; ?>">
+
+                                <!-- <label for="addressFirstName" class="text-dark font-weight-medium pt-3 mb-2">First Name</label>-->
+                                <input type="hidden" class="form-control" id="addressId" >
+                            </div>
+                            <div class="form-group">
+
+                                <label for="addressLastName" class="text-dark font-weight-medium pt-3 mb-2">Last Name</label>
+                                <input type="text" class="form-control" id="addressLastName2" value="<?php echo $address['last_name']; ?>">
+                                <!-- <label for="addressLastName" class="text-dark font-weight-medium pt-3 mb-2">Last Name</label>
+                                <input type="text" class="form-control" id="addressLastName"> -->
+                            </div>
+                            <div class="form-group">
+
+                                <label for="addressContact" class="text-dark font-weight-medium pt-3 mb-2">Contact Number</label>
+                                <input type="text" class="form-control" id="addressContact2" value="<?php echo $address['phone']; ?>">
+
+                                
+                                <!-- <label for="addressContact" class="text-dark font-weight-medium pt-3 mb-2">Contact Number</label>
+                                <input type="number" class="form-control" id="addressContact"> -->
+                            </div>
+                            <div class="form-group">
+
+                                <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2">Building,Number</label>
+                                <input type="text" class="form-control" id="addressBuilding2" value="<?php echo $address['address_1']; ?>">
+
+                                <!-- <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2"> Building,Number </label>
+                                <input type="text" class="form-control" id="addressBuilding"> -->
+                            </div>
+                            <div class="form-group">
+
+                                <label for="addressStreet" class="text-dark font-weight-medium pt-3 mb-2">Street </label>
+                                <input type="text" class="form-control" id="addressStreet2" value="<?php echo $address['address_2']; ?>">
+
+                                <!-- <label for="addressStreet" class="text-dark font-weight-medium pt-3 mb-2"> Street </label>
+                                <input type="text" class="form-control" id="addressStreet"> -->
+                            </div>
+                            <div class="form-group">
+
+                                <label for="provinceSelect2">Province</label>
+                                <select class="form-select" id="provinceSelect2">
+                                    <option id="provinceSelect2Opt"  value="<?php echo $address['province']; ?>" >Select Province</option>
+                                </select>
+
+                                <!-- <label for="provinceSelect">Province</label>
+                                <select class="form-select" id="provinceSelect">
+                                    <option value="" disabled selected hidden>Select Province</option>
+                                </select> -->
+                            </div>
+                            <div class="form-group">
+                                <label for="citySelect2">Municipality/City</label>
+                                <select class="form-select" id="citySelect2" required>
+                                    <option value="" id="citySelect2Opt"  selected hidden>Select Municipality/City</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label for="barangaySelect2">Barangay</label>
+                                <select class="form-select" id="barangaySelect2" required>
+                                    <option value="" id="barangaySelect2Opt"  selected hidden>Select Barangay</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label for="addressCountry2" class="text-dark font-weight-medium pt-3 mb-2">Country</label>
+                                <input type="text" class="form-control" id="addressCountry2">
+                            </div>
+                            <button type="button" class="btn btn-primary" id="submitBtn2">Submit</button>
+                            
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <script>
             // var myElement = document.getElementById('myElement');
             // myElement.style.backgroundImage = 'red';
@@ -385,6 +508,205 @@ if ($_SESSION["userId"] <> "") {
         </script>
 
         <script>
+            // function for delete
+            function deleteAddress(customerId, addressIndex) {
+                fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/' + customerId)
+                .then(response => response.json())
+                .then(data => {
+                    let existingAddresses = data.address || [];
+                    if (addressIndex >= 0 && addressIndex < existingAddresses.length) {
+                        existingAddresses.splice(addressIndex, 1);
+                        fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/' + customerId, {
+                            method: 'PATCH',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify({
+                                address: existingAddresses
+                            }),
+                        })
+                        .then(response => {
+                            if (response.ok) {
+                                location.reload();
+                                // filter the delete action
+                                document.getElementById('form-check-' + addressIndex).remove();
+                            } else {
+                                console.error('Failed to submit data');
+                                alert('Failed to submit data');
+                            }
+                        })
+                        .catch(error => {
+                            console.error('Error:', error);
+                            alert('Error submitting data');
+                        });
+                    } else {
+                        console.log("Invalid address index.");
+                    }
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                    alert('Error fetching customer data');
+                });
+}
+        </script>
+
+        <script>
+            // 03-04-2024 added 
+
+            $('#thirdModal').on('shown.bs.modal', function (event) {
+ 
+            var jsonString = $(event.relatedTarget).data('value');
+            
+            var jsonObject = JSON.parse(jsonString);
+            console.log(jsonObject)
+
+            // document.getElementById("addressFirstName2").value('mmmm');
+            //  $('#addressFirstName2').setAttribute('value','My default value');
+            
+            // shows inputed data by the customer
+            document.querySelector('input[id="addressFirstName2"]').value = jsonObject.first_name;
+            document.querySelector('input[id="addressLastName2"]').value = jsonObject.last_name;
+            document.querySelector('input[id="addressContact2"]').value = jsonObject.phone;
+            document.querySelector('input[id="addressBuilding2"]').value = jsonObject.address_1;
+            document.querySelector('input[id="addressStreet2"]').value = jsonObject.address_2;
+            document.querySelector('option[id="provinceSelect2Opt"]').text = jsonObject.province;
+            document.querySelector('option[id="provinceSelect2Opt"]').value = jsonObject.province;
+
+            document.querySelector('option[id="citySelect2Opt"]').text = jsonObject.city;
+            document.querySelector('option[id="citySelect2Opt"]').value = jsonObject.city;
+
+            document.querySelector('option[id="barangaySelect2Opt"]').text = jsonObject.barangay;
+            document.querySelector('option[id="barangaySelect2Opt"]').value = jsonObject.barangay;
+
+            document.querySelector('input[id="addressCountry2"]').value = jsonObject.country;
+            document.querySelector('input[id="addressId"]').value = jsonObject.id;
+
+
+
+            console.log('id ' + jsonObject.id)
+            const provinceSelect = $('#provinceSelect2'); // Use jQuery to select the element
+            const citySelect = $('#citySelect2'); // Use jQuery to select the element
+            const barangaySelect = $('#barangaySelect2'); // Use jQuery to select the element
+
+            // Initialize Select2 on the provinceSelect, citySelect, and barangaySelect elements
+            provinceSelect.select2({
+                dropdownParent: $('#thirdModal'),
+                containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+            });
+
+            citySelect.select2({
+                dropdownParent: $('#thirdModal'),
+                containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+            });
+            barangaySelect.select2({
+                dropdownParent: $('#thirdModal'),
+                containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+            });
+
+            // Fetch provinces data
+            fetch('https://psgc.gitlab.io/api/provinces')
+                .then(response => {
+                    if (response.ok) {
+                        return response.json();
+                    } else {
+                        console.error('Failed to fetch provinces');
+                        throw new Error('Failed to fetch provinces');
+                    }
+                })
+                .then(provincesData => {
+                    // Iterate through the provinces data and add options
+                    provincesData.forEach(province => {
+                        const option = new Option(province.name, province.code);
+                        provinceSelect.append(option);
+                    });
+
+                    // Add an extra option manually
+                    const extraOption = new Option('Metro Manila', '130000000');
+                    provinceSelect.append(extraOption);
+
+                    // Add event listener to provinceSelect
+                    provinceSelect.on('change', function() {
+                        // Clear existing options in citySelect and barangaySelect
+                        citySelect.html('<option value="" disabled selected hidden>Select City</option>');
+                        barangaySelect.html('<option value="" disabled selected hidden>Select Barangay</option>');
+
+                        // Fetch and update cities/municipalities based on the selected province
+                        updateCities();
+                    });
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                });
+
+            // Function to update city/municipality options based on the selected province
+            function updateCities() {
+                const selectedProvinceCode = provinceSelect.val(); // Use val() to get the selected value with Select2
+                if (selectedProvinceCode) {
+                    let citiesEndpoint;
+                    if (selectedProvinceCode === '130000000') {
+                        // Check if Metro Manila is selected
+                        citiesEndpoint = 'https://psgc.gitlab.io/api/regions/130000000/cities-municipalities/';
+                    } else {
+                        citiesEndpoint = `https://psgc.gitlab.io/api/provinces/${selectedProvinceCode}/cities-municipalities/`;
+                    }
+
+                    fetch(citiesEndpoint)
+                        .then(response => {
+                            if (response.ok) {
+                                return response.json();
+                            } else {
+                                console.error('Failed to fetch cities/municipalities');
+                                throw new Error('Failed to fetch cities/municipalities');
+                            }
+                        })
+                        .then(citiesData => {
+                            // Iterate through the cities data and add options
+                            citiesData.forEach(city => {
+                                const option = new Option(city.name, city.code);
+                                citySelect.append(option);
+                            });
+                        })
+                        .catch(error => {
+                            console.error('Error:', error);
+                        });
+                }
+            }
+
+            // Add event listener to citySelect
+            citySelect.on('change', function() {
+                // Clear existing options in barangaySelect
+                barangaySelect.html('<option value="" disabled selected hidden>Select Barangay</option>');
+
+                // Fetch and update barangays based on the selected city/municipality
+                const selectedCityCode = citySelect.val();
+                if (selectedCityCode) {
+                    fetch(`https://psgc.gitlab.io/api/cities-municipalities/${selectedCityCode}/barangays/`)
+                        .then(response => {
+                            if (response.ok) {
+                                return response.json();
+                            } else {
+                                console.error('Failed to fetch barangays');
+                                throw new Error('Failed to fetch barangays');
+                            }
+                        })
+                        .then(barangaysData => {
+                            // Iterate through the barangays data and add options
+                            barangaysData.forEach(barangay => {
+                                const option = new Option(barangay.name, barangay.code);
+                                barangaySelect.append(option);
+                            });
+                        })
+                        .catch(error => {
+                            console.error('Error:', error);
+                        });
+                }
+            });
+
+            // document.querySelector('input[id="addressFirstName2"]').value = jsonObject.last_name;
+            });
+
+
+
             const customerId = '<?php echo $customer_data[0]['_id']; ?>';
             document.addEventListener('DOMContentLoaded', function() {
                 // Get the select elements
@@ -511,6 +833,7 @@ if ($_SESSION["userId"] <> "") {
                 $('#submitBtn').on('click', function() {
                     // Retrieve existing addresses from the API
                     // fetch('https://api.obanana.shop/api/v1/customers/65482e8d209ff8d348bd30fd')
+                    console.log('clickkkkkkkk')
                     fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/' + customerId)
                         .then(response => response.json())
                         .then(data => {
@@ -575,6 +898,93 @@ if ($_SESSION["userId"] <> "") {
 
 
             });
+
+            
+            // Added function for edit
+            $('#submitBtn2').on('click', function() {
+            // function updateAddress(){
+            // Retrieve existing addresses from the API
+            // fetch('https://api.obanana.shop/api/v1/customers/65482e8d209ff8d348bd30fd')
+            fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/' + customerId)
+                .then(response => response.json())
+                .then(data => {
+                    // Get the existing addresses array
+                    const existingAddresses = data.address || [];
+
+                    // Get the new address details
+                    const firstName = $('#addressFirstName2').val();
+                    const lastName = $('#addressLastName2').val();
+                    const contact = $('#addressContact2').val();
+                    const buildingNumber = $('#addressBuilding2').val();
+                    const street = $('#addressStreet2').val();
+                    const province = $('#provinceSelect2 :selected').text();
+                    const city = $('#citySelect2 :selected').text();
+                    const barangay = $('#barangaySelect2 :selected').text();
+                    const country = $('#addressCountry2').val();
+                    const id = $('#addressId').val();
+                    console.log('clickkkkkkkk'+ id)
+
+
+                    // Create a new address object
+                    const newAddress = {
+                        first_name: firstName,
+                        last_name: lastName,
+                        phone: contact,
+                        address_1: buildingNumber,
+                        address_2: street,
+                        city: city,
+                        province: province,
+                        barangay: barangay,
+                        country: country,
+                    };
+
+                    // Add the new address to the existing addresses
+                    // existingAddresses.push(newAddress);
+                    
+                //    var newAddresses= existingAddresses.filter((e,i)=>i!==id)
+                    let existingAddress = existingAddresses
+
+                    existingAddress[id]={
+                        first_name: firstName,
+                        last_name: lastName,
+                        phone: contact,
+                        address_1: buildingNumber,
+                        address_2: street,
+                        city: city,
+                        province: province,
+                        barangay: barangay,
+                        country: country,
+                    };
+                    console.log( existingAddress[id])
+                    // Make a PATCH request to update the addresses array
+                    return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/' + customerId, {
+                        method: 'PATCH',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify({
+                            address: existingAddress
+                        }),
+                    });
+                })
+                .then(response => {
+                    if (response.ok) {
+                        // Handle success (e.g., show a success message)
+                        location.reload();
+                    } else {
+                        // Handle error
+                        console.error('Failed to submit data');
+                        alert('Failed to submit data');
+                    }
+                })
+                .catch(error => {
+                    // Handle network or other errors
+                    console.error('Error:', error);
+                    alert('Error submitting data');
+                });
+        });
+
+
         </script>
 
         <script>
@@ -636,6 +1046,8 @@ if ($_SESSION["userId"] <> "") {
 
             async function updateAddressShipping(customerId, addressIndex, isShipping) {
                 try {
+                    // const customerId = `<?php #echo $customer_data[0]['_id']; ?>`;
+                    
                     const apiUrl = `https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/customers/${customerId}`;
                     const response = await fetch(apiUrl, {
                         method: 'GET',
@@ -703,6 +1115,8 @@ if ($_SESSION["userId"] <> "") {
                         sCountryElement.textContent = customerData.address[addressIndex].country;
                     }
                     console.log(`Address updated successfully for customer ${customerId}`);
+                    // location.reload();
+                    // header("location: user-profile.php");
                 } catch (error) {
                     console.error('Error updating address:', error.message);
                 }
diff --git a/vendor-settings.php b/vendor-settings.php
index ac9bfdb..0714db6 100644
--- a/vendor-settings.php
+++ b/vendor-settings.php
@@ -387,6 +387,15 @@ if ($_SESSION["userId"] <> "") {
                     });
 
             }
+
+            //S 03-06-2024 Stacy added upload function
+            function addProduct() {
+                console.log("Session Token:", sessionToken);
+                login(email, password, function() {
+                    // Removed the call to updateSessionToken
+                    window.open("vendor-uploads-add-product-action.php", "_self");
+                });
+            }
         </script>
         <script>
             const vendorid = `<?php echo $_SESSION["LoggedInVendorId"]; ?>`;
-- 
2.40.1


From 639bccf3e50fddf9ff5d9e0e0c196de89fe0edb5 Mon Sep 17 00:00:00 2001
From: Stacy <stacyjoycemapano@gmail.com>
Date: Thu, 7 Mar 2024 11:06:56 +0800
Subject: [PATCH 2/2] added delete and edit for user profile and modified
 category slider

---
 user-profile.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/user-profile.php b/user-profile.php
index aca6627..71eca38 100644
--- a/user-profile.php
+++ b/user-profile.php
@@ -92,20 +92,6 @@ if ($_SESSION["userId"] <> "") {
             color: #ffaa00;
             cursor: pointer;
         }
-        #edit_modal .cover-upload:after{
-            background-color: orange;
-        }
-        .ec-user-account .ec-vendor-block-bg {
-            width: 100%;
-            height: 200px;
-            background-image: none;
-            background-size: cover;
-            background-position: center;
-            background-repeat: no-repeat;
-            background-blend-mode: overlay;
-            background-color: rgba(0, 0, 0, 0.6);
-            border-radius: 5px;
-        }
     </style>
 </head>
 
-- 
2.40.1