From e9a05054509d29addf24c4420bf838ba1324edc1 Mon Sep 17 00:00:00 2001
From: JunBarroga <jjbarroga@premiummegastructures.com>
Date: Tue, 19 Mar 2024 18:28:43 +0800
Subject: [PATCH 1/5] 	modified:   cart1.php 	modified:  
 catalog-single-vendor.php 	new file:   faq.php 	modified:   footer.php
 	modified:   header.php

---
 admin/config.php          |   4 +-
 cart1.php                 |   6 +-
 catalog-single-vendor.php |   2 +-
 faq.php                   | 688 ++++++++++++++++++++++++++++++++++++++
 footer.php                |   2 +-
 header.php                |   4 +-
 6 files changed, 697 insertions(+), 9 deletions(-)
 create mode 100644 faq.php

diff --git a/admin/config.php b/admin/config.php
index ae055ef..2c49fab 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -1,8 +1,8 @@
 <?php
-$_SESSION["is_test"]=false;
+$_SESSION["is_test"]=true;
 $_SESSION["test_email_rcpt"]="";
 $_SESSION["sales_email"]="sales@obanana.com";
-$_SESSION["data_endpoint"]="api.obanana.com";
+$_SESSION["data_endpoint"]="api.obanana.shop";
 if ($_SESSION["is_test"]){
     $_SESSION["obpay"]="web.obanana.io/test";
     $_SESSION["obpay_gate"]="gate.obanana.io/api";
diff --git a/cart1.php b/cart1.php
index fc5e185..03b744e 100644
--- a/cart1.php
+++ b/cart1.php
@@ -356,7 +356,7 @@
                                         <li><a href="cart.html">Cart</a></li>
                                         <li><a href="checkout.html">Checkout</a></li>
                                         <li><a href="compare.html">Compare</a></li>
-                                        <li><a href="faq.html">FAQ</a></li>
+                                        <li><a href="faq.php">FAQ</a></li>
                                         <li><a href="login.php">Login</a></li>
                                         <li><a href="register.php">Register</a></li>
                                         <li><a href="track-order.html">Track Order</a></li>
@@ -645,7 +645,7 @@
                                 <li><a href="cart.html">Cart</a></li>
                                 <li><a href="checkout.html">Checkout</a></li>
                                 <li><a href="compare.html">Compare</a></li>
-                                <li><a href="faq.html">FAQ</a></li>
+                                <li><a href="faq.php">FAQ</a></li>
                                 <li><a href="login.php">Login</a></li>
                                 <li><a href="register.php">Register</a></li>
                                 <li><a href="track-order.html">Track Order</a></li>
@@ -1365,7 +1365,7 @@
                                 <div class="ec-footer-links">
                                     <ul class="align-items-center">
                                         <li class="ec-footer-link"><a href="about-us.html">About us</a></li>
-                                        <li class="ec-footer-link"><a href="faq.html">FAQ</a></li>
+                                        <li class="ec-footer-link"><a href="faq.php">FAQ</a></li>
                                         <li class="ec-footer-link"><a href="#">Delivery Information</a></li>
                                         <li class="ec-footer-link"><a href="contact-us.html">Contact us</a></li>
                                     </ul>
diff --git a/catalog-single-vendor.php b/catalog-single-vendor.php
index 89f90a2..4407782 100644
--- a/catalog-single-vendor.php
+++ b/catalog-single-vendor.php
@@ -704,7 +704,7 @@ if ($_SESSION["userId"] <> "") {
                                 <div class="ec-footer-links">
                                     <ul class="align-items-center">
                                         <li class="ec-footer-link"><a href="about-us.html">About us</a></li>
-                                        <li class="ec-footer-link"><a href="faq.html">FAQ</a></li>
+                                        <li class="ec-footer-link"><a href="faq.php">FAQ</a></li>
                                         <li class="ec-footer-link"><a href="#">Delivery Information</a></li>
                                         <li class="ec-footer-link"><a href="contact-us.html">Contact us</a></li>
                                     </ul>
diff --git a/faq.php b/faq.php
new file mode 100644
index 0000000..f0f64e5
--- /dev/null
+++ b/faq.php
@@ -0,0 +1,688 @@
+ <!DOCTYPE html>
+ <html lang="en">
+ 
+ <head>
+     <meta charset="UTF-8">
+     <meta http-equiv="x-ua-compatible" content="ie=edge" />
+     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
+ 
+     <title>oBanana B2B - Elevate Your Business</title>
+     <meta name="keywords"
+         content="apparel, catalog, clean, ecommerce, ecommerce HTML, electronics, fashion, html eCommerce, html store, minimal, multipurpose, multipurpose ecommerce, online store, responsive ecommerce template, shops" />
+     <meta name="description" content="Best ecommerce html template for single and multi vendor store.">
+     <meta name="author" content="ashishmaraviya">
+ 
+     <!-- site Favicon -->
+     <link rel="icon" href="assets/images/favicon/favicon.png" sizes="32x32" />
+     <link rel="apple-touch-icon" href="assets/images/favicon/favicon.png" />
+     <meta name="msapplication-TileImage" content="assets/images/favicon/favicon.png" />
+ 
+     <!-- css Icon Font -->
+     <link rel="stylesheet" href="assets/css/vendor/ecicons.min.css" />
+ 
+     <!-- css All Plugins Files -->
+     <link rel="stylesheet" href="assets/css/plugins/animate.css" />
+     <link rel="stylesheet" href="assets/css/plugins/swiper-bundle.min.css" />
+     <link rel="stylesheet" href="assets/css/plugins/jquery-ui.min.css" />
+     <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" />
+ 
+     <!-- Main Style -->
+     <link rel="stylesheet" href="assets/css/style.css" />
+     <link rel="stylesheet" href="assets/css/responsive.css" />
+ 
+     <!-- Background css -->
+     <link rel="stylesheet" id="bg-switcher-css" href="assets/css/backgrounds/bg-4.css">
+ </head>
+<body class="aboutus_page">
+    <div id="ec-overlay">
+        <div class="ec-ellipsis">
+            <div></div>
+            <div></div>
+            <div></div>
+            <div></div>
+        </div>
+    </div>
+
+    <?php include 'header.php'; ?>
+
+    <!-- ekka Cart Start -->
+    <div class="ec-side-cart-overlay"></div>
+    <div id="ec-side-cart" class="ec-side-cart">
+        <div class="ec-cart-inner">
+            <div class="ec-cart-top">
+                <div class="ec-cart-title">
+                    <span class="cart_title">My Cart</span>
+                    <button class="ec-close">×</button>
+                </div>
+                <ul class="eccart-pro-items">
+                    <li>
+                        <a href="shop-left-sidebar-col-4.php" class="sidekka_pro_img"><img
+                                src="assets/images/product-image/6_1.jpg" alt="product"></a>
+                        <div class="ec-pro-content">
+                            <a href="shop-left-sidebar-col-4.php" class="cart_pro_title">T-shirt For Women</a>
+                            <span class="cart-price"><span>$76.00</span> x 1</span>
+                            <div class="qty-plus-minus">
+                                <input class="qty-input" type="text" name="ec_qtybtn" value="1" />
+                            </div>
+                            <a href="javascript:void(0)" class="remove">×</a>
+                        </div>
+                    </li>
+                    <li>
+                        <a href="shop-left-sidebar-col-4.php" class="sidekka_pro_img"><img
+                                src="assets/images/product-image/12_1.jpg" alt="product"></a>
+                        <div class="ec-pro-content">
+                            <a href="shop-left-sidebar-col-4.php" class="cart_pro_title">Women Leather Shoes</a>
+                            <span class="cart-price"><span>$64.00</span> x 1</span>
+                            <div class="qty-plus-minus">
+                                <input class="qty-input" type="text" name="ec_qtybtn" value="1" />
+                            </div>
+                            <a href="javascript:void(0)" class="remove">×</a>
+                        </div>
+                    </li>
+                    <li>
+                        <a href="shop-left-sidebar-col-4.php" class="sidekka_pro_img"><img
+                                src="assets/images/product-image/3_1.jpg" alt="product"></a>
+                        <div class="ec-pro-content">
+                            <a href="shop-left-sidebar-col-4.php" class="cart_pro_title">Girls Nylon Purse</a>
+                            <span class="cart-price"><span>$59.00</span> x 1</span>
+                            <div class="qty-plus-minus">
+                                <input class="qty-input" type="text" name="ec_qtybtn" value="1" />
+                            </div>
+                            <a href="javascript:void(0)" class="remove">×</a>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div class="ec-cart-bottom">
+                <div class="cart-sub-total">
+                    <table class="table cart-table">
+                        <tbody>
+                            <tr>
+                                <td class="text-left">Sub-Total :</td>
+                                <td class="text-right">$300.00</td>
+                            </tr>
+                            <tr>
+                                <td class="text-left">VAT (20%) :</td>
+                                <td class="text-right">$60.00</td>
+                            </tr>
+                            <tr>
+                                <td class="text-left">Total :</td>
+                                <td class="text-right primary-color">$360.00</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div class="cart_btn">
+                    <a href="cart.html" class="btn btn-primary">View Cart</a>
+                    <a href="checkout.html" class="btn btn-secondary">Checkout</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- ekka Cart End -->
+
+    <!-- Ec breadcrumb start -->
+    <div class="sticky-header-next-sec  ec-breadcrumb section-space-mb">
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <div class="row ec_breadcrumb_inner">
+                        <div class="col-md-6 col-sm-12">
+                            <h2 class="ec-breadcrumb-title">About Us</h2>
+                        </div>
+                        <div class="col-md-6 col-sm-12">
+                            <!-- ec-breadcrumb-list start -->
+                            <ul class="ec-breadcrumb-list">
+                                <li class="ec-breadcrumb-item"><a href="index.php">Home</a></li>
+                                <li class="ec-breadcrumb-item active">About Us</li>
+                            </ul>
+                            <!-- ec-breadcrumb-list end -->
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Ec breadcrumb end -->
+
+    <!-- Ec About Us page -->
+    <section class="ec-page-content section-space-p">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    <div class="section-title">
+                        <h2 class="ec-bg-title">FAQ</h2>
+                        <h2 class="ec-title">FAQ</h2>
+                        <p class="sub-title mb-3">Frequently Asked Questions</p>
+                    </div>
+                </div>
+                <div class="ec-common-wrapper">
+                    <div class="row">
+                        <!-- <div class="col-md-6 ec-cms-block ec-abcms-block text-center">
+                            <div class="ec-cms-block-inner">
+                            <img class="a-img" src="assets/images/offer-image/1.jpg" alt="about">
+                            </div>
+                        </div> -->
+                        <div class="col-md-12 ec-cms-block ec-abcms-block text-center">
+                            <div class="ec-cms-block-inner">
+                                <h3 class="ec-cms-block-title">What is Obanana Corporation's B2B eCommerce platform?</h3>
+                                <p>Obanana Corporation's B2B eCommerce platform is an online marketplace designed to connect businesses worldwide, facilitating trade between buyers and sellers.</p>
+                                <h3 class="ec-cms-block-title">What kind of products can be found on the Obanana Corporation platform?</h3>
+                                <p>Our platform offers a diverse range of products across various industries, including but not limited to electronics, clothing, machinery, raw materials, and more, catering to the needs of businesses across different sectors.</p>
+                                <h3 class="ec-cms-block-title">How does the platform ensure the quality of products listed?</h3>
+                                <p>To ensure quality standards, we implement rigorous verification processes for both sellers and products. We encourage buyers to provide feedback and ratings based on their experience, fostering transparency and trust within our marketplace.</p>
+                                <h3 class="ec-cms-block-title">What are the payment options available on the Obanana Corporation platform?</h3>
+                                <p>We offer a variety of secure payment options to accommodate the needs of our users, including bank transfers, credit/debit cards, and third-party payment gateways, ensuring smooth and secure transactions.</p>
+                                <h3 class="ec-cms-block-title">Can buyers and sellers communicate directly on the platform?</h3>
+                                <p>Yes, our platform facilitates direct communication between buyers and sellers through messaging features and inquiry forms, allowing for seamless negotiation and collaboration.</p>
+                                <h3 class="ec-cms-block-title">How does shipping and logistics work on the Obanana Corporation platform?</h3>
+                                <p>We provide comprehensive shipping and logistics solutions, including freight forwarding services and shipping partners, to ensure efficient and timely delivery of goods to buyers worldwide.</p>
+                                <h3 class="ec-cms-block-title">Are there any minimum order requirements for purchasing on the platform?</h3>
+                                <p>Minimum order requirements may vary depending on the seller and product category. Buyers can find detailed information regarding minimum order quantities on product listings.</p>
+                                <h3 class="ec-cms-block-title">Does Obanana Corporation offer any trade assurance or buyer protection services?</h3>
+                                <p>Yes, we provide trade assurance services to protect buyers' interests, offering refunds or replacements for orders that do not meet agreed-upon quality standards or fail to arrive within specified delivery times.</p>
+                                <h3 class="ec-cms-block-title">How does Obanana Corporation handle disputes between buyers and sellers?</h3>
+                                <p>In the event of disputes, our dedicated support team mediates and facilitates resolution through our dispute resolution process, ensuring fair outcomes for all parties involved.</p>
+                                <h3 class="ec-cms-block-title">How can businesses join the Obanana Corporation platform as sellers?</h3>
+                                <p>Businesses interested in becoming sellers on our platform can apply for membership through our website, where they will undergo a verification process to ensure compliance with our standards and policies.</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- ec testmonial Start -->
+    <section class="section ec-test-section section-space-ptb-100 section-space-m" id="reviews">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    <div class="section-title mb-0">
+                        <h2 class="ec-bg-title">Testimonial</h2>
+                        <h2 class="ec-title">Client Review</h2>
+                        <p class="sub-title mb-3">What say client about us</p>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="ec-test-outer">
+                    <ul id="ec-testimonial-slider">
+                        <li class="ec-test-item">
+                            <i class="fi-rr-quote-right top"></i>
+                            <div class="ec-test-inner">
+                                <div class="ec-test-img"><img alt="testimonial" title="testimonial"
+                                        src="assets/images/testimonial/1.jpg" /></div>
+                                <div class="ec-test-content">
+                                    <div class="ec-test-desc">Lorem Ipsum is simply dummy text of the printing and
+                                        typesetting industry. Lorem Ipsum has been the industry's standard dummy text
+                                        ever since the 1500s, when an unknown printer took a galley of type and
+                                        scrambled it to make a type specimen</div>
+                                    <div class="ec-test-name">John Doe</div>
+                                    <div class="ec-test-designation">General Manager</div>
+                                    <div class="ec-test-rating">
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <i class="fi-rr-quote-right bottom"></i>
+                        </li>
+                        <li class="ec-test-item ">
+                            <i class="fi-rr-quote-right top"></i>
+                            <div class="ec-test-inner">
+                                <div class="ec-test-img"><img alt="testimonial" title="testimonial"
+                                        src="assets/images/testimonial/2.jpg" /></div>
+                                <div class="ec-test-content">
+                                    <div class="ec-test-desc">Lorem Ipsum is simply dummy text of the printing and
+                                        typesetting industry. Lorem Ipsum has been the industry's standard dummy text
+                                        ever since the 1500s, when an unknown printer took a galley of type and
+                                        scrambled it to make a type specimen</div>
+                                    <div class="ec-test-name">John Doe</div>
+                                    <div class="ec-test-designation">General Manager</div>
+                                    <div class="ec-test-rating">
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <i class="fi-rr-quote-right bottom"></i>
+                        </li>
+                        <li class="ec-test-item">
+                            <i class="fi-rr-quote-right top"></i>
+                            <div class="ec-test-inner">
+                                <div class="ec-test-img"><img alt="testimonial" title="testimonial"
+                                        src="assets/images/testimonial/3.jpg" /></div>
+                                <div class="ec-test-content">
+                                    <div class="ec-test-desc">Lorem Ipsum is simply dummy text of the printing and
+                                        typesetting industry. Lorem Ipsum has been the industry's standard dummy text
+                                        ever since the 1500s, when an unknown printer took a galley of type and
+                                        scrambled it to make a type specimen</div>
+                                    <div class="ec-test-name">John Doe</div>
+                                    <div class="ec-test-designation">General Manager</div>
+                                    <div class="ec-test-rating">
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                        <i class="ecicon eci-star fill"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <i class="fi-rr-quote-right bottom"></i>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </section>
+    <!-- ec testmonial end -->
+
+    <!--  services Section Start -->
+    <section class="section ec-services-section section-space-p" id="services">
+        <h2 class="d-none">Services</h2>
+        <div class="container">
+            <div class="row">
+                <div class="ec_ser_content ec_ser_content_1 col-sm-12 col-md-6 col-lg-3" data-animation="zoomIn">
+                    <div class="ec_ser_inner">
+                        <div class="ec-service-image">
+                            <i class="fi fi-ts-truck-moving"></i>
+                        </div>
+                        <div class="ec-service-desc">
+                            <h2>Free Shipping</h2>
+                            <p>Free shipping on all US order or order above $200</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="ec_ser_content ec_ser_content_2 col-sm-12 col-md-6 col-lg-3" data-animation="zoomIn">
+                    <div class="ec_ser_inner">
+                        <div class="ec-service-image">
+                            <i class="fi fi-ts-hand-holding-seeding"></i>
+                        </div>
+                        <div class="ec-service-desc">
+                            <h2>24X7 Support</h2>
+                            <p>Contact us 24 hours a day, 7 days a week</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="ec_ser_content ec_ser_content_3 col-sm-12 col-md-6 col-lg-3" data-animation="zoomIn">
+                    <div class="ec_ser_inner">
+                        <div class="ec-service-image">
+                            <i class="fi fi-ts-badge-percent"></i>
+                        </div>
+                        <div class="ec-service-desc">
+                            <h2>30 Days Return</h2>
+                            <p>Simply return it within 30 days for an exchange</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="ec_ser_content ec_ser_content_4 col-sm-12 col-md-6 col-lg-3" data-animation="zoomIn">
+                    <div class="ec_ser_inner">
+                        <div class="ec-service-image">
+                            <i class="fi fi-ts-donate"></i>
+                        </div>
+                        <div class="ec-service-desc">
+                            <h2>Payment Secure</h2>
+                            <p>Contact us 24 hours a day, 7 days a week</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    <!--services Section End -->
+
+    <!-- Ec Instagram Start -->
+    <!-- <section class="section ec-instagram-section module section-space-p">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    <div class="section-title">
+                        <h2 class="ec-bg-title">Instagram Feed</h2>
+                        <h2 class="ec-title">Instagram Feed</h2>
+                        <p class="sub-title">Share your store with us</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="ec-insta-wrapper">
+            <div class="ec-insta-outer">
+                <div class="container">
+                    <div class="insta-auto"> -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/1.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/2.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/3.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/4.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/5.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/6.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+                        <!-- instagram item -->
+                        <!-- <div class="ec-insta-item">
+                            <div class="ec-insta-inner">
+                                <a href="#" target="_blank"><img src="assets/images/instragram-image/7.jpg"
+                                        alt="insta"></a>
+                            </div>
+                        </div> -->
+                        <!-- instagram item -->
+
+                    <!-- </div>
+                </div>
+            </div>
+        </div>
+    </section> -->
+    <!-- Ec Instagram End -->
+
+    <?php include 'footer.php'; ?>
+
+    <!-- Footer navigation panel for responsive display -->
+    <div class="ec-nav-toolbar">
+        <div class="container">
+            <div class="ec-nav-panel">
+                <div class="ec-nav-panel-icons">
+                    <a href="#ec-mobile-menu" class="navbar-toggler-btn ec-header-btn ec-side-toggle"><i
+                            class="fi-rr-menu-burger"></i></a>
+                </div>
+                <div class="ec-nav-panel-icons">
+                    <a href="#ec-side-cart" class="toggle-cart ec-header-btn ec-side-toggle"><i
+                            class="fi-rr-shopping-bag"></i><span
+                            class="ec-cart-noti ec-header-count cart-count-lable">3</span></a>
+                </div>
+                <div class="ec-nav-panel-icons">
+                    <a href="index.php" class="ec-header-btn"><i class="fi-rr-home"></i></a>
+                </div>
+                <div class="ec-nav-panel-icons">
+                    <a href="wishlist.html" class="ec-header-btn"><i class="fi-rr-heart"></i><span
+                            class="ec-cart-noti">4</span></a>
+                </div>
+                <div class="ec-nav-panel-icons">
+                    <a href="login.php" class="ec-header-btn"><i class="fi-rr-user"></i></a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <!-- Footer navigation panel for responsive display end -->
+
+    <!-- Recent Purchase Popup  -->
+    <div class="recent-purchase">
+        <img src="assets/images/product-image/1.jpg" alt="payment image">
+        <div class="detail">
+            <p>Someone in new just bought</p>
+            <h6>stylish baby shoes</h6>
+            <p>10 Minutes ago</p>
+        </div>
+        <a href="javascript:void(0)" class="icon-btn recent-close">×</a>
+    </div>
+    <!-- Recent Purchase Popup end -->
+
+    <!-- Cart Floating Button -->
+    <div class="ec-cart-float">
+        <a href="#ec-side-cart" class="ec-header-btn ec-side-toggle">
+            <div class="header-icon"><i class="fi-rr-shopping-basket"></i>
+            </div>
+            <span class="ec-cart-count cart-count-lable">3</span>
+        </a>
+    </div>
+    <!-- Cart Floating Button end -->
+
+    <!-- Whatsapp -->
+    <div class="ec-style ec-right-bottom">
+        <!-- Start Floating Panel Container -->
+        <div class="ec-panel">
+            <!-- Panel Header -->
+            <div class="ec-header">
+                <strong>Need Help?</strong>
+                <p>Chat with us on WhatsApp</p>
+            </div>
+            <!-- Panel Content -->
+            <div class="ec-body">
+                <ul>
+                    <!-- Start Single Contact List -->
+                    <li>
+                        <a class="ec-list" data-number="918866774266"
+                            data-message="Please help me! I have got wrong product - ORDER ID is : #654321485">
+                            <div class="d-flex bd-highlight">
+                                <!-- Profile Picture -->
+                                <div class="ec-img-cont">
+                                    <img src="assets/images/whatsapp/profile_01.jpg" class="ec-user-img"
+                                        alt="Profile image">
+                                    <span class="ec-status-icon"></span>
+                                </div>
+                                <!-- Display Name & Last Seen -->
+                                <div class="ec-user-info">
+                                    <span>Sahar Darya</span>
+                                    <p>Sahar left 7 mins ago</p>
+                                </div>
+                                <!-- Chat iCon -->
+                                <div class="ec-chat-icon">
+                                    <i class="fa fa-whatsapp"></i>
+                                </div>
+                            </div>
+                        </a>
+                    </li>
+                    <!--/ End Single Contact List -->
+                    <!-- Start Single Contact List -->
+                    <li>
+                        <a class="ec-list" data-number="918866774266"
+                            data-message="Please help me! I have got wrong product - ORDER ID is : #654321485">
+                            <div class="d-flex bd-highlight">
+                                <!-- Profile Picture -->
+                                <div class="ec-img-cont">
+                                    <img src="assets/images/whatsapp/profile_02.jpg" class="ec-user-img"
+                                        alt="Profile image">
+                                    <span class="ec-status-icon ec-online"></span>
+                                </div>
+                                <!-- Display Name & Last Seen -->
+                                <div class="ec-user-info">
+                                    <span>Yolduz Rafi</span>
+                                    <p>Yolduz is online</p>
+                                </div>
+                                <!-- Chat iCon -->
+                                <div class="ec-chat-icon">
+                                    <i class="fa fa-whatsapp"></i>
+                                </div>
+                            </div>
+                        </a>
+                    </li>
+                    <!--/ End Single Contact List -->
+                    <!-- Start Single Contact List -->
+                    <li>
+                        <a class="ec-list" data-number="918866774266"
+                            data-message="Please help me! I have got wrong product - ORDER ID is : #654321485">
+                            <div class="d-flex bd-highlight">
+                                <!-- Profile Picture -->
+                                <div class="ec-img-cont">
+                                    <img src="assets/images/whatsapp/profile_03.jpg" class="ec-user-img"
+                                        alt="Profile image">
+                                    <span class="ec-status-icon ec-offline"></span>
+                                </div>
+                                <!-- Display Name & Last Seen -->
+                                <div class="ec-user-info">
+                                    <span>Nargis Hawa</span>
+                                    <p>Nargis left 30 mins ago</p>
+                                </div>
+                                <!-- Chat iCon -->
+                                <div class="ec-chat-icon">
+                                    <i class="fa fa-whatsapp"></i>
+                                </div>
+                            </div>
+                        </a>
+                    </li>
+                    <!--/ End Single Contact List -->
+                    <!-- Start Single Contact List -->
+                    <li>
+                        <a class="ec-list" data-number="918866774266"
+                            data-message="Please help me! I have got wrong product - ORDER ID is : #654321485">
+                            <div class="d-flex bd-highlight">
+                                <!-- Profile Picture -->
+                                <div class="ec-img-cont">
+                                    <img src="assets/images/whatsapp/profile_04.jpg" class="ec-user-img"
+                                        alt="Profile image">
+                                    <span class="ec-status-icon ec-offline"></span>
+                                </div>
+                                <!-- Display Name & Last Seen -->
+                                <div class="ec-user-info">
+                                    <span>Khadija Mehr</span>
+                                    <p>Khadija left 50 mins ago</p>
+                                </div>
+                                <!-- Chat iCon -->
+                                <div class="ec-chat-icon">
+                                    <i class="fa fa-whatsapp"></i>
+                                </div>
+                            </div>
+                        </a>
+                    </li>
+                    <!--/ End Single Contact List -->
+                </ul>
+            </div>
+        </div>
+        <!--/ End Floating Panel Container -->
+        <!-- Start Right Floating Button-->
+        <div class="ec-right-bottom">
+            <div class="ec-box">
+                <div class="ec-button rotateBackward">
+                    <img class="whatsapp" src="assets/images/common/whatsapp.png" alt="whatsapp icon" />
+                </div>
+            </div>
+        </div>
+        <!--/ End Right Floating Button-->
+    </div>
+    <!-- Whatsapp end -->
+
+    <!-- Feature tools -->
+    <div class="ec-tools-sidebar-overlay"></div>
+    <div class="ec-tools-sidebar">
+        <div class="tool-title">
+            <h3>Features</h3>
+        </div>
+        <a href="#" class="ec-tools-sidebar-toggle in-out">
+            <img alt="icon" src="assets/images/common/settings.png">
+        </a>
+        <div class="ec-tools-detail">
+            <div class="ec-tools-sidebar-content ec-change-color ec-color-desc">
+                <h3>Color Scheme</h3>
+                <ul class="bg-panel">
+                    <li class="active" data-color="01"><a href="#" class="colorcode1"></a></li>
+                    <li data-color="02"><a href="#" class="colorcode2"></a></li>
+                    <li data-color="03"><a href="#" class="colorcode3"></a></li>
+                    <li data-color="04"><a href="#" class="colorcode4"></a></li>
+                    <li data-color="05"><a href="#" class="colorcode5"></a></li>
+                </ul>
+            </div>
+            <div class="ec-tools-sidebar-content">
+                <h3>Backgrounds</h3>
+                <ul class="bg-panel">
+                    <li class="bg"><a class="back-bg-1" id="bg-1">Background-1</a></li>
+                    <li class="bg"><a class="back-bg-2" id="bg-2">Background-2</a></li>
+                    <li class="bg"><a class="back-bg-3" id="bg-3">Background-3</a></li>
+                    <li class="bg"><a class="back-bg-4" id="bg-4">Default</a></li>
+                </ul>
+            </div>
+            <div class="ec-tools-sidebar-content">
+                <h3>Full Screen mode</h3>
+                <div class="ec-fullscreen-mode">
+                    <div class="ec-fullscreen-switch">
+                        <div class="ec-fullscreen-btn">Mode</div>
+                        <div class="ec-fullscreen-on">On</div>
+                        <div class="ec-fullscreen-off">Off</div>
+                    </div>
+                </div>
+            </div>
+            <div class="ec-tools-sidebar-content">
+                <h3>Dark mode</h3>
+                <div class="ec-change-mode">
+                    <div class="ec-mode-switch">
+                        <div class="ec-mode-btn">Mode</div>
+                        <div class="ec-mode-on">On</div>
+                        <div class="ec-mode-off">Off</div>
+                    </div>
+                </div>
+            </div>
+            <div class="ec-tools-sidebar-content">
+                <h3>RTL mode</h3>
+                <div class="ec-change-rtl">
+                    <div class="ec-rtl-switch">
+                        <div class="ec-rtl-btn">Rtl</div>
+                        <div class="ec-rtl-on">On</div>
+                        <div class="ec-rtl-off">Off</div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="ec-tools-sidebar-content">
+                <h3>Clear local storage</h3>
+                <a class="clear-cach" href="javascript:void(0)">Clear Cache & Default</a>
+            </div>
+        </div>
+    </div>
+    <!-- Feature tools end -->
+
+    <!-- Vendor JS -->
+    <script src="assets/js/vendor/jquery-3.5.1.min.js"></script>
+    <script src="assets/js/vendor/popper.min.js"></script>
+    <script src="assets/js/vendor/bootstrap.min.js"></script>
+    <script src="assets/js/vendor/jquery-migrate-3.3.0.min.js"></script>
+    <script src="assets/js/vendor/modernizr-3.11.2.min.js"></script>
+
+    <!--Plugins JS-->
+    <script src="assets/js/plugins/swiper-bundle.min.js"></script>
+    <script src="assets/js/plugins/countdownTimer.min.js"></script>
+    <script src="assets/js/plugins/scrollup.js"></script>
+    <script src="assets/js/plugins/jquery.zoom.min.js"></script>
+    <script src="assets/js/plugins/slick.min.js"></script>
+    <script src="assets/js/plugins/infiniteslidev2.js"></script>
+    <script src="assets/js/vendor/jquery.magnific-popup.min.js"></script>
+    <script src="assets/js/plugins/jquery.sticky-sidebar.js"></script>
+
+    <!-- Main Js -->
+    <script src="assets/js/vendor/index.js"></script>
+    <script src="assets/js/main.js"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/footer.php b/footer.php
index 896f018..faae74b 100644
--- a/footer.php
+++ b/footer.php
@@ -33,7 +33,7 @@
                             <div class="ec-footer-links">
                                 <ul class="align-items-center">
                                     <li class="ec-footer-link"><a href="about-us.php">About us</a></li>
-                                    <li class="ec-footer-link"><a href="faq.html">FAQ</a></li>
+                                    <li class="ec-footer-link"><a href="faq.php">FAQ</a></li>
                                     <!-- <li class="ec-footer-link"><a href="track-order.html">Delivery Information</a></li> -->
                                     <!-- <li class="ec-footer-link"><a href="contact-us.html">Contact us</a></li> -->
                                         <!-- 02-16-2024 Stacy changed contact us link-->
diff --git a/header.php b/header.php
index 1b285b4..b15eb13 100644
--- a/header.php
+++ b/header.php
@@ -870,7 +870,7 @@
                                         <li><a href="cart.html">Cart</a></li>
                                         <li><a href="checkout.html">Checkout</a></li>
                                         <li><a href="compare.html">Compare</a></li>
-                                        <li><a href="faq.html">FAQ</a></li>
+                                        <li><a href="faq.php">FAQ</a></li>
                                         <li><a href="login.php">Login</a></li>
                                         <li><a href="register.php">Register</a></li>
                                         <li><a href="track-order.html">Track Order</a></li>
@@ -1174,7 +1174,7 @@
                             <li><a href="cart.html">Cart</a></li>
                             <li><a href="checkout.html">Checkout</a></li>
                             <li><a href="compare.html">Compare</a></li>
-                            <li><a href="faq.html">FAQ</a></li>
+                            <li><a href="faq.php">FAQ</a></li>
                             <li><a href="login.php">Login</a></li>
                             <li><a href="register.php">Register</a></li>
                             <li><a href="track-order.html">Track Order</a></li>

From 2289cce143cc6113d98541f30a69a1b5cda267e8 Mon Sep 17 00:00:00 2001
From: JunBarroga <jjbarroga@premiummegastructures.com>
Date: Wed, 20 Mar 2024 08:12:40 +0800
Subject: [PATCH 2/5] 	modified:   admin/vendor-profile.php

---
 admin/vendor-profile.php | 317 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 315 insertions(+), 2 deletions(-)

diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php
index 2553644..4ed7951 100644
--- a/admin/vendor-profile.php
+++ b/admin/vendor-profile.php
@@ -789,7 +789,17 @@ $array = json_decode($vendor,true);
 								<div class="profile-content-right profile-right-spacing py-5">
 									<ul class="nav nav-tabs px-3 px-xl-5 nav-style-border" id="myProfileTab" role="tablist">
 										<li class="nav-item" role="presentation">
-											<button class="nav-link active" id="profile-tab" data-bs-toggle="tab"
+											<button class="nav-link active" id="payments-tab" data-bs-toggle="tab"
+												data-bs-target="#payments" type="button" role="tab"
+												aria-controls="payments" aria-selected="true">Payments</button>
+										</li>
+										<li class="nav-item" role="presentation">
+											<button class="nav-link" id="payouts-tab" data-bs-toggle="tab"
+												data-bs-target="#payouts" type="button" role="tab"
+												aria-controls="payouts" aria-selected="true">Payouts</button>
+										</li>
+										<li class="nav-item" role="presentation">
+											<button class="nav-link" id="profile-tab" data-bs-toggle="tab"
 												data-bs-target="#profile" type="button" role="tab"
 												aria-controls="profile" aria-selected="true">Profile</button>
 										</li>
@@ -801,7 +811,310 @@ $array = json_decode($vendor,true);
 									</ul>
 									<div class="tab-content px-3 px-xl-5" id="myTabContent">
 
-										<div class="tab-pane fade show active" id="profile" role="tabpanel"
+										<div class="tab-pane fade show active" id="payments" role="tabpanel"
+											aria-labelledby="payments-tab">
+											<div class="tab-widget mt-5">
+												<div class="row">
+													<div class="col-12">
+														<!-- Recent Order Table -->
+														<div class="card card-default card-table-border-none ec-tbl"
+															id="recent-orders">
+															<div class="card-header justify-content-between">
+																<h2>Payments</h2>
+
+																<div class="date-range-report">
+																	<span></span>
+																</div>
+															</div>
+
+															<div class="card-body pt-0 pb-0 table-responsive">
+																<table class="table">
+																	<thead>
+																		<tr>
+																			<th><input type="checkbox"></th>
+																			<th>Method</th>
+																			<th>Amount</th>
+																			<th>Status</th>
+																			<th>Payout</th>
+																			<th>Description</th>
+																			<th>Date</th>
+																			<th></th>
+																		</tr>
+																	</thead>
+
+																	<tbody>
+																		<tr>
+																			<td><input type="checkbox"></td>
+																			<td>ObananaPay</td>
+																			<td>₱230</td>
+																			<td>
+																				<span class="badge badge-success">Paid</span>
+																			</td>
+																			<td><span class="badge badge-warning">No</span></td>
+																			<td>
+																				<a class="text-dark" href=""> Coach Swagger</a>
+																			</td>
+																			<td>Oct 20, 2018</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																		<tr>
+																			<td><input type="checkbox"></td>
+																			<td>ObananaPay</td>
+																			<td>₱550</td>
+																			<td>
+																				<span class="badge badge-success">Paid</span>
+																			</td>
+																			<td><span class="badge badge-warning">No</span></td>
+																			<td>
+																				<a class="text-dark" href=""> Toddler Shoes, Gucci Watch</a>
+																			</td>
+																			<td>Nov 15, 2018</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																		<tr>
+																			<td><input type="checkbox"></td>
+																			<td>ObananaPay</td>
+																			<td>₱325</td>
+																			<td>
+																				<span class="badge badge-success">Paid</span>
+																			</td>
+																			<td><span class="badge badge-warning">No</span></td>
+																			<td>
+																				<a class="text-dark" href=""> Hat Black Suits</a>
+																			</td>
+																			<td>Nov 18, 2018</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																		<tr>
+																			<td><input type="checkbox"></td>
+																			<td>PayMongo</td>
+																			<td>₱200</td>
+																			<td>
+																				<span class="badge badge-success">Paid</span>
+																			</td>
+																			<td><span class="badge badge-warning">No</span></td>
+																			<td>
+																				<a class="text-dark" href=""> T100 Power Bank</a>
+																			</td>
+																			<td>Nov 20, 2018</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																		<tr>
+																			<td><input type="checkbox" disabled></td>
+																			<td>ObananaPay</td>
+																			<td>₱150</td>
+																			<td>
+																				<span class="badge badge-success">Paid</span>
+																			</td>
+																			<td><span class="badge badge-success">Yes</span></td>
+																			<td>
+																				<a class="text-dark" href=""> Vodka Milk Tea</a>
+																			</td>
+																			<td>Dec 11, 2018</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																	</tbody>
+																</table>
+															</div>
+														</div>
+													</div>
+													<div class="d-flex justify-content-end mt-5">
+														<button type="submit" class="btn btn-primary mb-2 btn-pill">Create Payout from Selected</button>
+													</div>
+												</div>
+												
+											</div>
+										</div>
+
+										<div class="tab-pane fade" id="payouts" role="tabpanel"
+											aria-labelledby="payouts-tab">
+											<div class="tab-widget mt-5">
+												<div class="row">
+													<div class="col-12">
+														<!-- Recent Order Table -->
+														<div class="card card-default card-table-border-none ec-tbl"
+															id="recent-orders">
+															<div class="card-header justify-content-between">
+																<h2>Payouts</h2>
+
+																<div class="date-range-report">
+																	<span></span>
+																</div>
+															</div>
+
+															<div class="card-body pt-0 pb-0 table-responsive">
+																<table class="table">
+																	<thead>
+																		<tr>
+																			<th>Amount</th>
+																			<th>Bank</th>
+																			<th>Account</th>
+																			<th>Name</th>
+																			<th>Date</th>
+																			<th>Status</th>
+																			<th></th>
+																		</tr>
+																	</thead>
+
+																	<tbody>
+																		<tr>
+																			<td>₱1,230</td>
+																			<td>EastWest</td>
+																			<td>**** **** 1234</td>
+																			<td>Jon-Jon Manaay</td>
+																			<td>Oct 20, 2018</td>
+																			<td>
+																				<span class="badge badge-success">Deposited</span>
+																			</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																		<tr>
+																			<td>₱2,340</td>
+																			<td>EastWest</td>
+																			<td>**** **** 1234</td>
+																			<td>Jon-Jon Manaay</td>
+																			<td>Oct 27, 2018</td>
+																			<td>
+																				<span class="badge badge-warning">Processing</span>
+																			</td>
+																			<td class="text-right">
+																				<div
+																					class="dropdown show d-inline-block widget-dropdown">
+																					<a class="dropdown-toggle icon-burger-mini"
+																						href="" role="button"
+																						id="dropdown-recent-order1"
+																						data-bs-toggle="dropdown"
+																						aria-haspopup="true"
+																						aria-expanded="false"
+																						data-display="static"></a>
+																					<ul class="dropdown-menu dropdown-menu-right"
+																						aria-labelledby="dropdown-recent-order1">
+																						<li class="dropdown-item">
+																							<a href="#">Details</a>
+																						</li>
+																					</ul>
+																				</div>
+																			</td>
+																		</tr>
+
+																	</tbody>
+																</table>
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</div>
+
+										<div class="tab-pane fade" id="profile" role="tabpanel"
 											aria-labelledby="profile-tab">
 											<div class="tab-widget mt-5">
 												<div class="row">

From 14609b96935180febfa6e91c4cd09dee838a55ab Mon Sep 17 00:00:00 2001
From: Jun Barroga <jun.barroga@obanana.com>
Date: Wed, 20 Mar 2024 09:36:52 +0800
Subject: [PATCH 3/5] Bank Account

---
 admin/product-edit.php                 |   5 +-
 admin/vendor-card.php                  | 104 ++++----------
 functions.php                          |   4 +
 user-history.php                       |  27 +++-
 vendor-settings.php                    | 186 +++++++++++++++++++++++++
 vendor-uploads-edit-product-action.php |  13 ++
 vendor-uploads.php                     | 162 ++++++++++++++++++---
 7 files changed, 395 insertions(+), 106 deletions(-)

diff --git a/admin/product-edit.php b/admin/product-edit.php
index 4ec941c..81cfeb2 100644
--- a/admin/product-edit.php
+++ b/admin/product-edit.php
@@ -1130,10 +1130,10 @@ $vendorId = $_SESSION["vendorId"];
 
                         promises.push(promise);
                     }
-
+                    // 03-14-2024 Jun Jihad modified this block of code to properly upload images with comma in the filename
                     Promise.all(promises)
                         .then(filenames => {
-                            const updatedImages = existingImages.concat(filenames.map(filename => `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/product_uploads/${filename}`));
+                            const updatedImages = existingImages.concat(filenames.map(filename => `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/product_uploads/${encodeURIComponent(filename)}`));
 
                             if (!Array.isArray(updatedImages)) {
                                 console.error('Updated images is not an array:', updatedImages);
@@ -1154,6 +1154,7 @@ $vendorId = $_SESSION["vendorId"];
                                 body: JSON.stringify(payload)
                             });
                         })
+                    // 03-14-2024 Jun Jihad modified this block of code to properly upload images with comma in the filename
                         .then(response => {
                             if (response.ok) {
                                 console.log('Images uploaded successfully');
diff --git a/admin/vendor-card.php b/admin/vendor-card.php
index d8ab00d..79fea72 100644
--- a/admin/vendor-card.php
+++ b/admin/vendor-card.php
@@ -4,7 +4,7 @@ include "../functions.php";
 $_SESSION["url"] = $_SERVER['REQUEST_URI'];
 if ($_SESSION["userId"] <> "") {
     $_SESSION["isLoggedIn"] = true;
-    $customer_data = getCustomerbyLoginId($_SESSION["userId"]);
+    //$customer_data = getCustomerbyLoginId($_SESSION["userId"]);
 } else {
     $_SESSION["isLoggedIn"] = false;
     header("location: login.php");
@@ -14,8 +14,6 @@ if ($_SESSION["user_type"] != "admin") {
     header("location: login.php?alert=Only admins allowed here!");
 }
 $products = productList();
-
-$vendorSearchResult = $_SESSION["vendorSearchResult"];
 ?>
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
@@ -66,8 +64,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
     <link id="ekka-css" rel="stylesheet" href="assets/css/ekka.css" />
 
     <!-- FAVICON -->
-    <!-- <link href="assets/img/favicon.png" rel="shortcut icon" /> -->
-    <link href="assets/img/favicon/favicon.png" rel="shortcut icon" />
+    <link href="assets/img/favicon.png" rel="shortcut icon" />
 
     <!-- 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" />
@@ -92,22 +89,17 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                     <!-- Sidebar toggle button -->
                     <button id="sidebar-toggler" class="sidebar-toggle"></button>
                     <!-- search form -->
-                    
-                    <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
                     <div class="search-form d-lg-inline-block">
-                        <form method="POST" action="vendor-card-action.php">
-                            <div class="input-group">
-                                <input type="text" name="search" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
-                                <button class="submit" type="submit" id="search-btn" class="btn btn-flat">
-                                    <i class="mdi mdi-magnify" style="font-size:20px; color:gray; padding-right:8px;"></i>
-                                </button>
-                            </div>
-                        </form>
+                        <div class="input-group">
+                            <input type="text" name="query" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
+                            <button type="button" name="search" id="search-btn" class="btn btn-flat">
+                                <i class="mdi mdi-magnify"></i>
+                            </button>
+                        </div>
                         <div id="search-results-container">
                             <ul id="search-results"></ul>
                         </div>
                     </div>
-                    <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
 
                     <!-- navbar right -->
                     <div class="navbar-right">
@@ -673,49 +665,10 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                             $start = ($currentpage - 1) * $vendorsPerPage;
                             $end = $start + $vendorsPerPage - 1;
 
-                            
-
-                            $vendorsCopy = $vendors;
-                        //     var_dump($vendorsCopy
-                        // );
-                          
-
-                            // 03-07-2024 added searh filter
-                            if (!empty($_GET['search']) ) {
-                                $filteredProducts=[];
-                                foreach ($vendorsCopy as $result) {
-                                  $vendorName = strtolower($result['user_login']);
-                                    if (
-                                        // $result['user_login'] == $_GET['search']
-                                        strpos($vendorName,$_GET['search'])!==false
-                                    ) {
-                                        $filteredProducts[] = $result;
-                                        // var_dump("herees");
-
-                                        // var_dump($_GET['search']);
-                                    } else{
-                                        // var_dump("none");
-                                        
-                                    }
-                                }
-
-                                $vendors = $filteredProducts;
-                                $totalVendors = count($filteredProducts);
-                                $vendorsPerPage = 20;
-                            }
-                            else{
-                                // $vendors=$vendorsCopy;
-                            }
-
-                            if ($totalVendors == 0) {
-                                echo '<p style="padding-top:30px; padding-left:20px;">No vendor found.</p>';
-                            }
-
                             // $vendors = vendorList();
                             for ($x = $start; $x <= $end && $x < $totalVendors; $x++) {
                                 $vendor = $vendors[$x];
                             ?>
-                            
                                 <div class="col-lg-6 col-xl-4 col-xxl-3">
                                     <div class="card card-default mt-24px">
                                         <a href="javascript:0" data-bs-toggle="modal" data-bs-target="#modal-contact-<?php echo $vendor['_id']; ?>" class="view-detail me-auto">
@@ -731,7 +684,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                                                     if (isset($vendor['vendor_image']) && !empty($vendor['vendor_image'])) {
                                                         echo '<img src="' . $vendor['vendor_image'] . '" class="img-fluid rounded-circle" alt="Avatar Image" style="width: 150px; height: 150px; object-fit: cover; border-radius: 50%;"> ';
                                                     } else {
-                                                        echo '<img src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" class="img-fluid rounded-circle" alt="Placeholder Image">';
+                                                        echo '<img src="assets/img/vendor/u1.jpg" class="img-fluid rounded-circle" alt="Placeholder Image">';
                                                     }
                                                     ?>
                                                 </div>
@@ -806,7 +759,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                                                     <div class="vendor-image" style="padding-top:20px; ">
                                                         <?php
                                                         if (isset($vendor['vendor_image']) && !empty($vendor['vendor_image'])) {
-                                                            echo '<img src="' . $vendor['vendor_image'] . '" alt="edit" id="imgPrev" class="img-fluid rounded-circle" alt="Avatar Image" style="align-items:left; width:100px; height:100px; object-fit:cover; border-radius:80%;"> ';
+                                                            echo '<img src="' . $vendor['vendor_image'] . '" alt="edit" id="imgPrev' . $vendor['_id'] . '" class="img-fluid rounded-circle" alt="Avatar Image" style="align-items:left; width:100px; height:100px; object-fit:cover; border-radius:80%;"> ';
                                                         } else {
                                                             echo '<img src="https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg" id="imgPrev" alt="edit" class="img-fluid rounded-circle" alt="Placeholder Image" style="align-items:left; width:80px; height:80px; object-fit:cover; border-radius:50%;">';
                                                         }
@@ -822,21 +775,22 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                                                                 label.innerHTML = '<i class="fa-solid fa-file-arrow-up"></i> Upload file';
                                                             }
                                                         }
+                                                        // 03-14-2024 Jun Jihad modified this block of code to show preview of the image to be uploaded
+                                                        function previewImage(vendorId) {
+                                                        var fileInput = document.getElementById('fileInput' + vendorId);
+                                                        var file = fileInput.files[0];
+                                                        console.log('clicked hereee');
+                                                        const reader = new FileReader();
 
-                                                        // 02-29-2024 Stacy for image preview
-                                                        function previewImage(vendorId){
-                                                            var fileInput = document.getElementById('fileInput' + vendorId);
-                                                            var file = fileInput.files[0];
-                                                            console.log('clicked hereee')
-                                                            const reader = new FileReader();
-
-                                                            reader.onload = function (e) {
+                                                        reader.onload = function (e) {
                                                             const dataUri = e.target.result;
-                                                            document.getElementById('imgPrev').src=dataUri
-                                                            };
+                                                            document.getElementById('imgPrev' + vendorId).src = dataUri; // Fixed concatenation here
+                                                        };
+
+                                                        reader.readAsDataURL(file);
+                                                    }
+                                                        // 03-14-2024 Jun Jihad modified this block of code to show preview of the image to be uploaded
 
-                                                            reader.readAsDataURL(file);
-                                                        }
                                                     </script>
                                                 </div>
                                                 <form>
@@ -941,8 +895,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
                                             </div>
                                         </div>
                                     </div>
-                                </div>                            
-                                                     
+                                </div>
                                 <script>
                                         function deleteVendor(vendorId){
                                         let text = "Please confirm delete action!\nClick OK or Cancel button.";
@@ -1376,16 +1329,13 @@ function validateEmail(vendorId) {
                         <!-- Ec Pagination Start -->
                         <div class="pagination mt-3">
                             <?php
-                                if ($totalVendors >= $vendorsPerPage) {
-                                    for ($i = 1; $i <= $totalPages; $i++) {
-                                        echo "<a href='?page=$i' class='" . ($currentpage == $i ? 'active' : '') . "'>$i</a>";
-                                    }
-                                }
+                            for ($i = 1; $i <= $totalPages; $i++) {
+                                echo "<a href='?page=$i' class='" . ($currentpage == $i ? 'active' : '') . "'>$i</a>";
+                            }
                             ?>
                         </div>
                         <!-- Ec Pagination End -->
 
-
                     </div>
 
                     <!-- Contact Modal -->
diff --git a/functions.php b/functions.php
index 23f6d72..3880700 100644
--- a/functions.php
+++ b/functions.php
@@ -1552,6 +1552,7 @@ function editProduct(
   $color,
   $material,
   $size,
+  $priceMatrix,
   $token
 ) {
   $curl = curl_init();
@@ -1576,6 +1577,9 @@ function editProduct(
       'same-day-delivery' => $sdd ,
       'free-shipping' => $freeSf 
     ),
+    'price_matrix' => array(
+      $priceMatrix
+    ),
     'parent_id' => $parentId,
     'minimum_order' => $minimumOrder,
     // 'variants' => array(
diff --git a/user-history.php b/user-history.php
index e2ac230..b36a83f 100644
--- a/user-history.php
+++ b/user-history.php
@@ -305,7 +305,7 @@ if ($_SESSION["userId"] <> "") {
                                                                 <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
                                                                 <td>
                                                                     <span class="tbl-btn">
-                                                                        <a class="btn btn-lg btn-primary" onclick="updateCompletedStatus('<?php echo $order['_id']; ?>')">Received</a>
+                                                                        <a class="btn btn-lg btn-primary" onclick="updateCompletedStatus('<?php echo $order['_id']; ?>', '<?php echo htmlspecialchars($order['payment']['reference_number']); ?>')">Received</a>
                                                                     </span>
                                                                 </td>
                                                             </tr>
@@ -360,13 +360,22 @@ if ($_SESSION["userId"] <> "") {
                                                                 <td><span><?php echo $order['courier_name']; ?></span></td>
                                                                 <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
                                                                 <td>
-                                                                    <?php
+                                                                <?php
+                                                                    $currentDate = time(); // Current Unix timestamp
+
                                                                     if ($order['return_order']['status'] === 'To Approve') {
                                                                         echo '<span class="tbl-btn">Refund Requested</span>';
                                                                     } elseif ($order['return_order']['status'] === 'To Ship') {
                                                                         echo '<span class="tbl-btn">For Refund</span>';
-                                                                    }else {
-                                                                        echo '<a class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#modal-refund-' . $order['_id'] . '">Return/Refund</a>';
+                                                                    } else {
+                                                                        $orderDate = strtotime($order['updatedAt']);
+                                                                        $sevenDaysAfterOrder = strtotime('+7 days', $orderDate); // Seven days after the order date
+
+                                                                        if ($currentDate >= $sevenDaysAfterOrder) {
+                                                                            echo '<span class="tbl-btn" disabled></span>';
+                                                                        } else {
+                                                                            echo '<a class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#modal-refund-' . $order['_id'] . '">Return/Refund</a>';
+                                                                        }
                                                                     }
                                                                     ?>
                                                                 </td>
@@ -580,7 +589,7 @@ if ($_SESSION["userId"] <> "") {
                                     var sessionToken = '<?php echo isset($_SESSION["token"]) ? $_SESSION["token"] : ""; ?>';
                                     var email = '<?php echo isset($_SESSION["email"]) ? $_SESSION["email"] : ""; ?>';
                                     var password = '<?php echo isset($_SESSION["password"]) ? $_SESSION["password"] : ""; ?>';
-
+                  
                                     function login(username, password, callback) {
                                         fetch("https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/login", {
                                                 method: "POST",
@@ -656,7 +665,7 @@ if ($_SESSION["userId"] <> "") {
                                         localStorage.setItem('activeTab', tabName);
                                     }
 
-                                    function updateCompletedStatus(orderId) {
+                                    function updateCompletedStatus(orderId, referenceNumber) {
                                         login(email, password, function(token) {
                                             // const token = '<?php echo $_SESSION["token"] ?>';
                                             fetch(`https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/orders/${orderId}`, {
@@ -667,6 +676,10 @@ if ($_SESSION["userId"] <> "") {
                                                     },
                                                     body: JSON.stringify({
                                                         status: 'COMPLETED',
+                                                        payment: {
+                                                        status: 'PAID',
+                                                        reference_number: referenceNumber
+                                                    }
                                                     }),
                                                 })
                                                 .then(response => response.json())
@@ -675,7 +688,7 @@ if ($_SESSION["userId"] <> "") {
                                                     if (data && data !== "") {
                                                         // Update the status in the table without reloading the page
                                                         // document.querySelector(`[data-order-id="${orderId}"] .order-status`).innerText = 'COMPLETED';
-                                                        // location.reload();
+                                                        location.reload();
 
                                                     } else {
                                                         alert('Failed to update order status');
diff --git a/vendor-settings.php b/vendor-settings.php
index 33e9324..0907767 100644
--- a/vendor-settings.php
+++ b/vendor-settings.php
@@ -233,6 +233,34 @@ if ($_SESSION["userId"] <> "") {
                                                 </div>
                                             </div>
                                         </div>
+                                         <!-- 03-19-24 Jun Jihad Bank Information -->
+                                         <div class="col-md-12 col-sm-12" style="display:flex; justify-content: space-between">
+                                         <h5>Bank Information </h5>
+                                         <button type="button" class="btn btn-primary" id="vendorBankModalBtn" data-bs-toggle="modal" data-bs-target="#vendorBankModal">My Banks</button>
+                                         </div>
+                                            <div class="row">
+                                                <div class="col-md-12 col-sm-12">
+                                                <?php foreach ($vendorData['bank_acount_details'] as $bank_acount_details) : ?>
+                                                            <?php if ($bank_acount_details['bank_payout']) : ?>
+                                                    <table style="width:100%; border-collapse: collapse;">
+                                                        <tr>
+                                                            <td style="border: 1px solid #dddddd; background-color: #f7f7f7; padding: 8px; font-weight: 700;">Bank Name</td>
+                                                            <td style="border: 1px solid #dddddd; padding: 8px;font-weight: 500;"><?php echo $bank_acount_details["bank_name"] ?></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td style="border: 1px solid #dddddd; background-color: #f7f7f7; padding: 8px;font-weight: 700;">Account Number</td>
+                                                            <td style="border: 1px solid #dddddd; padding: 8px;font-weight: 500;"><?php echo $bank_acount_details["bank_account_number"] ?></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td style="border: 1px solid #dddddd; background-color: #f7f7f7; padding: 8px;font-weight: 700;">Account Name</td>
+                                                            <td style="border: 1px solid #dddddd; padding: 8px;font-weight: 500;"><?php echo $bank_acount_details["bank_account_name"] ?></td>
+                                                        </tr>
+                                                    </table>
+                                                    <?php endif; ?>
+                                                        <?php endforeach; ?>
+                                                </div>
+                                            </div>
+                                         <!-- 03-19-24 Jun Jihad Bank Information -->
                                     </div>
                                 </div>
                             </div>
@@ -350,6 +378,71 @@ if ($_SESSION["userId"] <> "") {
                 </div>
             </div>
         </div>
+
+        <div class="modal fade" id="vendorBankModal" 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;">
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#secondBankModal">Add New Bank</button>
+
+                        <!-- Display a list of addresses and let the user choose -->
+                        <form id="BankForm">
+                        <!-- <?php var_dump($vendorData) ?> -->
+                            <?php foreach ($vendorLoginIdjson['results'] as $vendor_index => $vendor) { ?>
+                                <?php foreach ($vendor['bank_acount_details'] as $bank_index => $bank) { ?>
+                                    <div class="card mb-3">
+                                        <div class="card-body">
+                                            <div class="container">
+                                                <div class="row">
+                                                    <div class="col-md-12 mx-auto">
+                                                        <label class="form-check-label" for="address_<?php echo $vendor_index; ?>_<?php echo $bank_index; ?>">
+                                                           <strong style="font-weight: bold;">Bank Name: </strong><?php echo $bank['bank_name']; ?> <br>
+                                                           <strong style="font-weight: bold;">Bank Account Number: </strong><?php echo $bank['bank_account_number']; ?> <br>
+                                                           <strong style="font-weight: bold;">Bank Account Name: </strong><?php echo $bank['bank_account_name']; ?>
+                                                           <div class="selectWrap" style="display: flex; justify-content: center; align-items: center; width: 50%;">
+                                                           <input type="radio" name="payout_bank" id="payout_bank_<?php echo $vendor_index; ?>_<?php echo $bank_index; ?>" value="<?php echo $vendor_index; ?>_<?php echo $bank_index; ?>" onchange="setPayoutBank('<?php echo $vendor['_id']; ?>', <?php echo $bank_index; ?>, true)" <?php echo $bank['bank_payout'] ? 'checked' : ''; ?>>
+                                                            <label for="payout_bank_<?php echo $vendor_index; ?>_<?php echo $bank_index; ?>">Set as Payout Bank</label>
+                                                            </div>
+                                                        </label>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                <?php } ?>
+                            <?php } ?>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="modal fade" id="secondBankModal" 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="bankName" class="text-dark font-weight-medium pt-3 mb-2">Bank Name</label>
+                                <input type="text" class="form-control" id="bankName">
+                            </div>
+                            <div class="form-group">
+                                <label for="bankAccountNumber" class="text-dark font-weight-medium pt-3 mb-2">Bank Account Number</label>
+                                <input type="text" class="form-control" id="bankAccountNumber">
+                            </div>
+                            <div class="form-group">
+                                <label for="bankAccountName" class="text-dark font-weight-medium pt-3 mb-2">Bank Account Name</label>
+                                <input type="text" class="form-control" id="bankAccountName">
+                            </div>
+                          
+                            <button type="button" class="btn btn-primary" id="submitBankBtn">Add Bank</button>
+
+                        </form>
+
+                    </div>
+                </div>
+            </div>
+        </div>
         <script>
             function editUser() {
                 // var fileInput = document.getElementById('fileInput' + vendorId);
@@ -569,6 +662,49 @@ if ($_SESSION["userId"] <> "") {
 
 
             });
+
+            $('#submitBankBtn').on('click', function() {
+
+                    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid)
+                        .then(response => response.json())
+                        .then(data => {
+                            const existingBanks = data.bank_acount_details || [];
+
+                            const bankName = $('#bankName').val();
+                            const bankAccountNumber = $('#bankAccountNumber').val();
+                            const bankAccountName = $('#bankAccountName').val();
+                         
+                            const newBank = {
+                                bank_name: bankName,
+                                bank_account_number: bankAccountNumber,
+                                bank_account_name: bankAccountName,
+                            };
+
+                            existingBanks.push(newBank);
+
+                            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
+                                method: 'PATCH',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify({
+                                    bank_acount_details: existingBanks
+                                }),
+                            });
+                        })
+                        .then(response => {
+                            if (response.ok) {
+                                location.reload();
+                            } else {
+                                console.error('Failed to submit data');
+                                alert('Failed to submit data');
+                            }
+                        })
+                        .catch(error => {
+                            console.error('Error:', error);
+                            alert('Error submitting data');
+                        });
+                });
         </script>
           <script>
             async function updateAddressBilling(vendorid, addressIndex, isBilling) {
@@ -697,6 +833,56 @@ if ($_SESSION["userId"] <> "") {
                     console.error('Error updating address:', error.message);
                 }
             }
+
+            async function setPayoutBank(vendorid, bankIndex, isBankPayout) {
+                try {
+                    const apiUrl = `https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/${vendorid}`;
+                    const response = await fetch(apiUrl, {
+                        method: 'GET',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                    });
+
+                    if (!response.ok) {
+                        throw new Error(`Failed to fetch vendor data: ${response.status}`);
+                    }
+                    const vendorsData = await response.json();
+                    vendorsData.bank_acount_details.forEach((bank_acount_details, index) => {
+                        if (index === bankIndex) {
+                            if (isBankPayout !== undefined) {
+                                bank_acount_details.bank_payout = isBankPayout;
+
+                                const radioButtonId = `#payout_bank__${vendorid}_${bankIndex}`;
+                                $(radioButtonId).prop('checked', isBankPayout);
+                            }
+
+                        } else {
+                            bank_acount_details.bank_payout = false;
+                        }
+                    });
+
+                    const updateResponse = await fetch(apiUrl, {
+                        method: 'PATCH',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                        body: JSON.stringify({
+                            bank_acount_details: vendorsData.bank_acount_details
+                        }),
+                    });
+
+                    if (!updateResponse.ok) {
+
+                        throw new Error(`Failed to update address: ${updateResponse.status}`);
+                    }
+                    location.reload()
+                    // console.log(`Address updated successfully for customer ${vendorid}`);
+                } catch (error) {
+                    console.error('Error updating address:', error.message);
+                }
+            }
+
         </script>
     </section>
     <!-- End Vendor setting section -->
diff --git a/vendor-uploads-edit-product-action.php b/vendor-uploads-edit-product-action.php
index 4aca644..6b58249 100644
--- a/vendor-uploads-edit-product-action.php
+++ b/vendor-uploads-edit-product-action.php
@@ -40,6 +40,18 @@ $material = $_POST['material'];
 //echo '$material: '.$material.'<br>';
 $token = $_SESSION["token"];
 
+$quantities = $_POST['quantity'];
+$prices = $_POST['price'];
+
+// Constructing the price matrix
+$priceMatrix = array();
+for ($i = 0; $i < count($quantities); $i++) {
+    $priceMatrix[] = array(
+        'quantity' => $quantities[$i],
+        'price' => $prices[$i]
+    );
+}
+
 
 $response = editProduct(
           $productId,
@@ -66,6 +78,7 @@ $response = editProduct(
           $color,
           $material,
           $size,
+          $priceMatrix,
           $token);
 $array = json_decode($response,true);
 $_SESSION['newProdictId'] = $array['_id'];
diff --git a/vendor-uploads.php b/vendor-uploads.php
index b2639a8..a60d129 100644
--- a/vendor-uploads.php
+++ b/vendor-uploads.php
@@ -118,14 +118,16 @@ $array = json_decode($result, true);
                             <div class="ec-vendor-block">
                                 <!-- 03-12-2024 Stacy added placeholder for vendor banner -->
                                 <?php
-                                    if (!empty($vendorData['vendor_banner'])) { ?>
-                                        <div class="ec-vendor-block-bg" style="background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
-                                    <?php } else { ?>
-                                        <div class="ec-vendor-block-bg" style="background-color: orange; background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
+                                if (!empty($vendorData['vendor_banner'])) { ?>
+                                    <div class="ec-vendor-block-bg" style="background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
+                                <?php } else { ?>
+                                    <div class="ec-vendor-block-bg" style="background-color: orange; background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
                                 <?php } ?>
-                                <!-- <div class="ec-vendor-block-bg" style="background-image: url(<?php #echo $vendorData['vendor_banner'] ?>) !important;"></div> -->
+                                <!-- <div class="ec-vendor-block-bg" style="background-image: url(<?php #echo $vendorData['vendor_banner'] 
+                                                                                                    ?>) !important;"></div> -->
                                 <div class="ec-vendor-block-detail">
-                                    <!-- <img class="v-img" src=<?php #echo $vendorData['vendor_image'] ?> alt="vendor image"> -->
+                                    <!-- <img class="v-img" src=<?php #echo $vendorData['vendor_image'] 
+                                                                ?> alt="vendor image"> -->
                                     <!-- 03-12-2024 Stacy added placeholder for vendor profile -->
                                     <?php
                                     if (!empty($vendorData['vendor_image'])) { ?>
@@ -134,7 +136,7 @@ $array = json_decode($result, true);
                                         <img class="v-img" src="https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg" alt="vendor image">
                                     <?php } ?>
                                     <h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
-                                    </div>
+                                </div>
                                 <!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
                                 <!-- <div class="ec-vendor-block-items">
                                     <ul>
@@ -382,26 +384,51 @@ $array = json_decode($result, true);
                                                             )</span></label>
                                                     <input type="number" class="form-control" id="price2" name="sale_price" value="<?php echo $array['sale_price'] ?>">
                                                 </div>
+                                                <!-- 03-15-2024 Jun Jihad price_matrix field Product Upload Vendor Page -->
+                                                <div class="col-md-12">
+                                                    <label class="form-label">Price Matrix</label>
+                                                    <table class="table">
+                                                        <thead>
+                                                            <tr>
+                                                                <th scope="col">Quantity</th>
+                                                                <th scope="col">Price (PHP)</th>
+                                                                <th scope="col"></th>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody id="price-matrix-body">
+                                                            <?php foreach ($array['price_matrix'][0] as $index => $pair) : ?>
+                                                                <tr data-row-index="<?php echo $index; ?>">
+                                                                    <td><input type="number" class="form-control" name="quantity[]" value="<?php echo $pair['quantity']; ?>"></td>
+                                                                    <td><input type="number" class="form-control" name="price[]" value="<?php echo $pair['price']; ?>"></td>
+                                                                    <td><button type="button" class="btn btn-danger delete-row">Delete</button></td>
+                                                                </tr>
+                                                            <?php endforeach; ?>
+                                                        </tbody>
+
+                                                    </table>
+                                                    <button type="button" class="btn btn-secondary" id="add-row">Add Row</button>
+                                                </div>
+                                                <!-- 03-15-2024 Jun Jihad price_matrix field Product Upload Vendor Page -->
                                                 <!-- 02-19-2024 Jun Jihad Promo Field Product Upload Vendor Page -->
                                                 <div class="col-md-12" style="margin: 0 0 20px 0;">
                                                     <label class="form-label">Promo</label>
                                                     <div class="row" justify-content-between>
-                                                    <div class="col-md-4">
+                                                        <div class="col-md-4">
                                                             <div class="form-check">
-                                                                <input type="checkbox"  id="nextDayDeliveryCheckbox" name="promo[next-day-delivery]" value="Yes" <?php if ($array['promo'][0]['next-day-delivery'] === "Yes") echo "checked"; ?> style="background-color: blue;">
-                                                                <label class="form-check-label"  for="nextDayDeliveryCheckbox">Next Day Delivery</label>
-                                                            </div>
-                                                        </div>
-														<div class="col-md-4">
-                                                            <div class="form-check">
-                                                                <input type="checkbox"  id="sameDayDeliveryCheckbox" name="promo[same-day-delivery]" value="Yes" <?php if ($array['promo'][0]['same-day-delivery'] === "Yes") echo "checked"; ?> style="background-color: blue;">
-                                                                <label class="form-check-label"  for="sameDayDeliveryCheckbox">Same Day Delivery</label>
+                                                                <input type="checkbox" id="nextDayDeliveryCheckbox" name="promo[next-day-delivery]" value="Yes" <?php if ($array['promo'][0]['next-day-delivery'] === "Yes") echo "checked"; ?> style="background-color: blue;">
+                                                                <label class="form-check-label" for="nextDayDeliveryCheckbox">Next Day Delivery</label>
                                                             </div>
                                                         </div>
                                                         <div class="col-md-4">
                                                             <div class="form-check">
-                                                                <input type="checkbox"  id="freeShippingCheckbox" name="promo[free-shipping]" value="Yes" <?php if ($array['promo'][0]['free-shipping'] === "Yes") echo "checked"; ?> style="background-color: blue;"> 
-                                                                <label class="form-check-label"  for="freeShippingCheckbox">Free Shipping</label>
+                                                                <input type="checkbox" id="sameDayDeliveryCheckbox" name="promo[same-day-delivery]" value="Yes" <?php if ($array['promo'][0]['same-day-delivery'] === "Yes") echo "checked"; ?> style="background-color: blue;">
+                                                                <label class="form-check-label" for="sameDayDeliveryCheckbox">Same Day Delivery</label>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-4">
+                                                            <div class="form-check">
+                                                                <input type="checkbox" id="freeShippingCheckbox" name="promo[free-shipping]" value="Yes" <?php if ($array['promo'][0]['free-shipping'] === "Yes") echo "checked"; ?> style="background-color: blue;">
+                                                                <label class="form-check-label" for="freeShippingCheckbox">Free Shipping</label>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -473,7 +500,7 @@ $array = json_decode($result, true);
         <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
         <script>
             var quill = new Quill('#editor-container', {
-                theme: 'snow' 
+                theme: 'snow'
             });
             quill.clipboard.dangerouslyPasteHTML(document.getElementById('hidden-editor').value);
             quill.on('text-change', function() {
@@ -481,12 +508,107 @@ $array = json_decode($result, true);
             });
 
             var newquill = new Quill('#short-editor-container', {
-                theme: 'snow' 
+                theme: 'snow'
             });
             newquill.clipboard.dangerouslyPasteHTML(document.getElementById('short-hidden-editor').value);
             newquill.on('text-change', function() {
                 document.getElementById('short-hidden-editor').value = newquill.root.innerHTML;
             });
+
+            // 03-15-2024 Jun Jihad price_matrix field delete/add row function
+            document.getElementById("add-row").addEventListener("click", function() {
+                var newRow = '<tr>' +
+                    '<td><input type="number" class="form-control quantity-input" name="quantity[]"></td>' +
+                    '<td><input type="number" class="form-control" name="price[]"></td>' +
+                    '<td><button type="button" class="btn btn-danger delete-row">Delete</button></td>' +
+                    '</tr>';
+                document.getElementById("price-matrix-body").insertAdjacentHTML('beforeend', newRow);
+
+                var quantityInputs = document.querySelectorAll('.quantity-input');
+                var lastIndex = quantityInputs.length - 1;
+                quantityInputs[lastIndex].addEventListener('blur', function(event) {
+                    checkQuantity(event, lastIndex);
+                });
+            });
+
+            document.getElementById("price-matrix-body").addEventListener("click", function(event) {
+                if (event.target.classList.contains("delete-row")) {
+                    event.preventDefault();
+                    var rows = document.querySelectorAll("#price-matrix-body tr");
+                    if (rows.length > 1) {
+                        event.target.closest("tr").remove();
+                    } else {
+                        alert("At least one row is required.");
+                    }
+                }
+            });
+
+            function checkQuantity(event, index) {
+                var currentInput = event.target;
+                var previousRow = currentInput.parentNode.parentNode.previousElementSibling;
+                var nextRow = currentInput.parentNode.parentNode.nextElementSibling;
+
+                if (previousRow !== null) {
+                    var previousQuantityInput = previousRow.querySelector('input[name="quantity[]"]');
+                    var currentQuantity = parseInt(currentInput.value);
+                    var previousQuantity = parseInt(previousQuantityInput.value);
+
+                    if (currentQuantity <= previousQuantity) {
+                        alert("Quantity must be greater than the previous row's quantity.");
+                        currentInput.value = previousQuantity + 1;
+                    }
+                }
+
+                if (nextRow !== null) {
+                    var nextQuantityInput = nextRow.querySelector('input[name="quantity[]"]');
+                    var nextQuantity = parseInt(nextQuantityInput.value);
+
+                    if (currentQuantity >= nextQuantity) {
+                        alert("Quantity must be less than the next row's quantity.");
+                        currentInput.value = nextQuantity - 1;
+                    }
+                }
+            }
+
+            function checkExistingQuantity(row) {
+                var currentInput = row.querySelector('input[name="quantity[]"]');
+                var allRows = document.querySelectorAll("#price-matrix-body tr");
+                var currentIndex = Array.from(allRows).indexOf(row);
+
+                for (var i = currentIndex - 1; i >= 0; i--) {
+                    var previousRow = allRows[i];
+                    var previousQuantityInput = previousRow.querySelector('input[name="quantity[]"]');
+                    var currentQuantity = parseInt(currentInput.value);
+                    var previousQuantity = parseInt(previousQuantityInput.value);
+
+                    if (currentQuantity <= previousQuantity) {
+                        alert("Quantity must be greater than the previous row's quantity.");
+                        currentInput.value = previousQuantity + 1;
+                        return;
+                    }
+                }
+
+                var nextRow = allRows[currentIndex + 1];
+                if (nextRow !== undefined) {
+                    var nextQuantityInput = nextRow.querySelector('input[name="quantity[]"]');
+                    var nextQuantity = parseInt(nextQuantityInput.value);
+
+                    if (currentQuantity >= nextQuantity) {
+                        alert("Quantity must be less than the next row's quantity.");
+                        currentInput.value = nextQuantity - 1;
+                        return;
+                    }
+                }
+            }
+
+            document.getElementById("price-matrix-body").addEventListener("blur", function(event) {
+                if (event.target.tagName === "INPUT" && event.target.name === "quantity[]") {
+                    checkExistingQuantity(event.target.closest("tr"));
+                }
+            }, true);
+
+
+            // 03-15-2024 Jun Jihad price_matrix field delete/add row function
         </script>
         <script>
             function onload() {

From 877e2c6a81418eb343701fbd6a1ab9884d95f1c6 Mon Sep 17 00:00:00 2001
From: Stacy <stacyjoycemapano@gmail.com>
Date: Wed, 20 Mar 2024 13:54:50 +0800
Subject: [PATCH 4/5] Added all order tab on customer purchase history

---
 admin/header.php         | 561 ++++++++++++++++++++++++++++++++++
 admin/user-card.php      | 556 +---------------------------------
 admin/vendor-profile.php | 631 +--------------------------------------
 product-left-sidebar.php |   2 +-
 user-history.php         | 507 +++++++++++++++++++++++++------
 user-profile.php         |   4 +-
 user-refund-history.php  |  12 +-
 7 files changed, 986 insertions(+), 1287 deletions(-)
 create mode 100644 admin/header.php

diff --git a/admin/header.php b/admin/header.php
new file mode 100644
index 0000000..020fd67
--- /dev/null
+++ b/admin/header.php
@@ -0,0 +1,561 @@
+<!-- 03-13-2024 Stacy separated header -->
+
+<!-- Header -->
+<header class="ec-main-header" id="header">
+    <nav class="navbar navbar-static-top navbar-expand-lg">
+        <!-- Sidebar toggle button -->
+        <button id="sidebar-toggler" class="sidebar-toggle"></button>
+        <!-- search form -->
+        
+        <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
+        <div class="search-form d-lg-inline-block">
+            <form method="POST" action="vendor-card-action.php">
+                <div class="input-group">
+                    <input type="text" name="search" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
+                    <button class="submit" type="submit" id="search-btn" class="btn btn-flat">
+                        <i class="mdi mdi-magnify" style="font-size:20px; color:gray; padding-right:8px;"></i>
+                    </button>
+                </div>
+            </form>
+            <div id="search-results-container">
+                <ul id="search-results"></ul>
+            </div>
+        </div>
+        <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
+
+        <!-- navbar right -->
+        <div class="navbar-right">
+            <ul class="nav navbar-nav">
+                <!-- User Account -->
+                <li class="dropdown user-menu">
+                    <button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown" aria-expanded="false">
+                        <img src="assets/img/user/user.png" class="user-image" alt="User Image" />
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
+                        <!-- User image -->
+                        <li class="dropdown-header">
+                            <img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
+                            <div class="d-inline-block">
+                                John Deo <small class="pt-1">john.example@gmail.com</small>
+                            </div>
+                        </li>
+                        <li>
+                            <a href="user-profile.html">
+                                <i class="mdi mdi-account"></i> My Profile
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-email"></i> Message
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
+                        </li>
+                        <li class="right-sidebar-in">
+                            <a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
+                        </li>
+                        <li class="dropdown-footer">
+                            <a href="/logout.php"> <i class="mdi mdi-logout"></i> Log Out </a>
+                        </li>
+                    </ul>
+                </li>
+                <li class="dropdown notifications-menu custom-dropdown">
+                    <button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
+                        <i class="mdi mdi-bell-outline"></i>
+                    </button>
+
+                    <div class="card card-default dropdown-notify dropdown-menu-right mb-0">
+                        <div class="card-header card-header-border-bottom px-3">
+                            <h2>Notifications</h2>
+                        </div>
+
+                        <div class="card-body px-0 py-0">
+                            <ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myTab" role="tablist">
+                                <li class="nav-item mx-3 my-0 py-0">
+                                    <a href="#" class="nav-link active pb-3" id="home2-tab" data-bs-toggle="tab" data-bs-target="#home2" role="tab" aria-controls="home2" aria-selected="true">All (10)</a>
+                                </li>
+
+                                <li class="nav-item mx-3 my-0 py-0">
+                                    <a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab" data-bs-target="#profile2" role="tab" aria-controls="profile2" aria-selected="false">Msgs (5)</a>
+                                </li>
+
+                                <li class="nav-item mx-3 my-0 py-0">
+                                    <a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab" data-bs-target="#contact2" role="tab" aria-controls="contact2" aria-selected="false">Others (5)</a>
+                                </li>
+                            </ul>
+
+                            <div class="tab-content" id="myTabContent3">
+                                <div class="tab-pane fade show active" id="home2" role="tabpanel">
+                                    <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Nitin</h4>
+                                                        <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                            consectetur adipisicing elit. Nam itaque
+                                                            doloremque odio, eligendi delectus vitae.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 30 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification media-active">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
+                                                    <span class="status active"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Lovina</h4>
+                                                        <p class="last-msg">Donec mattis augue a nisl
+                                                            consequat, nec imperdiet ex rutrum. Fusce et
+                                                            vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-white">
+                                                            <i class="mdi mdi-clock-outline"></i> Just
+                                                            now...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Crinali</h4>
+                                                        <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                            consectetur adipisicing elit. Nam itaque
+                                                            doloremque odio, eligendi delectus vitae.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification event-active">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
+                                                    <i class="mdi mdi-calendar-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Upcomming event added</h4>
+                                                        <p class="last-msg font-size-14">03/Jan/2020 (1pm -
+                                                            2pm)</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 10 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
+                                                    <i class="mdi mdi-chart-areaspline font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Yearly Sales report</h4>
+                                                        <p class="last-msg font-size-14">Lorem ipsum dolor
+                                                            sit, amet consectetur adipisicing elit. Nam
+                                                            itaque doloremque odio, eligendi delectus vitae.
+                                                        </p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
+                                                    <i class="mdi mdi-account-multiple-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">New request</h4>
+                                                        <p class="last-msg font-size-14">Add Dany Jones as
+                                                            your contact consequat nec imperdiet ex rutrum.
+                                                            Fusce et vehicula enim. Sed in enim.</p>
+
+                                                        <span class="my-1 btn btn-sm btn-success">Accept</span>
+                                                        <span class="my-1 btn btn-sm btn-secondary">Delete</span>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary d-block">
+                                                            <i class="mdi mdi-clock-outline"></i> 5 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
+                                                    <i class="mdi mdi-server-network-off font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Server overloaded</h4>
+                                                        <p class="last-msg font-size-14">Donec mattis augue
+                                                            a nisl consequat, nec imperdiet ex rutrum. Fusce
+                                                            et vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 30 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
+                                                    <i class="mdi mdi-playlist-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Task complete</h4>
+                                                        <p class="last-msg font-size-14">Nam ut nisi erat.
+                                                            Ut quis tortor varius, hendrerit arcu quis,
+                                                            congue nisl. In scelerisque, sem ut ve.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 2 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                    </ul>
+                                </div>
+
+                                <div class="tab-pane fade" id="profile2" role="tabpanel">
+                                    <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u6.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Hardiko</h4>
+                                                        <p class="last-msg">Donec mattis augue a nisl
+                                                            consequat, nec imperdiet ex rutrum. Fusce et
+                                                            vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u7.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Browin</h4>
+                                                        <p class="last-msg">Nam ut nisi erat. Ut quis tortor
+                                                            varius, hendrerit arcu quis, congue nisl. In
+                                                            scelerisque, sem ut ve.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification media-active">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
+                                                    <span class="status active"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">jenelia</h4>
+                                                        <p class="last-msg">Donec mattis augue a nisl
+                                                            consequat, nec imperdiet ex rutrum. Fusce et
+                                                            vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-white">
+                                                            <i class="mdi mdi-clock-outline"></i> Just
+                                                            now...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Bhavlio</h4>
+                                                        <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                            consectetur adipisicing elit. Nam itaque
+                                                            doloremque odio, eligendi delectus vitae.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+                                                <div class="position-relative mr-3">
+                                                    <img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
+                                                    <span class="status away"></span>
+                                                </div>
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Browini</h4>
+                                                        <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                            consectetur adipisicing elit. Nam itaque
+                                                            doloremque odio, eligendi delectus vitae.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                    </ul>
+                                </div>
+
+                                <div class="tab-pane fade" id="contact2" role="tabpanel">
+                                    <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification event-active">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
+                                                    <i class="mdi mdi-calendar-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Upcomming event added</h4>
+                                                        <p class="last-msg font-size-14">03/Jan/2020 (1pm -
+                                                            2pm)</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 10 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
+                                                    <i class="mdi mdi-chart-areaspline font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">New Sales report</h4>
+                                                        <p class="last-msg font-size-14">Lorem ipsum dolor
+                                                            sit, amet consectetur adipisicing elit. Nam
+                                                            itaque doloremque odio, eligendi delectus vitae.
+                                                        </p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
+                                                    <i class="mdi mdi-account-multiple-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">New Request</h4>
+                                                        <p class="last-msg font-size-14">Add Dany Jones as
+                                                            your contact consequat nec imperdiet ex rutrum.
+                                                            Fusce et vehicula enim. Sed in enim.</p>
+
+                                                        <span class="my-1 btn btn-sm btn-success">Accept</span>
+                                                        <span class="my-1 btn btn-sm btn-secondary">Delete</span>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary d-block">
+                                                            <i class="mdi mdi-clock-outline"></i> 5 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
+                                                    <i class="mdi mdi-server-network-off font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">Server overloaded</h4>
+                                                        <p class="last-msg font-size-14">Donec mattis augue
+                                                            a nisl consequat, nec imperdiet ex rutrum. Fusce
+                                                            et vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 30 min
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
+                                                    <i class="mdi mdi-playlist-check font-size-20"></i>
+                                                </div>
+
+                                                <div class="media-body d-flex justify-content-between">
+                                                    <div class="message-contents">
+                                                        <h4 class="title">New Task complete</h4>
+                                                        <p class="last-msg font-size-14">Nam ut nisi erat.
+                                                            Ut quis tortor varius, hendrerit arcu quis,
+                                                            congue nisl. In scelerisque, sem ut ve.</p>
+
+                                                        <span class="font-size-12 font-weight-medium text-secondary">
+                                                            <i class="mdi mdi-clock-outline"></i> 2 hrs
+                                                            ago...
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="dropdown-menu dropdown-menu-right d-none">
+                        <li class="dropdown-header">You have 5 notifications</li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-account-plus"></i> New user registered
+                                <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-account-remove"></i> User deleted
+                                <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 07 AM</span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-chart-areaspline"></i> Sales report is ready
+                                <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 12 PM</span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-account-supervisor"></i> New client
+                                <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="mdi mdi-server-network-off"></i> Server overloaded
+                                <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 05 AM</span>
+                            </a>
+                        </li>
+                        <li class="dropdown-footer">
+                            <a class="text-center" href="#"> View All </a>
+                        </li>
+                    </ul>
+                </li>
+                <li class="right-sidebar-in right-sidebar-2-menu">
+                    <i class="mdi mdi-settings-outline mdi-spin"></i>
+                </li>
+            </ul>
+        </div>
+    </nav>
+</header>
\ No newline at end of file
diff --git a/admin/user-card.php b/admin/user-card.php
index 228c3a3..4826885 100644
--- a/admin/user-card.php
+++ b/admin/user-card.php
@@ -83,560 +83,8 @@ $users = getUsers();
 		<!-- PAGE WRAPPER -->
 		<div class="ec-page-wrapper">
 
-			<!-- Header -->
-			<header class="ec-main-header" id="header">
-				<nav class="navbar navbar-static-top navbar-expand-lg">
-					<!-- Sidebar toggle button -->
-					<button id="sidebar-toggler" class="sidebar-toggle"></button>
-					<!-- search form -->
-					<div class="search-form d-lg-inline-block">
-						<div class="input-group">
-							<input type="text" name="query" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
-							<button type="button" name="search" id="search-btn" class="btn btn-flat">
-								<i class="mdi mdi-magnify"></i>
-							</button>
-						</div>
-						<div id="search-results-container">
-							<ul id="search-results"></ul>
-						</div>
-					</div>
-
-					<!-- navbar right -->
-					<div class="navbar-right">
-						<ul class="nav navbar-nav">
-							<!-- User Account -->
-							<li class="dropdown user-menu">
-								<button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown" aria-expanded="false">
-									<img src="assets/img/user/user.png" class="user-image" alt="User Image" />
-								</button>
-								<ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
-									<!-- User image -->
-									<li class="dropdown-header">
-										<img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
-										<div class="d-inline-block">
-											John Deo <small class="pt-1">john.example@gmail.com</small>
-										</div>
-									</li>
-									<li>
-										<a href="user-profile.html">
-											<i class="mdi mdi-account"></i> My Profile
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-email"></i> Message
-										</a>
-									</li>
-									<li>
-										<a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
-									</li>
-									<li class="right-sidebar-in">
-										<a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
-									</li>
-									<li class="dropdown-footer">
-										<a href="index.php"> <i class="mdi mdi-logout"></i> Log Out </a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown notifications-menu custom-dropdown">
-								<button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
-									<i class="mdi mdi-bell-outline"></i>
-								</button>
-
-								<div class="card card-default dropdown-notify dropdown-menu-right mb-0">
-									<div class="card-header card-header-border-bottom px-3">
-										<h2>Notifications</h2>
-									</div>
-
-									<div class="card-body px-0 py-0">
-										<ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myTab" role="tablist">
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link active pb-3" id="home2-tab" data-bs-toggle="tab" data-bs-target="#home2" role="tab" aria-controls="home2" aria-selected="true">All (10)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab" data-bs-target="#profile2" role="tab" aria-controls="profile2" aria-selected="false">Msgs (5)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab" data-bs-target="#contact2" role="tab" aria-controls="contact2" aria-selected="false">Others (5)</a>
-											</li>
-										</ul>
-
-										<div class="tab-content" id="myTabContent3">
-											<div class="tab-pane fade show active" id="home2" role="tabpanel">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Nitin</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Lovina</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Crinali</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Yearly Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="profile2" role="tabpanel">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u6.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Hardiko</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u7.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browin</h4>
-																	<p class="last-msg">Nam ut nisi erat. Ut quis tortor
-																		varius, hendrerit arcu quis, congue nisl. In
-																		scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">jenelia</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Bhavlio</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browini</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="contact2" role="tabpanel">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<ul class="dropdown-menu dropdown-menu-right d-none">
-									<li class="dropdown-header">You have 5 notifications</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-plus"></i> New user registered
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-remove"></i> User deleted
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 07 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-chart-areaspline"></i> Sales report is ready
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 12 PM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-supervisor"></i> New client
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-server-network-off"></i> Server overloaded
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 05 AM</span>
-										</a>
-									</li>
-									<li class="dropdown-footer">
-										<a class="text-center" href="#"> View All </a>
-									</li>
-								</ul>
-							</li>
-							<li class="right-sidebar-in right-sidebar-2-menu">
-								<i class="mdi mdi-settings-outline mdi-spin"></i>
-							</li>
-						</ul>
-					</div>
-				</nav>
-			</header>
+			<!-- HEADER -->
+			<?php include 'header.php' ?>
 
 			<!-- CONTENT WRAPPER -->
 			<div class="ec-content-wrapper ec-ec-content-wrapper mb-m-24px">
diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php
index 4ed7951..f923609 100644
--- a/admin/vendor-profile.php
+++ b/admin/vendor-profile.php
@@ -68,636 +68,7 @@ $array = json_decode($vendor,true);
 		<div class="ec-page-wrapper">
 
 			<!-- Header -->
-			<header class="ec-main-header" id="header">
-				<nav class="navbar navbar-static-top navbar-expand-lg">
-					<!-- Sidebar toggle button -->
-					<button id="sidebar-toggler" class="sidebar-toggle"></button>
-					<!-- search form -->
-					<div class="search-form d-lg-inline-block">
-						<div class="input-group">
-							<input type="text" name="query" id="search-input" class="form-control"
-								placeholder="search.." autofocus autocomplete="off" />
-							<button type="button" name="search" id="search-btn" class="btn btn-flat">
-								<i class="mdi mdi-magnify"></i>
-							</button>
-						</div>
-						<div id="search-results-container">
-							<ul id="search-results"></ul>
-						</div>
-					</div>
-
-					<!-- navbar right -->
-					<div class="navbar-right">
-						<ul class="nav navbar-nav">
-							<!-- User Account -->
-							<li class="dropdown user-menu">
-								<button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown"
-									aria-expanded="false">
-									<img src="assets/img/user/user.png" class="user-image" alt="User Image" />
-								</button>
-								<ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
-									<!-- User image -->
-									<li class="dropdown-header">
-										<img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
-										<div class="d-inline-block">
-											John Deo <small class="pt-1">john.example@gmail.com</small>
-										</div>
-									</li>
-									<li>
-										<a href="user-profile.html">
-											<i class="mdi mdi-account"></i> My Profile
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-email"></i> Message
-										</a>
-									</li>
-									<li>
-										<a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
-									</li>
-									<li class="right-sidebar-in">
-										<a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
-									</li>
-									<li class="dropdown-footer">
-										<a href="/logout.php"> <i class="mdi mdi-logout"></i> Log Out </a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown notifications-menu custom-dropdown">
-								<button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
-									<i class="mdi mdi-bell-outline"></i>
-								</button>
-
-								<div class="card card-default dropdown-notify dropdown-menu-right mb-0">
-									<div class="card-header card-header-border-bottom px-3">
-										<h2>Notifications</h2>
-									</div>
-
-									<div class="card-body px-0 py-0">
-										<ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myNotificationTab"
-											role="tablist">
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link active pb-3" id="home2-tab"
-													data-bs-toggle="tab" data-bs-target="#home2" role="tab"
-													aria-controls="home2" aria-selected="true">All (10)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab"
-													data-bs-target="#profile2" role="tab" aria-controls="profile2"
-													aria-selected="false">Msgs (5)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab"
-													data-bs-target="#contact2" role="tab" aria-controls="contact2"
-													aria-selected="false">Others (5)</a>
-											</li>
-										</ul>
-
-										<div class="tab-content" id="myTabContent3">
-											<div class="tab-pane fade show active" id="home2" role="tabpanel"
-												aria-labelledby="home2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Nitin</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg"
-																	alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Lovina</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Crinali</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification event-active">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Yearly Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i
-																	class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span
-																		class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span
-																		class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="profile2" role="tabpanel"
-												aria-labelledby="profile2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u6.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Hardiko</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u7.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browin</h4>
-																	<p class="last-msg">Nam ut nisi erat. Ut quis tortor
-																		varius, hendrerit arcu quis, congue nisl. In
-																		scelerisque, sem ut ve.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg"
-																	alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">jenelia</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Bhavlio</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg"
-																	alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browini</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="contact2" role="tabpanel"
-												aria-labelledby="contact2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification event-active">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i
-																	class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span
-																		class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span
-																		class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)"
-															class="media media-message media-notification">
-
-															<div
-																class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span
-																		class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<ul class="dropdown-menu dropdown-menu-right d-none">
-									<li class="dropdown-header">You have 5 notifications</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-plus"></i> New user registered
-											<span class=" font-size-12 d-inline-block float-right"><i
-													class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-remove"></i> User deleted
-											<span class=" font-size-12 d-inline-block float-right"><i
-													class="mdi mdi-clock-outline"></i> 07 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-chart-areaspline"></i> Sales report is ready
-											<span class=" font-size-12 d-inline-block float-right"><i
-													class="mdi mdi-clock-outline"></i> 12 PM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-supervisor"></i> New client
-											<span class=" font-size-12 d-inline-block float-right"><i
-													class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-server-network-off"></i> Server overloaded
-											<span class=" font-size-12 d-inline-block float-right"><i
-													class="mdi mdi-clock-outline"></i> 05 AM</span>
-										</a>
-									</li>
-									<li class="dropdown-footer">
-										<a class="text-center" href="#"> View All </a>
-									</li>
-								</ul>
-							</li>
-							<li class="right-sidebar-in right-sidebar-2-menu">
-								<i class="mdi mdi-settings-outline mdi-spin"></i>
-							</li>
-						</ul>
-					</div>
-				</nav>
-			</header>
+			<?php include 'header.php' ?>
 
 			<!-- CONTENT WRAPPER -->
 			<div class="ec-content-wrapper">
diff --git a/product-left-sidebar.php b/product-left-sidebar.php
index 7316195..512d2a2 100644
--- a/product-left-sidebar.php
+++ b/product-left-sidebar.php
@@ -505,7 +505,7 @@ if (isset($_GET['id'])) {
                                                                 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" 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> <div id="addToCartMessage" style="padding-left:45px;"></div> <button class="btn btn-primary" id="addToCartButton" style="text-wrap:nowrap; 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>';
diff --git a/user-history.php b/user-history.php
index b36a83f..7f6f97f 100644
--- a/user-history.php
+++ b/user-history.php
@@ -38,6 +38,9 @@ if ($_SESSION["userId"] <> "") {
     <link rel="stylesheet" href="assets/css/plugins/slick.min.css" />
     <link rel="stylesheet" href="assets/css/plugins/bootstrap.css" />
 
+    <!-- FLATICON -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
+
     <!-- Main Style -->
     <link rel="stylesheet" href="assets/css/style.css" />
     <link rel="stylesheet" href="assets/css/style2.css" />
@@ -45,15 +48,58 @@ if ($_SESSION["userId"] <> "") {
 
     <!-- Background css -->
     <link rel="stylesheet" id="bg-switcher-css" href="assets/css/backgrounds/bg-4.css">
+
     <style>
         .tab.active {
-            background-color: #3498db;
+            background-color: #ffffff;
             /* Set your desired background color for the active tab */
-            color: #ffffff;
+            color: #ffaa00;
             /* Set your desired text color for the active tab */
+            border: 1px solid #ffaa00
+            /* Set your desired border color for the active tab */
+        }
+        .tab {
+            background-color: #ffaa00;
+            color: #ffffff;
+            font-family: "Poppins, sans-serif";
+            font-weight: 400;
+            /* margin: 2px; */
+            text-align: center;
+            margin-right: -25px;
+        }
+        .tab i {
+            font-size: 15px;
+            /* padding-left: 3px; */
+        }
+        .tableView:hover {
+            background-color: #f5f5f5;
+        }
+        .tab-content {
+            border: none;
+        }
+        .theadTitle {
+            background-color: #dddddd;
+            padding-top: -50px;
+        }
 
+        @media only screen and (max-width: 640px) {
+            #tableTitle {
+                font-size: 14px;
+            }
+            #shopNow {
+                font-size: 12px;
+            }
+        }
+        @media only screen and (max-width: 460px) {
+            #tableTitle {
+                font-size: 12px;
+            }
+            #shopNow {
+                font-size: 10px;
+            }
         }
     </style>
+
     <script>
         function updateCartItemCount() {
             $.get("cartitems.php?id=<?php echo $_SESSION['customerId']; ?>", function(data, status) {
@@ -134,33 +180,76 @@ if ($_SESSION["userId"] <> "") {
                                     <img class="v-img" src="assets/images/user/1.jpg" alt="vendor image">
                                     <h5>Mariana Johns</h5>
                                 </div> -->
+
+                                <!-- 03-14-2024 Stacy added customer image -->
+                                <div class="ec-vendor-block-bg" style="background-color: orange; background-image: url(<?php echo $customer_data['customer_banner'] ?>) !important;">
+                                </div>
+                                <div class="ec-vendor-block-detail">
+                                    <?php
+                                    $customer_image = isset($customer_data[0]['customer_image']) ? $customer_data[0]['customer_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
+                                    ?>
+                                    <img class="v-img" src=<?php echo $customer_image ?> alt="vendor image">
+                                </div>
                                 <?php include 'user-profile-tabs.php' ?>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="ec-shop-rightside col-lg-9 col-md-12">
+
+                    <!-- 03-14-2024 Stacy added cards -->
+                    <div class="row" id="rowTabs" style="justify-content:center; padding-bottom:20px; padding-right:20px; display:flex; align-items:center; text-align:center;">
+                        <div id="tableTabs" class="col-lg-3 col-md-6" style="width:8rem;">
+                            <div class="tab h-40"  data-tab-name="allOrders" onclick="showTab('allOrders'), document.getElementById('tableTitle').innerHTML = 'All Order History'">All Orders
+                                <i class="fa-solid fa-cubes"></i>
+                            </div>
+                        </div>
+                        <div id="tableTabs" class="col-lg-3 col-md-6" style="width:8rem;">
+                            <div class="tab h-40"  data-tab-name="toPay" onclick="showTab('toPay'), document.getElementById('tableTitle').innerHTML = 'All To Pay Products'">To Pay
+                                <i class="fa-solid fa-money-bill-1-wave"></i>
+                            </div>
+                        </div>
+                        <div id="tableTabs" class="col-lg-3 col-md-6" style="width:8rem;">
+                            <div class="tab h-40" data-tab-name="toShip" onclick="showTab('toShip'), document.getElementById('tableTitle').innerHTML = 'All To Ship Products'">To Ship
+                                <i class="fa-solid fa-truck"></i>
+                            </div>
+                        </div>
+                        <div id="tableTabs" class="col-lg-3 col-md-6" style="width:8rem;">
+                            <div class="tab h-40" data-tab-name="toReceive" onclick="showTab('toReceive'), document.getElementById('tableTitle').innerHTML = 'All To Receive Products'">To Receive
+                                <i class="fa-solid fa-box-archive"></i>
+                            </div>
+                        </div>
+                        <div id="tableTabs" class="col-lg-3 col-md-6" style="width:8rem;">
+                            <div class="tab h-40" data-tab-name="completed" onclick="showTab('completed'), document.getElementById('tableTitle').innerHTML = 'All Completed Purchase'">Completed
+                                <i class="fa-solid fa-square-check"></i>
+                            </div>
+                        </div>
+                    </div>
                     <div class="ec-vendor-dashboard-card">
                         <div class="ec-vendor-card-header">
-                            <h5>Product History</h5>
-                            <div class="ec-header-btn">
-                                <a class="btn btn-lg btn-primary" href="#">Shop Now</a>
+                            <h5 id="tableTitle">All Order History</h5>
+                            <!-- <div class="ec-header-btn" style="border:1px solid red; padding-right:-50px;">
+                                <a class="btn btn-lg btn-primary" style="background:none; color:#3474d4;" href="#">View All</a>
+                            </div> -->
+                            <div class="ec-header-btn" id="tableTitle">
+                                <!-- <a class="btn btn-lg btn-primary" style="background:none; color:#3474d4;" href="#">View All</a> -->
+                                <a class="btn btn-lg btn-primary" id="shopNow" style="background:none; color:#3474d4;" href="index.php">Shop Now</a>
                             </div>
                         </div>
                         <div class="ec-vendor-card-body">
                             <div class="ec-vendor-card-table">
-                                <div class="tab-container">
+                                <!-- <div class="tab-container">
                                     <div class="tab" data-tab-name="toPay" onclick="showTab('toPay')">To Pay</div>
                                     <div class="tab" data-tab-name="toShip" onclick="showTab('toShip')">To Ship</div>
                                     <div class="tab" data-tab-name="toReceive" onclick="showTab('toReceive')">To Receive</div>
                                     <div class="tab" data-tab-name="completed" onclick="showTab('completed')">Completed</div>
+                                </div> -->
 
-                                </div>
-                                <div id="toPay" class="tab-content active">
-
-                                    <!-- Content for "To Pay" tab -->
+                                <!-- 03-15-2024 Stacy added tab for all orders -->
+                                <div id="allOrders" class="tab-content active">
+                                    <!-- Content for "all Orders" tab -->
                                     <table class="table ec-table">
-                                        <thead>
+                                        <thead class="theadTitle">
                                             <tr>
                                                 <th scope="col">Image</th>
                                                 <th scope="col">Name</th>
@@ -175,6 +264,73 @@ if ($_SESSION["userId"] <> "") {
                                         </thead>
                                         <tbody>
                                             <?php
+                                            if ($_SESSION["isLoggedIn"] && $customer_data) {
+                                                $customer = $customer_data[0];
+                                                $orders = getOrderbyCustomerId($customer['_id']);
+                                                $totalAmount = 0;
+                                                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'])) {
+                                                            $totalAmount += $order['total_amount'];
+                                            ?>
+                                                            <?php
+                                                            $jsonorder = json_encode($order);
+                                                            ?>
+                                                            <tr class="tableView" data-value=' <?php echo $jsonorder; ?>' data-bs-toggle="modal" data-bs-target="#productDetails">
+                                                                <td>
+                                                                <?php
+                                                                    // if (isset($order['items'][0]['product']['product_image'])) {
+                                                                    //     echo '<img class="prod-img" src="' . $order['items'][0]['product']['product_image'] . '" alt="product"> ';
+                                                                    // } else {
+                                                                    //     echo '<img class="prod-img" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="product">';
+                                                                    // }
+                                                                ?>
+                                                                </td>
+                                                                    <!-- <img class="prod-img" src="<?php # echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td> -->
+                                                                <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
+                                                                <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
+                                                                <td><span><?php echo $order['items'][0]['price']; ?></span></td>
+                                                                <td><span><?php echo $order['total_amount'] ?></span></td>
+                                                                <td><span><?php echo $order['status']; ?></span></td>
+                                                                <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
+
+                                                                <!-- <td><span class="tbl-btn"><a class="btn btn-lg btn-primary" href="#">View</a></span></td> -->
+                                                            </tr>
+
+                                                        <?php } else { ?> 
+                                                            <td> <img class="prod-img" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="product"> </td>
+                                            <?php
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            ?>
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                
+                                <div id="toPay" class="tab-content">
+                                    <!-- Content for "To Pay" tab -->
+                                    <table class="table ec-table">
+                                        <thead class="theadTitle">
+                                            <tr>
+                                                <th scope="col">Image</th>
+                                                <th scope="col">Name</th>
+                                                <th scope="col">Quantity</th>
+                                                <th scope="col">Unit Price</th>
+                                                <th scope="col">Price</th>
+                                                <th scope="col">Status</th>
+                                                <th scope="col">Date</th>
+
+                                                <!-- <th scope="col">Actions</th> -->
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                        <?php
                                             if ($_SESSION["isLoggedIn"] && $customer_data) {
                                                 $customer = $customer_data[0];
                                                 $orders = getOrderbyCustomerId($customer['_id']);
@@ -187,7 +343,10 @@ if ($_SESSION["userId"] <> "") {
                                                         if (isset($order['status']) && (strtoupper($order['status']) === 'TO PAY') && isset($order['items'][0]['product'])) {
                                                             $totalAmount += $order['total_amount'];
                                             ?>
-                                                            <tr>
+                                                            <?php
+                                                            $jsonorder = json_encode($order);
+                                                            ?>
+                                                            <tr class="tableView" data-value=' <?php echo $jsonorder; ?>' data-bs-toggle="modal" data-bs-target="#productDetails">
                                                                 <td><img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td>
                                                                 <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
                                                                 <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
@@ -207,11 +366,12 @@ if ($_SESSION["userId"] <> "") {
                                         </tbody>
                                     </table>
                                 </div>
-                                <div id="toShip" class="tab-content">
 
+                                
+                                <div id="toShip" class="tab-content">
                                     <!-- Content for "To Ship" tab -->
                                     <table class="table ec-table">
-                                        <thead>
+                                        <thead class="theadTitle">
                                             <tr>
                                                 <th scope="col">Image</th>
                                                 <th scope="col">Name</th>
@@ -219,53 +379,56 @@ if ($_SESSION["userId"] <> "") {
                                                 <th scope="col">Unit Price</th>
                                                 <th scope="col">Price</th>
                                                 <th scope="col">Status</th>
-                                                <th scope="col">Tracking Number</th>
-                                                <th scope="col">Courier Name</th>
+                                                <!-- <th scope="col">Tracking Number</th>
+                                                <th scope="col">Courier Name</th> -->
                                                 <th scope="col">Date</th>
 
                                                 <!-- <th scope="col">Actions</th> -->
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            <?php
-                                            if ($_SESSION["isLoggedIn"] && $customer_data) {
-                                                $customer = $customer_data[0];
-                                                $orders = getOrderbyCustomerId($customer['_id']);
-                                                $totalAmount = 0;
-                                                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'])) {
-                                                            $totalAmount += $order['total_amount'];
-                                            ?>
-                                                            <tr>
-                                                                <td><img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td>
-                                                                <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
-                                                                <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
-                                                                <td><span><?php echo $order['items'][0]['price']; ?></span></td>
-                                                                <td><span><?php echo $order['total_amount'] ?></span></td>
-                                                                <td><span><?php echo $order['status']; ?></span></td>
-                                                                <td><span><?php echo $order['tracking_number']; ?></span></td>
-                                                                <td><span><?php echo $order['courirer_name']; ?></span></td>
-                                                                <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
-
-                                                                <!-- <td><span class="tbl-btn"><a class="btn btn-lg btn-primary" href="#">View</a></span></td> -->
-                                                            </tr>
-                                            <?php
-                                                        }
+                                        <?php
+                                        if ($_SESSION["isLoggedIn"] && $customer_data) {
+                                            $customer = $customer_data[0];
+                                            $orders = getOrderbyCustomerId($customer['_id']);
+                                            $totalAmount = 0;
+                                            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'])) {
+                                                        $totalAmount += $order['total_amount'];
+                                        ?>
+                                                        <?php
+                                                        $jsonorder = json_encode($order);
+                                                        ?>
+                                                        <tr class="tableView" data-value=' <?php echo $jsonorder; ?>' data-bs-toggle="modal" data-bs-target="#productDetails">
+                                                            <td><img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td>
+                                                            <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
+                                                            <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
+                                                            <td><span><?php echo $order['items'][0]['price']; ?></span></td>
+                                                            <td><span><?php echo $order['total_amount'] ?></span></td>
+                                                            <td><span><?php echo $order['status']; ?></span></td>
+                                                            <!-- <td><span><?php echo $order['tracking_number']; ?></span></td>
+                                                            <td><span><?php echo $order['courier_name']; ?></span></td> -->
+                                                            <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
+                                                        </tr>
+                                        <?php
                                                     }
                                                 }
                                             }
-                                            ?>
+                                        }
+                                        ?>
                                         </tbody>
                                     </table>
                                 </div>
 
+                                
                                 <div id="toReceive" class="tab-content">
+                                    <!-- Content for "To Receive" tab -->
                                     <table class="table ec-table">
-                                        <thead>
+                                        <thead class="theadTitle">
                                             <tr>
                                                 <th scope="col">Image</th>
                                                 <th scope="col">Name</th>
@@ -273,55 +436,67 @@ if ($_SESSION["userId"] <> "") {
                                                 <th scope="col">Unit Price</th>
                                                 <th scope="col">Price</th>
                                                 <th scope="col">Status</th>
-                                                <th scope="col">Tracking Number</th>
-                                                <th scope="col">Courier Name</th>
+                                                <!-- <th scope="col">Tracking Number</th>
+                                                <th scope="col">Courier Name</th> -->
                                                 <th scope="col">Date</th>
                                                 <th scope="col">Actions</th>
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            <?php
-                                            if ($_SESSION["isLoggedIn"] && $customer_data) {
-                                                $customer = $customer_data[0];
-                                                $orders = getOrderbyCustomerId($customer['_id']);
-                                                $totalAmount = 0;
-                                                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'])) {
-                                                            $totalAmount += $order['total_amount'];
-                                            ?>
-                                                            <tr>
-                                                                <td><img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td>
-                                                                <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
-                                                                <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
-                                                                <td><span><?php echo $order['items'][0]['price']; ?></span></td>
-                                                                <td><span><?php echo $order['total_amount'] ?></span></td>
-                                                                <td><span><?php echo $order['status']; ?></span></td>
-                                                                <td><span><?php echo $order['tracking_number']; ?></span></td>
-                                                                <td><span><?php echo $order['courier_name']; ?></span></td>
-                                                                <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
-                                                                <td>
-                                                                    <span class="tbl-btn">
-                                                                        <a class="btn btn-lg btn-primary" onclick="updateCompletedStatus('<?php echo $order['_id']; ?>', '<?php echo htmlspecialchars($order['payment']['reference_number']); ?>')">Received</a>
-                                                                    </span>
-                                                                </td>
-                                                            </tr>
-                                            <?php
-                                                        }
+                                        <?php
+                                        if ($_SESSION["isLoggedIn"] && $customer_data) {
+                                            $customer = $customer_data[0];
+                                            $orders = getOrderbyCustomerId($customer['_id']);
+                                            $totalAmount = 0;
+                                            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'])) {
+                                                        $totalAmount += $order['total_amount'];
+                                        ?>
+                                                        <?php
+                                                        $jsonorder = json_encode($order);
+                                                        ?>
+                                                        <tr class="tableView" data-value=' <?php echo $jsonorder; ?>' data-bs-toggle="modal" data-bs-target="#productDetails">
+                                                            <td>
+                                                                <!-- <?php if (isset($order['product_image'])) : ?>
+                                                                    <img src="<?php echo $order['items'][0]['product']['product_image']; ?>" class="prod-img">
+                                                                <?php else : ?>
+                                                                    <img src="https://api.obanana.com/images/storage/web_images/1708588564876-viber_image_2024-02-22_15-54-42-498.png" class="prod-img">
+                                                                <?php endif; ?> -->
+                                                            <img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product">
+                                                            </td>
+                                                            <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
+                                                            <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
+                                                            <td><span><?php echo $order['items'][0]['price']; ?></span></td>
+                                                            <td><span><?php echo $order['total_amount'] ?></span></td>
+                                                            <td><span><?php echo $order['status']; ?></span></td>
+                                                            <!-- <td><span><?php # echo $order['tracking_number']; ?></span></td>
+                                                            <td><span><?php # echo $order['courier_name']; ?></span></td> -->
+                                                            <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
+                                                            <td>
+                                                                <span class="tbl-btn">
+                                                                    <a class="btn btn-lg btn-primary" onclick="updateCompletedStatus('<?php echo $order['_id']; ?>')">Received</a>
+                                                                </span>
+                                                            </td>
+                                                        </tr>
+                                        <?php
                                                     }
                                                 }
                                             }
-                                            ?>
+                                        }
+                                        ?>
                                         </tbody>
                                     </table>
                                 </div>
 
+
                                 <div id="completed" class="tab-content">
+                                    <!-- Content for "Completed" tab -->
                                     <table class="table ec-table">
-                                        <thead>
+                                        <thead class="theadTitle">
                                             <tr>
                                                 <th scope="col">Image</th>
                                                 <th scope="col">Name</th>
@@ -329,8 +504,8 @@ if ($_SESSION["userId"] <> "") {
                                                 <th scope="col">Unit Price</th>
                                                 <th scope="col">Price</th>
                                                 <th scope="col">Status</th>
-                                                <th scope="col">Tracking Number</th>
-                                                <th scope="col">Courier Name</th>
+                                                <!-- <th scope="col">Tracking Number</th>
+                                                <th scope="col">Courier Name</th> -->
                                                 <th scope="col">Date</th>
                                                 <th scope="col">Actions</th>
                                             </tr>
@@ -348,34 +523,26 @@ if ($_SESSION["userId"] <> "") {
                                                         // Ensure that the required data is available before accessing it
                                                         if (isset($order['status']) && (strtoupper($order['status']) === 'COMPLETED') && isset($order['items'][0]['product'])) {
                                                             $totalAmount += $order['total_amount'];
+                                                            
                                             ?>
-                                                            <tr>
+                                                            <tr class="tableView" data-value=' <?php echo $jsonorder; ?>' data-bs-toggle="modal" data-bs-target="#productDetails">
                                                                 <td><img class="prod-img" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="product"></td>
                                                                 <td><span><?php echo $order['items'][0]['product']['name']; ?></span></td>
                                                                 <td><span><?php echo $order['items'][0]['quantity']; ?></span></td>
                                                                 <td><span><?php echo $order['items'][0]['price']; ?></span></td>
                                                                 <td><span><?php echo $order['total_amount'] ?></span></td>
                                                                 <td><span><?php echo $order['status']; ?></span></td>
-                                                                <td><span><?php echo $order['tracking_number']; ?></span></td>
-                                                                <td><span><?php echo $order['courier_name']; ?></span></td>
+                                                                <!-- <td><span><?php echo $order['tracking_number']; ?></span></td>
+                                                                <td><span><?php echo $order['courier_name']; ?></span></td> -->
                                                                 <td><span><?php echo date("F j, Y", strtotime($order['updatedAt'])); ?></span></td>
                                                                 <td>
-                                                                <?php
-                                                                    $currentDate = time(); // Current Unix timestamp
-
+                                                                    <?php
                                                                     if ($order['return_order']['status'] === 'To Approve') {
                                                                         echo '<span class="tbl-btn">Refund Requested</span>';
                                                                     } elseif ($order['return_order']['status'] === 'To Ship') {
                                                                         echo '<span class="tbl-btn">For Refund</span>';
-                                                                    } else {
-                                                                        $orderDate = strtotime($order['updatedAt']);
-                                                                        $sevenDaysAfterOrder = strtotime('+7 days', $orderDate); // Seven days after the order date
-
-                                                                        if ($currentDate >= $sevenDaysAfterOrder) {
-                                                                            echo '<span class="tbl-btn" disabled></span>';
-                                                                        } else {
-                                                                            echo '<a class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#modal-refund-' . $order['_id'] . '">Return/Refund</a>';
-                                                                        }
+                                                                    }else {
+                                                                        echo '<a class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#modal-refund-' . $order['_id'] . '">Return/Refund</a>';
                                                                     }
                                                                     ?>
                                                                 </td>
@@ -714,9 +881,151 @@ if ($_SESSION["userId"] <> "") {
 
     <!-- Footer Start -->
     <?php include "footer.php" ?>
-
     <!-- Footer Area End -->
 
+    <!-- Modal -->
+    <!-- 03-15-2024 Stacy added modal -->
+    <div class="modal fade" id="productDetails" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <div class="modal-body">
+                    <div class="modal-header" style="height:5px;">
+                        <button type="button" class="btn-close-icon" style="align-items: end;" data-bs-dismiss="modal" aria-label="Close">
+                        <i class="mdi mdi-close"></i>
+                        </button>
+                    </div>
+                    <div class="row" id="modalContent" style="justify-content:center; align-items:center;">
+                        <!-- modal content placed under script -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Modal end -->
+
+    <script>
+        // 03-18-2024 Stacy added script for showing productDetails modal
+        document.getElementById('productDetails').addEventListener('shown.bs.modal', function (event) {
+
+        var jsonString = $(event.relatedTarget).data('value');
+
+        var jsonObject = JSON.parse(jsonString);
+        const modal = document.getElementById('modalContent'); // No changes here
+
+        const date = new Date(jsonObject.updatedAt); const formatter = new Intl. DateTimeFormat('en-US', { day: '2-digit', month: '2-digit', year: 'numeric' }); const formattedDate = formatter. format(date);
+
+        if (jsonObject.status === 'TO PAY') { // Changed $order['status'] to jsonObject.status
+            modal.innerHTML = `
+            <div class="row" style="margin-left:20px;">
+                <div class="col-md-6">
+                    <img class="image-thumb-preview" style="width:100%; height:100%; padding-left:20px;" src="${jsonObject.items[0].product.product_image}" alt="product" />
+                </div>
+                <div class="col-md-6" style="margin:auto;">
+                    <ul style="font-size:14px;">
+                        <li><b>Product Name:</b> ${jsonObject.items[0].product.name}</li>
+                        <li><b>Quantity:</b> ${jsonObject.items[0].quantity}</li>
+                        <li><b>Unit Price:</b> ${jsonObject.items[0].price}</li>
+                        <li><b>Price:</b> ${jsonObject.total_amount}</li>
+                        <li><b>Status:</b> ${jsonObject.status}</li>
+                        <li><b>Date:</b> ${formattedDate}</li>
+                    </ul>
+                </div>
+            </div>`;
+        }
+
+        if (jsonObject.status === 'TO SHIP') { 
+            modal.innerHTML = `
+            <div class="row" style="margin-left:20px;">
+                <div class="col-md-6">
+                    <img class="image-thumb-preview" style="width:100%; height:100%; padding-left:20px;" src="${jsonObject.items[0].product.product_image}" alt="product" />
+                </div>
+                <div class="col-md-6" style="margin:auto;">
+                    <ul style="font-size:14px;">
+                        <li><b>Product Name:</b> ${jsonObject.items[0].product.name}</li>
+                        <li><b>Quantity:</b> ${jsonObject.items[0].quantity}</li>
+                        <li><b>Unit Price:</b> ${jsonObject.items[0].price}</li>
+                        <li><b>Price:</b> ${jsonObject.total_amount}</li>
+                        <li><b>Status:</b> ${jsonObject.status}</li>
+                        <li><b>Tracking Number:</b> ${jsonObject.tracking_number}</li>
+                        <li><b>Courier Name:</b> ${jsonObject.courier_name}</li>
+                        <li><b>Date:</b> ${formattedDate}</li>
+                    </ul>
+                </div>
+            </div>`;
+        }
+
+        if (jsonObject.status === 'TO RECEIVE') { 
+            modal.innerHTML = `
+            <div class="row" style="margin-left:20px;">
+                <div class="col-md-6">
+                    <img class="image-thumb-preview" style="width:100%; height:100%; padding-left:20px;" src="${jsonObject.items[0].product.product_image}" alt="product" />
+                </div>
+                <div class="col-md-6" style="margin:auto;">
+                    <ul style="font-size:14px;">
+                        <li><b>Product Name:</b> ${jsonObject.items[0].product.name}</li>
+                        <li><b>Quantity:</b> ${jsonObject.items[0].quantity}</li>
+                        <li><b>Unit Price:</b> ${jsonObject.items[0].price}</li>
+                        <li><b>Price:</b> ${jsonObject.total_amount}</li>
+                        <li><b>Status:</b> ${jsonObject.status}</li>
+                        <li><b>Tracking Number:</b> ${jsonObject.tracking_number}</li>
+                        <li><b>Courier Name:</b> ${jsonObject.courier_name}</li>
+                        <li><b>Date:</b> ${formattedDate}</li>
+                    </ul>
+                </div>
+            </div>`;
+        }
+
+        if (jsonObject.status === 'COMPLETED') { 
+            modal.innerHTML = `
+            <div class="row" style="margin-left:20px;">
+                <div class="col-md-6">
+                    <img class="image-thumb-preview" style="width:100%; height:100%; padding-left:20px;" src="${jsonObject.items[0].product.product_image}" alt="product" />
+                </div>
+                <div class="col-md-6" style="margin:auto;">
+                    <ul style="font-size:14px;">
+                        <li><b>Product Name:</b> ${jsonObject.items[0].product.name}</li>
+                        <li><b>Quantity:</b> ${jsonObject.items[0].quantity}</li>
+                        <li><b>Unit Price:</b> ${jsonObject.items[0].price}</li>
+                        <li><b>Price:</b> ${jsonObject.total_amount}</li>
+                        <li><b>Status:</b> ${jsonObject.status}</li>
+                        <li><b>Tracking Number:</b> ${jsonObject.tracking_number}</li>
+                        <li><b>Courier Name:</b> ${jsonObject.courier_name}</li>
+                        <li><b>Date:</b> ${formattedDate}</li>
+                    </ul>
+                </div>
+            </div>`;
+        }
+
+        if (jsonObject.status === 'RETURNED') { 
+            modal.innerHTML = `
+            <div class="row" style="margin-left:20px;">
+                <div class="col-md-6">
+                    <img class="image-thumb-preview" style="width:100%; height:100%; padding-left:20px;" src="${jsonObject.items[0].product.product_image}" alt="product" />
+                </div>
+                <div class="col-md-6" style="margin:auto;">
+                    <ul style="font-size:14px;">
+                        <li><b>Product Name:</b> ${jsonObject.items[0].product.name}</li>
+                        <li><b>Quantity:</b> ${jsonObject.items[0].quantity}</li>
+                        <li><b>Unit Price:</b> ${jsonObject.items[0].price}</li>
+                        <li><b>Price:</b> ${jsonObject.total_amount}</li>
+                        <li><b>Status:</b> ${jsonObject.status}</li>
+                        <li><b>Tracking Number:</b> ${jsonObject.tracking_number}</li>
+                        <li><b>Courier Name:</b> ${jsonObject.courier_name}</li>
+                        <li><b>Date:</b> ${formattedDate}</li>
+                    </ul>
+                </div>
+            </div>`;
+        }
+        
+
+        console.log(jsonObject);
+        });
+
+        const modal = document.getElementById('productDetails');
+        console.log(modal);
+    </script>
+
+
     <!-- Footer navigation panel for responsive display -->
     <div class="ec-nav-toolbar">
         <div class="container">
diff --git a/user-profile.php b/user-profile.php
index 71eca38..e3ae4f4 100644
--- a/user-profile.php
+++ b/user-profile.php
@@ -114,7 +114,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">
@@ -168,7 +168,7 @@ if ($_SESSION["userId"] <> "") {
                                 <div class="col-md-12">
                                     <div class="ec-vendor-block-profile">
                                         <div class="ec-vendor-block-img space-bottom-30 ">
-                                            <div class="ec-vendor-block-bg" style="background-color: orange;">
+                                            <div class="ec-vendor-block-bg" style="background-color: orange; background-image: url(<?php echo $customer_data['customer_banner'] ?>) !important;">
                                                 <a href="#" class="btn btn-lg btn-primary" data-link-action="editmodal" title="Edit Detail" data-bs-toggle="modal" data-bs-target="#edit_modal">Edit Detail</a>
                                             </div>
 
diff --git a/user-refund-history.php b/user-refund-history.php
index 95a6416..8bfcbcc 100644
--- a/user-refund-history.php
+++ b/user-refund-history.php
@@ -49,7 +49,7 @@ if ($_SESSION["userId"] <> "") {
     <link rel="stylesheet" id="bg-switcher-css" href="assets/css/backgrounds/bg-4.css">
     <style>
         .tab.active {
-            background-color: #3498db;
+            background-color: #ffaa00;
             /* Set your desired background color for the active tab */
             color: #ffffff;
             /* Set your desired text color for the active tab */
@@ -136,6 +136,16 @@ if ($_SESSION["userId"] <> "") {
                                     <img class="v-img" src="assets/images/user/1.jpg" alt="vendor image">
                                     <h5>Mariana Johns</h5>
                                 </div> -->
+
+                                <!-- 03-142024 Stacy added customer image -->
+                                <div class="ec-vendor-block-bg" style="background-color: orange; background-image: url(<?php echo $customer_data['customer_banner'] ?>) !important;">
+                                </div>
+                                <div class="ec-vendor-block-detail">
+                                    <?php
+                                    $customer_image = isset($customer_data[0]['customer_image']) ? $customer_data[0]['customer_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
+                                    ?>
+                                    <img class="v-img" src=<?php echo $customer_image ?> alt="vendor image">
+                                </div>
                                 <?php include 'user-profile-tabs.php' ?>
                             </div>
                         </div>

From 19e95fc7e4dd90903be3ae7f55acef63dfbf0ebd Mon Sep 17 00:00:00 2001
From: raymart <raymartbarrera06@gmail.com>
Date: Wed, 20 Mar 2024 14:46:03 +0800
Subject: [PATCH 5/5] dynamic search bar and filtering min & max

---
 admin/index.php                        |  22 +-
 admin/left-main-sidebar.php            |   2 +-
 admin/vendor-delete-action1.php        |  26 +
 admin/vendor-product-grid.php          | 688 ++++----------------
 admin/vendor-product-search-action.php |  26 +
 admin/vendor-product-search.php        | 865 +++++++++++++++++++++++++
 catalog-single-vendor-action.php       |  30 +
 catalog-single-vendor.php              | 201 ++++--
 checkouttest.php                       |   4 +-
 9 files changed, 1242 insertions(+), 622 deletions(-)
 create mode 100644 admin/vendor-delete-action1.php
 create mode 100644 admin/vendor-product-search-action.php
 create mode 100644 admin/vendor-product-search.php
 create mode 100644 catalog-single-vendor-action.php

diff --git a/admin/index.php b/admin/index.php
index df56492..814484e 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -48,13 +48,11 @@ if($_SESSION["user_type"]!="admin"){
 
 <body class="ec-header-fixed ec-sidebar-fixed ec-sidebar-light ec-header-light" id="body">
 
-	<!--  WRAPPER  -->
-	<div class="wrapper">
-		
-		<!-- LEFT MAIN SIDEBAR -->
-	
-		<?php include 'left-main-sidebar.php' ?>
+	<!-- LEFT MAIN SIDEBAR -->
+	<?php include 'left-main-sidebar.php' ?>
 
+<!--  WRAPPER  -->
+	<div class="wrapper">
 		<!--  PAGE WRAPPER -->
 		<div class="ec-page-wrapper">
 
@@ -65,13 +63,21 @@ if($_SESSION["user_type"]!="admin"){
 					<button id="sidebar-toggler" class="sidebar-toggle"></button>
 					<!-- search form -->
 					<div class="search-form d-lg-inline-block">
-						<div class="input-group">
+						<form action="vendor-product-search-action.php">
+                            <div class="input-group">
+                                <input type="text" name="search" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
+                                <button class="submit" type="submit" id="search-btn" class="btn btn-flat">
+                                    <i class="mdi mdi-magnify" style="font-size:20px; color:gray; padding-right:8px;"></i>
+                                </button>
+                            </div>
+                        </form>
+						<!-- <div class="input-group">
 							<input type="text" name="query" id="search-input" class="form-control"
 								placeholder="search.." autofocus autocomplete="off" />
 							<button type="button" name="search" id="search-btn" class="btn btn-flat">
 								<i class="mdi mdi-magnify"></i>
 							</button>
-						</div>
+						</div> -->
 						<div id="search-results-container">
 							<ul id="search-results"></ul>
 						</div>
diff --git a/admin/left-main-sidebar.php b/admin/left-main-sidebar.php
index 9f13f0b..ecffa77 100644
--- a/admin/left-main-sidebar.php
+++ b/admin/left-main-sidebar.php
@@ -103,7 +103,7 @@
 
 						<!-- Products -->
 						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
+							<a class="sidenav-item-link" href="product-grid.php">
 								<i class="mdi mdi-palette-advanced"></i>
 								<span class="nav-text">Products</span> <b class="caret"></b>
 							</a>
diff --git a/admin/vendor-delete-action1.php b/admin/vendor-delete-action1.php
new file mode 100644
index 0000000..c4ba650
--- /dev/null
+++ b/admin/vendor-delete-action1.php
@@ -0,0 +1,26 @@
+<?php
+include "../functions.php";
+$productId = $_GET['id'];
+$curl = curl_init();
+$url = "https://".$_SESSION["data_endpoint"]."/api/v1/products/".$productId;
+curl_setopt($curl,CURLOPT_URL,$url);
+curl_setopt_array($curl, array(
+  //CURLOPT_URL => 'https://api.obanana.shop/api/v1/products/656717579624f6181c49cdda',
+  CURLOPT_RETURNTRANSFER => true,
+  CURLOPT_ENCODING => '',
+  CURLOPT_MAXREDIRS => 10,
+  CURLOPT_TIMEOUT => 0,
+  CURLOPT_FOLLOWLOCATION => true,
+  CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+  CURLOPT_CUSTOMREQUEST => 'DELETE',
+  CURLOPT_HTTPHEADER => array(
+    'X-Api-Key: {{apiKey}}'
+  ),
+));
+
+$response = curl_exec($curl);
+
+curl_close($curl);
+header("location: vendor-product-search.php");
+echo $response;
+?>
diff --git a/admin/vendor-product-grid.php b/admin/vendor-product-grid.php
index f8f24c9..42c15a2 100644
--- a/admin/vendor-product-grid.php
+++ b/admin/vendor-product-grid.php
@@ -39,7 +39,9 @@ if($_SESSION["user_type"]!="admin"){
 	<link id="ekka-css" rel="stylesheet" href="assets/css/ekka.css" />
 
 	<!-- FAVICON -->
-	<link href="assets/img/favicon.png" rel="shortcut icon" />
+	<!-- <link href="assets/img/favicon.png" rel="shortcut icon" /> -->
+	<link href="assets/img/favicon/favicon.png" rel="shortcut icon" />
+
 </head>
 
 <body class="ec-header-fixed ec-sidebar-fixed ec-sidebar-dark ec-header-light" id="body">
@@ -52,560 +54,8 @@ if($_SESSION["user_type"]!="admin"){
 		<!-- PAGE WRAPPER -->
 		<div class="ec-page-wrapper">
 
-			<!-- Header -->
-			<header class="ec-main-header" id="header">
-				<nav class="navbar navbar-static-top navbar-expand-lg">
-					<!-- Sidebar toggle button -->
-					<button id="sidebar-toggler" class="sidebar-toggle"></button>
-					<!-- search form -->
-					<div class="search-form d-lg-inline-block">
-						<div class="input-group">
-							<input type="text" name="query" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
-							<button type="button" name="search" id="search-btn" class="btn btn-flat">
-								<i class="mdi mdi-magnify"></i>
-							</button>
-						</div>
-						<div id="search-results-container">
-							<ul id="search-results"></ul>
-						</div>
-					</div>
-
-					<!-- navbar right -->
-					<div class="navbar-right">
-						<ul class="nav navbar-nav">
-							<!-- User Account -->
-							<li class="dropdown user-menu">
-								<button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown" aria-expanded="false">
-									<img src="assets/img/user/user.png" class="user-image" alt="User Image" />
-								</button>
-								<ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
-									<!-- User image -->
-									<li class="dropdown-header">
-										<img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
-										<div class="d-inline-block">
-											John Deo <small class="pt-1">john.example@gmail.com</small>
-										</div>
-									</li>
-									<li>
-										<a href="user-profile.html">
-											<i class="mdi mdi-account"></i> My Profile
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-email"></i> Message
-										</a>
-									</li>
-									<li>
-										<a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
-									</li>
-									<li class="right-sidebar-in">
-										<a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
-									</li>
-									<li class="dropdown-footer">
-										<a href="/logout.php"> <i class="mdi mdi-logout"></i> Log Out </a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown notifications-menu custom-dropdown">
-								<button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
-									<i class="mdi mdi-bell-outline"></i>
-								</button>
-
-								<div class="card card-default dropdown-notify dropdown-menu-right mb-0">
-									<div class="card-header card-header-border-bottom px-3">
-										<h2>Notifications</h2>
-									</div>
-
-									<div class="card-body px-0 py-0">
-										<ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myTab" role="tablist">
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link active pb-3" id="home2-tab" data-bs-toggle="tab" data-bs-target="#home2" role="tab" aria-controls="home2" aria-selected="true">All (10)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab" data-bs-target="#profile2" role="tab" aria-controls="profile2" aria-selected="false">Msgs (5)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab" data-bs-target="#contact2" role="tab" aria-controls="contact2" aria-selected="false">Others (5)</a>
-											</li>
-										</ul>
-
-										<div class="tab-content" id="myTabContent3">
-											<div class="tab-pane fade show active" id="home2" role="tabpanel" aria-labelledby="home2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Nitin</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Lovina</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Crinali</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Yearly Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="profile2" role="tabpanel" aria-labelledby="profile2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u6.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Hardiko</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u7.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browin</h4>
-																	<p class="last-msg">Nam ut nisi erat. Ut quis tortor
-																		varius, hendrerit arcu quis, congue nisl. In
-																		scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">jenelia</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Bhavlio</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browini</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="contact2" role="tabpanel" aria-labelledby="contact2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<ul class="dropdown-menu dropdown-menu-right d-none">
-									<li class="dropdown-header">You have 5 notifications</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-plus"></i> New user registered
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-remove"></i> User deleted
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 07 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-chart-areaspline"></i> Sales report is ready
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 12 PM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-supervisor"></i> New client
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-server-network-off"></i> Server overloaded
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 05 AM</span>
-										</a>
-									</li>
-									<li class="dropdown-footer">
-										<a class="text-center" href="#"> View All </a>
-									</li>
-								</ul>
-							</li>
-							<li class="right-sidebar-in right-sidebar-2-menu">
-								<i class="mdi mdi-settings-outline mdi-spin"></i>
-							</li>
-						</ul>
-					</div>
-				</nav>
-			</header>
+			<!-- HEADER -->
+			<?php include 'header.php' ?>
 
 			<!-- CONTENT WRAPPER -->
 			<div class="ec-content-wrapper">
@@ -630,7 +80,12 @@ if($_SESSION["user_type"]!="admin"){
 								<div class="card-header card-header-border-bottom d-flex justify-content-between">
 									<div class="card-bar">
 										<div class="col-lg-6 col-md-12">
-											<input type="text" class="form-control" id="searchProduct" placeholder="search with product name..">
+											<form style="display:flex;">
+												<input type="text" name="search" class="form-control" id="searchProduct" placeholder="search with product name..">
+												<button class="submit" type="submit" id="search-btn" class="btn btn-flat">
+													<i class="mdi mdi-magnify" style="font-size:20px; color:gray; margin-left:-40px;"></i>
+												</button> 
+											</form>
 										</div>
 										<div class="col-lg-6 col-md-12 sort">
 											<div class="col-lg-4 col-md-6 p-space">
@@ -655,10 +110,37 @@ if($_SESSION["user_type"]!="admin"){
 									</div>
 								</div>
 								<div class="card-body">
-									<div class="row">
+
+									<div class="row" id="productWrap">
 										<?php
 										$products = productListVendor($vendorId);
 										$totalProducts = count($products);
+
+										// 03-14-2024 Raymart created Search product start
+										// $productsCopy = $products;
+											
+										// if (!empty($_GET['search']) ) {
+										// 	$filteredProducts=[];
+										// 	foreach ($productsCopy as $result) {
+										// 	$productName = strtolower($result['product_name']);
+										// 		if (
+										// 			strpos($productName,$_GET['search'])!==false
+										// 		) {
+										// 			$filteredProducts[] = $result;
+										// 		} else{
+										// 		}
+										// 	}
+
+										// 	$products = $filteredProducts;
+										// 	$totalProducts = count($filteredProducts);
+										// 	// $vendorsPerPage = 20;
+										// }
+										// if ($totalProducts == 0) {
+										// 	echo '<p style="padding-top:30px; padding-left:20px;">No Product Found.</p>';
+										// }
+			
+										// 03-14-2024 Raymart created Search product end
+
 										for ($i = 0; $i <= $totalProducts - 1; $i++) {
 											$product = $products[$i];
 										?>
@@ -667,13 +149,21 @@ if($_SESSION["user_type"]!="admin"){
 													<div class="card-container">
 														<div class="card-top">
 															<div class="image-container" style="height: 300px;"> <!-- Adjust the height as needed -->
+															<?php
+															if (isset($product['images'])) {
+																$image_urls = explode(',', $product['images']);
+																if (!empty($image_urls)) {
+																	$first_image_url = trim($image_urls[0]);
+															?>
+																	<img class="img-fluid" src="<?php echo $first_image_url; ?>" alt="edit" style="object-fit: cover; width: 100%; height: 100%;"/>
 																<?php
-																if (isset($product['product_image']) && !empty($product['product_image'])) {
-																	echo '<img src="' . $product['product_image'] . '" alt="Product Image" class="img-fluid" style="object-fit: cover; width: 100%; height: 100%;">';
-																} else {
-																	echo '<img src="assets/img/vendor/u1.jpg" class="img-fluid rounded-circle" alt="Placeholder Image" style="object-fit: cover; width: 100%; height: 100%;">';
 																}
+															} else {
 																?>
+																<img class="img-fluid rounded-circle" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="edit" />
+															<?php
+															}
+															?>
 															</div>
 														</div>
 														<div class="card-bottom">
@@ -692,6 +182,82 @@ if($_SESSION["user_type"]!="admin"){
 										}
 										?>
 									</div>
+										<!-- 3-18-24 raymart add function for search bar -->
+									<script>
+
+										const productData = <?php $prod = json_encode($products); echo $prod;?>;
+										const productDataFinal = JSON.stringify(productData[0])
+										const array = new Array(productData)
+										console.log(array)
+										// const parseJs =JSON.parse(productData)
+									function searchProduct(e){
+										const searchInput = document.getElementById('searchProduct')
+
+										let search = []
+										
+										if(searchInput.value !==""  &&searchInput.value !==undefined ){
+											 search =array[0].filter((o)=>o.product_name.toLowerCase().includes(searchInput.value))??[];
+											console.log(array[0])
+										}else{
+											search =array[0]
+
+										}
+										const productWrap = document.getElementById('productWrap');
+										productWrap.innerHTML=''
+										if(search.length > 1){
+
+											search?.forEach(function(prod){
+												const productImage = prod.images.split(',') ??[]
+												// console.log(productImage)
+												const image = productImage[0] ?`
+												<img class="img-fluid" src="${productImage[0]}" alt="edit" style="object-fit: cover; width: 100%; height: 100%;"/>
+												
+												`:`
+												<img class="img-fluid rounded-circle" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="edit" style="object-fit: cover; width: 100%; height: 100%;"/>
+												
+												`
+												const card = document.createElement('div')
+												card.classList.add('col-lg-3','col-md-4','col-sm-6')
+												card.innerHTML=`
+											
+													<div class="card-wrapper">
+														<div class="card-container">
+															<div class="card-top">
+																<div class="image-container" style="height: 300px;"> <!-- Adjust the height as needed -->
+																${image}
+																
+																</div>
+															</div>
+															<div class="card-bottom">
+																<h3>${prod.product_name}</h3>
+																<p>₱${prod.regular_price}</p>
+															</div>
+															<div class="card-action">
+																<div class="card-edit" onclick="editProduct('${prod._id}');"><i class="mdi mdi-circle-edit-outline"></i></div>
+																<div class="card-preview"><i class="mdi mdi-eye-outline"></i></div>
+																<div class="card-remove" onclick="deleteProduct('${prod._id}');"><i class="mdi mdi mdi-delete-outline"></i></div>
+															</div>
+														</div>
+													</div>
+											`
+																productWrap.appendChild(card)
+																
+
+											})
+										}else{
+											const productWrap = document.getElementById('productWrap');
+										productWrap.innerHTML=`
+										<p style="padding-top:10px; padding-left:20px;">No Product Found.</p>
+										`
+										}
+
+										
+										// console.log(search)
+									}
+									const search = document.getElementById('searchProduct')
+									search.addEventListener("input", searchProduct)
+									</script>
+										<!-- 3-18-24 raymart add function for search bar -->
 									<!-- <div class="row">
 										<nav aria-label="Page navigation example p-0">
 											<ul class="pagination pagination-seperated pagination-seperated-rounded">
diff --git a/admin/vendor-product-search-action.php b/admin/vendor-product-search-action.php
new file mode 100644
index 0000000..0a19ef7
--- /dev/null
+++ b/admin/vendor-product-search-action.php
@@ -0,0 +1,26 @@
+<?php
+// 3-19-24 raymart added action for search bar ven-pro-search.php
+    include "../functions.php";
+    
+
+    if (isset($_GET["category"])) {
+        $category = $_GET["category"];
+        // You can use $category in your searchProducts function to filter results based on the category
+        $result = searchProducts( $category);
+    } else {
+        $result = searchProducts($_GET["search"]);
+        $result2 = searchVendor($_GET["search"]);
+    }
+
+    $array = json_decode($result,true);
+    $array2 = json_decode($result2,true);
+
+    $_SESSION["productSearchResult"] = $array;
+    $_SESSION["vendorSearchResult"] = $array2;
+
+    header("location: vendor-product-search.php");
+    // $search = isset($_POST['search']) ? $_POST['search'] : null;
+
+    // header("location: vendor-product-search.php?&search=$search"); 
+// 3-19-24 raymart added action for search bar ven-pro-search.php
+?>
\ No newline at end of file
diff --git a/admin/vendor-product-search.php b/admin/vendor-product-search.php
new file mode 100644
index 0000000..b39152a
--- /dev/null
+++ b/admin/vendor-product-search.php
@@ -0,0 +1,865 @@
+<?php
+include "../functions.php";
+
+$_SESSION["url"] = $_SERVER['REQUEST_URI'];
+if ($_SESSION["userId"] <> "") {
+    $_SESSION["isLoggedIn"] = true;
+    $customer_data = getCustomerbyLoginId($_SESSION["userId"]);
+} else {
+    $_SESSION["isLoggedIn"] = false;
+    header("location: login.php");
+    exit();
+}
+if ($_SESSION["user_type"] != "admin") {
+    header("location: login.php?alert=Only admins allowed here!");
+}
+
+$productSearchResult = $_SESSION["productSearchResult"];
+$vendorSearchResult = $_SESSION["vendorSearchResult"];
+?>
+
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+
+<head>
+    <!-- <style>
+        .pagination {
+            display: flex;
+            list-style: none;
+            padding: 0;
+            margin: 0;
+            justify-content: center;
+        }
+
+        .pagination a {
+            color: #333;
+            text-decoration: none;
+            padding: 5px 10px;
+            border: 1px solid #ccc;
+            margin: 0 5px;
+            border-radius: 4px;
+        }
+
+        .pagination a.active {
+            background-color: #007bff;
+            color: #fff;
+        }
+    </style> -->
+
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="oBanana B2B - Admin Dashboard">
+
+    <title>oBanana B2B - Admin Dashboard</title>
+
+    <!-- GOOGLE FONTS -->
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@200;300;400;500;600;700;800&family=Poppins:wght@300;400;500;600;700;800;900&family=Roboto:wght@400;500;700;900&display=swap" rel="stylesheet">
+
+    <link href="https://cdn.materialdesignicons.com/4.4.95/css/materialdesignicons.min.css" rel="stylesheet" />
+
+    <!-- PLUGINS CSS STYLE -->
+    <link href="assets/plugins/simplebar/simplebar.css" rel="stylesheet" />
+
+    <!-- Ekka CSS -->
+    <link id="ekka-css" rel="stylesheet" href="assets/css/ekka.css" />
+
+    <!-- FAVICON -->
+    <!-- <link href="assets/img/favicon.png" rel="shortcut icon" /> -->
+    <link href="assets/img/favicon/favicon.png" rel="shortcut icon" />
+
+    <!-- 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" />
+
+
+</head>
+
+<body class="ec-header-fixed ec-sidebar-fixed ec-sidebar-dark ec-header-light" id="body">
+
+    <!-- WRAPPER -->
+    <div class="wrapper">
+
+        <!-- LEFT MAIN SIDEBAR -->
+        <?php include 'left-main-sidebar.php' ?>
+
+        <!-- PAGE WRAPPER -->
+        <div class="ec-page-wrapper">
+
+            <!-- Header -->
+            <header class="ec-main-header" id="header">
+                <nav class="navbar navbar-static-top navbar-expand-lg">
+                    <!-- Sidebar toggle button -->
+                    <button id="sidebar-toggler" class="sidebar-toggle"></button>
+                    <!-- search form -->
+                    
+                    <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
+                    <div class="search-form d-lg-inline-block">
+                        <form action="vendor-product-search-action.php">
+                            <div class="input-group">
+                                <input type="text" name="search" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
+                                <button class="submit" type="submit" id="search-btn" class="btn btn-flat">
+                                    <i class="mdi mdi-magnify" style="font-size:20px; color:gray; padding-right:8px;"></i>
+                                </button>
+                            </div>
+                        </form>
+                        <div id="search-results-container">
+                            <ul id="search-results"></ul>
+                        </div>
+                    </div>
+                    <!-- 03-07-2024 Stacy & Raymart modified this block of code -->
+
+                    <!-- navbar right -->
+                    <div class="navbar-right">
+                        <ul class="nav navbar-nav">
+                            <!-- User Account -->
+                            <li class="dropdown user-menu">
+                                <button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown" aria-expanded="false">
+                                    <img src="assets/img/user/user.png" class="user-image" alt="User Image" />
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
+                                    <!-- User image -->
+                                    <li class="dropdown-header">
+                                        <img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
+                                        <div class="d-inline-block">
+                                            John Deo <small class="pt-1">john.example@gmail.com</small>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <a href="user-profile.html">
+                                            <i class="mdi mdi-account"></i> My Profile
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-email"></i> Message
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
+                                    </li>
+                                    <li class="right-sidebar-in">
+                                        <a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
+                                    </li>
+                                    <li class="dropdown-footer">
+                                        <a href="/logout.php"> <i class="mdi mdi-logout"></i> Log Out </a>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li class="dropdown notifications-menu custom-dropdown">
+                                <button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
+                                    <i class="mdi mdi-bell-outline"></i>
+                                </button>
+
+                                <div class="card card-default dropdown-notify dropdown-menu-right mb-0">
+                                    <div class="card-header card-header-border-bottom px-3">
+                                        <h2>Notifications</h2>
+                                    </div>
+
+                                    <div class="card-body px-0 py-0">
+                                        <ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myTab" role="tablist">
+                                            <li class="nav-item mx-3 my-0 py-0">
+                                                <a href="#" class="nav-link active pb-3" id="home2-tab" data-bs-toggle="tab" data-bs-target="#home2" role="tab" aria-controls="home2" aria-selected="true">All (10)</a>
+                                            </li>
+
+                                            <li class="nav-item mx-3 my-0 py-0">
+                                                <a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab" data-bs-target="#profile2" role="tab" aria-controls="profile2" aria-selected="false">Msgs (5)</a>
+                                            </li>
+
+                                            <li class="nav-item mx-3 my-0 py-0">
+                                                <a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab" data-bs-target="#contact2" role="tab" aria-controls="contact2" aria-selected="false">Others (5)</a>
+                                            </li>
+                                        </ul>
+
+                                        <div class="tab-content" id="myTabContent3">
+                                            <div class="tab-pane fade show active" id="home2" role="tabpanel">
+                                                <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Nitin</h4>
+                                                                    <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                                        consectetur adipisicing elit. Nam itaque
+                                                                        doloremque odio, eligendi delectus vitae.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 30 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification media-active">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
+                                                                <span class="status active"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Lovina</h4>
+                                                                    <p class="last-msg">Donec mattis augue a nisl
+                                                                        consequat, nec imperdiet ex rutrum. Fusce et
+                                                                        vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-white">
+                                                                        <i class="mdi mdi-clock-outline"></i> Just
+                                                                        now...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Crinali</h4>
+                                                                    <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                                        consectetur adipisicing elit. Nam itaque
+                                                                        doloremque odio, eligendi delectus vitae.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification event-active">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
+                                                                <i class="mdi mdi-calendar-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Upcomming event added</h4>
+                                                                    <p class="last-msg font-size-14">03/Jan/2020 (1pm -
+                                                                        2pm)</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 10 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
+                                                                <i class="mdi mdi-chart-areaspline font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Yearly Sales report</h4>
+                                                                    <p class="last-msg font-size-14">Lorem ipsum dolor
+                                                                        sit, amet consectetur adipisicing elit. Nam
+                                                                        itaque doloremque odio, eligendi delectus vitae.
+                                                                    </p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
+                                                                <i class="mdi mdi-account-multiple-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">New request</h4>
+                                                                    <p class="last-msg font-size-14">Add Dany Jones as
+                                                                        your contact consequat nec imperdiet ex rutrum.
+                                                                        Fusce et vehicula enim. Sed in enim.</p>
+
+                                                                    <span class="my-1 btn btn-sm btn-success">Accept</span>
+                                                                    <span class="my-1 btn btn-sm btn-secondary">Delete</span>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary d-block">
+                                                                        <i class="mdi mdi-clock-outline"></i> 5 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
+                                                                <i class="mdi mdi-server-network-off font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Server overloaded</h4>
+                                                                    <p class="last-msg font-size-14">Donec mattis augue
+                                                                        a nisl consequat, nec imperdiet ex rutrum. Fusce
+                                                                        et vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 30 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
+                                                                <i class="mdi mdi-playlist-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Task complete</h4>
+                                                                    <p class="last-msg font-size-14">Nam ut nisi erat.
+                                                                        Ut quis tortor varius, hendrerit arcu quis,
+                                                                        congue nisl. In scelerisque, sem ut ve.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 2 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                </ul>
+                                            </div>
+
+                                            <div class="tab-pane fade" id="profile2" role="tabpanel">
+                                                <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u6.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Hardiko</h4>
+                                                                    <p class="last-msg">Donec mattis augue a nisl
+                                                                        consequat, nec imperdiet ex rutrum. Fusce et
+                                                                        vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u7.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Browin</h4>
+                                                                    <p class="last-msg">Nam ut nisi erat. Ut quis tortor
+                                                                        varius, hendrerit arcu quis, congue nisl. In
+                                                                        scelerisque, sem ut ve.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification media-active">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
+                                                                <span class="status active"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">jenelia</h4>
+                                                                    <p class="last-msg">Donec mattis augue a nisl
+                                                                        consequat, nec imperdiet ex rutrum. Fusce et
+                                                                        vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-white">
+                                                                        <i class="mdi mdi-clock-outline"></i> Just
+                                                                        now...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Bhavlio</h4>
+                                                                    <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                                        consectetur adipisicing elit. Nam itaque
+                                                                        doloremque odio, eligendi delectus vitae.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+                                                            <div class="position-relative mr-3">
+                                                                <img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
+                                                                <span class="status away"></span>
+                                                            </div>
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Browini</h4>
+                                                                    <p class="last-msg">Lorem ipsum dolor sit, amet
+                                                                        consectetur adipisicing elit. Nam itaque
+                                                                        doloremque odio, eligendi delectus vitae.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                </ul>
+                                            </div>
+
+                                            <div class="tab-pane fade" id="contact2" role="tabpanel">
+                                                <ul class="list-unstyled" data-simplebar style="height: 360px">
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification event-active">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
+                                                                <i class="mdi mdi-calendar-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Upcomming event added</h4>
+                                                                    <p class="last-msg font-size-14">03/Jan/2020 (1pm -
+                                                                        2pm)</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 10 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
+                                                                <i class="mdi mdi-chart-areaspline font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">New Sales report</h4>
+                                                                    <p class="last-msg font-size-14">Lorem ipsum dolor
+                                                                        sit, amet consectetur adipisicing elit. Nam
+                                                                        itaque doloremque odio, eligendi delectus vitae.
+                                                                    </p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 1 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
+                                                                <i class="mdi mdi-account-multiple-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">New Request</h4>
+                                                                    <p class="last-msg font-size-14">Add Dany Jones as
+                                                                        your contact consequat nec imperdiet ex rutrum.
+                                                                        Fusce et vehicula enim. Sed in enim.</p>
+
+                                                                    <span class="my-1 btn btn-sm btn-success">Accept</span>
+                                                                    <span class="my-1 btn btn-sm btn-secondary">Delete</span>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary d-block">
+                                                                        <i class="mdi mdi-clock-outline"></i> 5 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
+                                                                <i class="mdi mdi-server-network-off font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">Server overloaded</h4>
+                                                                    <p class="last-msg font-size-14">Donec mattis augue
+                                                                        a nisl consequat, nec imperdiet ex rutrum. Fusce
+                                                                        et vehicula enim. Sed in enim eu odio vehic.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 30 min
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+
+                                                    <li>
+                                                        <a href="javscript:void(0)" class="media media-message media-notification">
+
+                                                            <div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
+                                                                <i class="mdi mdi-playlist-check font-size-20"></i>
+                                                            </div>
+
+                                                            <div class="media-body d-flex justify-content-between">
+                                                                <div class="message-contents">
+                                                                    <h4 class="title">New Task complete</h4>
+                                                                    <p class="last-msg font-size-14">Nam ut nisi erat.
+                                                                        Ut quis tortor varius, hendrerit arcu quis,
+                                                                        congue nisl. In scelerisque, sem ut ve.</p>
+
+                                                                    <span class="font-size-12 font-weight-medium text-secondary">
+                                                                        <i class="mdi mdi-clock-outline"></i> 2 hrs
+                                                                        ago...
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </a>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <ul class="dropdown-menu dropdown-menu-right d-none">
+                                    <li class="dropdown-header">You have 5 notifications</li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-account-plus"></i> New user registered
+                                            <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-account-remove"></i> User deleted
+                                            <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 07 AM</span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-chart-areaspline"></i> Sales report is ready
+                                            <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 12 PM</span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-account-supervisor"></i> New client
+                                            <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="#">
+                                            <i class="mdi mdi-server-network-off"></i> Server overloaded
+                                            <span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 05 AM</span>
+                                        </a>
+                                    </li>
+                                    <li class="dropdown-footer">
+                                        <a class="text-center" href="#"> View All </a>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li class="right-sidebar-in right-sidebar-2-menu">
+                                <i class="mdi mdi-settings-outline mdi-spin"></i>
+                            </li>
+                        </ul>
+                    </div>
+                </nav>
+            </header>
+
+
+       <!-- 3-19-24 raymart added vendor search -->
+                <?php if (!empty($vendorSearchResult['results'])) : ?>
+                    <div class="shop-pro-content" style="margin-bottom:40px; margin-right: 2%; margin-left: 2%;">
+                        <div class="ec-product-inner">
+                            <h5 class="ec-pro-title" style="margin-top: 25px; margin-left: 5%; font-size: 25px;">Vendor Search Results</h5>
+                            <div class="row mt-4">
+                                <?php
+                                $count = 0; 
+                                foreach ($vendorSearchResult['results'] as $vendor) {
+                                    if ($count < 2) {
+                                ?>
+                                        <div class="col-md-12">
+                                            <div class="card" style="margin:5px">
+                                                <div class="card-body">
+                                                    <div class="vendor-info" style="display: flex; align-items: center;">
+                                                        <div class="ec-catalog-vendor" style="display: inline-block;">
+                                                        <a href="vendor-profile.php?id=<?php echo $vendor["_id"] ?>">
+                                                            <?php if (isset($vendor['vendor_image'])) : ?>
+                                                                <img src="<?php echo $vendor['vendor_image']; ?>" alt="<?php echo $vendor['user_login']; ?>" class="vendor-image" style="max-width: 100px; max-height: 100px;">
+                                                            <?php else : ?>
+                                                                <img src="https://api.obanana.com/images/storage/web_images/1708588564876-viber_image_2024-02-22_15-54-42-498.png" class="vendor-image-placeholder" style="max-width: 100px; max-height: 100px;">
+                                                            <?php endif; ?>
+                                                        </a>
+                                                        </div>
+                                                        <div class="vendor-details" style="display:inline-block;">
+                                                                <h6 class="ec-pro-title" style="padding:0 30px;font-family: Poppins, sans-serif; text-decoration: none; color: #777;white-space: nowrap;text-overflow: ellipsis;display: block;font-size: 16px;font-weight: 400;">
+                                                                <a href="vendor-profile.php?id=<?php echo $vendor["_id"] ?>">
+                                                                    <?php echo $vendor['user_login']; ?>
+                                                                </a>
+                                                                </h6>
+                                                        </div>
+                                                        <div class="card text-center" style="margin-left: auto; margin-right: 5px;">
+                                                            <div class="card-body">
+                                                                <h6>Seller Products</h6>
+                                                                <?php
+                                                                $products = productList();
+                                                                $vendorId = $vendor['_id'];
+                                                                $product = array_filter($products, function ($var) use ($vendorId) {
+                                                                    return ($var['vendor_api_id'] == $vendorId);
+                                                                });
+                                                                ?>
+                                                                <p><?php echo count($product); ?></p>
+                                                            </div>
+                                                        </div>
+                                                        <div class="card text-center" style="margin-left: 5px; margin-right: 5px;">
+                                                            <div class="card-body">
+                                                                <h6>Seller since</h6>
+                                                                <p><?php echo $vendor['date_registered']; ?></p>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                <?php
+                                    }
+                                    $count++; 
+                                }
+                                ?>
+                            </div>
+                        </div>
+                    </div>
+                <?php endif; ?>
+                    <!-- vendor search end -->
+                    
+                    <!-- 3-19-24 raymart added Shop content Start -->
+                <div class="shop-pro-content" style="margin-right: 2%; margin-left: 2%;">
+                    <div class="shop-pro-inner list-view">
+                        <div class="row">
+                            <?php
+                            // $productSearchResult = [];
+                            // foreach ($productSearchResult['results'] as $product => $productListVendor) {
+                            //     echo "$product .":" . $productListVendor";
+                            //         $vendorOfProduct = getVendorbyId($product['vendor_api_id']);
+
+                                $products = productListVendor($vendorId);
+                                $totalProducts = count($products);
+
+
+                                for ($i = 0; $i <= $totalProducts - 1; $i++) {
+                                    $product = $products[$i];
+                                ?>
+                                    <div class="col-lg-3 col-md-4 col-sm-6">
+                                        <div class="card-wrapper">
+                                            <div class="card-container">
+                                                <div class="card-top">
+                                                    <div class="image-container" style="height: 300px;"> <!-- Adjust the height as needed -->
+                                                    <?php
+                                                    if (isset($product['images'])) {
+                                                        $image_urls = explode(',', $product['images']);
+                                                        if (!empty($image_urls)) {
+                                                            $first_image_url = trim($image_urls[0]);
+                                                    ?>
+                                                            <img class="img-fluid" src="<?php echo $first_image_url; ?>" alt="edit" style="object-fit: cover; width: 100%; height: 100%;"/>
+                                                        <?php
+                                                        }
+                                                    } else {
+                                                        ?>
+                                                        <img class="img-fluid rounded-circle" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="edit" />
+                                                    <?php
+                                                    }
+                                                    ?>
+                                                    </div>
+                                                </div>
+                                                <div class="card-bottom">
+                                                    <h3><?php echo $product['product_name']; ?></h3>
+                                                    <p>₱<?php echo $product['regular_price']; ?></p>
+                                                </div>
+                                                <div class="card-action">
+                                                    <div class="card-edit" onclick="editProduct('<?php echo $product['_id'] ?>');"><i class="mdi mdi-circle-edit-outline"></i></div>
+                                                    <div class="card-preview"><i class="mdi mdi-eye-outline"></i></div>
+                                                    <div class="card-remove" onclick="deleteProd('<?php echo $product['_id'] ?>');"><i class="mdi mdi mdi-delete-outline"></i></div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                <?php
+                                }
+                                ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                    <!--Shop content End -->
+              
+            <!-- 3-19-24 raymart added function for delete & edit -->
+    <script>
+
+        var sessionToken = '<?php echo isset($_SESSION["token"]) ? $_SESSION["token"] : ""; ?>';
+        var email = '<?php echo isset($_SESSION["email"]) ? $_SESSION["email"] : ""; ?>';
+        var password = '<?php echo isset($_SESSION["password"]) ? $_SESSION["password"] : ""; ?>';
+
+                function editProduct(productId) {
+                console.log("Session Token:", sessionToken);
+                login(email, password, function() {
+                    // Removed the call to updateSessionToken
+                    window.open("product-edit.php?id=" + productId, "_self");
+                });
+            }
+
+            function deleteProd(productId) {
+                let text = "Please confirm delete action!\nClick OK or Cancel button.";
+                if (confirm(text) == true) {
+                    window.open("vendor-delete-action1.php?id=" + productId, "_self");
+                }
+            }
+
+            function login(username, password, callback) {
+                fetch("https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/login", {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/json",
+                            "X-Api-Key": "{{apiKey}}"
+                        },
+                        body: JSON.stringify({
+                            username: username,
+                            password: password
+                        })
+                    })
+                    .then(response => {
+                        if (response.ok) {
+                            return response.json();
+                        } else {
+                            throw new Error("Unable to login");
+                        }
+                    })
+                    .then(data => {
+                        // Update the session token on the server side
+                        fetch("update-token-session.php", {
+                            method: "POST",
+                            headers: {
+                                "Content-Type": "application/json"
+                            },
+                            body: JSON.stringify({
+                                token: data.token
+                            })
+                        })
+                        .then(response => response.json())
+                        .then(result => {
+                            if (result.status === 'success') {
+                                // Update the session token in the client-side variable
+                                sessionToken = data.token;
+                                console.log("New Token:", sessionToken);
+                                callback();
+                            } else {
+                                throw new Error("Unable to update session token");
+                            }
+                        });
+                    })
+                    .catch(error => {
+                        console.error("Error:", error.message);
+                    });
+                }
+
+    </script>
+            <!-- 3-19-24 raymart added function for delete & edit -->
+                        
+
+         <!-- Common Javascript -->
+        <script src="assets/plugins/jquery/jquery-3.5.1.min.js"></script>
+        <script src="assets/js/bootstrap.bundle.min.js"></script>
+        <script src="assets/plugins/simplebar/simplebar.min.js"></script>
+        <script src="assets/plugins/jquery-zoom/jquery.zoom.min.js"></script>
+        <script src="assets/plugins/slick/slick.min.js"></script>
+
+        <!-- Option Switcher -->
+        <script src="assets/plugins/options-sidebar/optionswitcher.js"></script>
+
+        <!-- Ekka Custom -->
+        <script src="assets/js/ekka.js"></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/catalog-single-vendor-action.php b/catalog-single-vendor-action.php
new file mode 100644
index 0000000..d9812af
--- /dev/null
+++ b/catalog-single-vendor-action.php
@@ -0,0 +1,30 @@
+<?php 
+// 03-14-2024 Raymart & stacy Search Filter  Action
+
+$categories = isset($_POST['category']) ? $_POST['category'] : array();
+$vendorId= $_POST['vendorId'];
+$categoryFinal = null;
+$count=0;
+
+foreach ($categories as $category) {
+    // Perform checks or actions for each category
+    // For example:
+    $categoriesCopy = $categoryFinal;
+    $categoryFinal =$categoryFinal!== null? $categoriesCopy . '&category['.$count.']='.$category:$categoriesCopy . 'category['.$count.']='.$category;
+    $count+=1;
+   
+
+    echo   $categoryFinal;
+    // You can add your logic here
+}
+$minPrice = isset($_POST['minPrice']) ? $_POST['minPrice'] : null;
+$maxPrice = isset($_POST['maxPrice']) ? $_POST['maxPrice'] : null;
+if(isset($categoryFinal)){
+    header("location: catalog-single-vendor.php?id=$vendorId&$categoryFinal&minPrice=$minPrice&maxPrice=$maxPrice"); 
+
+}else{
+   
+header("location: catalog-single-vendor.php?id=$vendorId&minPrice=$minPrice&maxPrice=$maxPrice"); 
+
+}
+// 03-14-2024 Raymart & stacy Search Filter  Action
diff --git a/catalog-single-vendor.php b/catalog-single-vendor.php
index 4407782..b158760 100644
--- a/catalog-single-vendor.php
+++ b/catalog-single-vendor.php
@@ -11,6 +11,89 @@ if ($_SESSION["userId"] <> "") {
 } else {
     $_SESSION["isLoggedIn"] = false;
 }
+$products = productListVendor($_GET["id"]);
+
+$filteredProducts = [];
+
+if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['category'])) {
+    $filteredProducts = [];
+    $minPrice = isset($_GET['minPrice']) && $_GET['minPrice'] !== '' ? floatval($_GET['minPrice']) : null;
+    $maxPrice = isset($_GET['maxPrice']) && $_GET['maxPrice'] !== '' ? floatval($_GET['maxPrice']) : null;
+
+    // echo "Min Price: " . ($minPrice !== null ? $minPrice : "null") . "<br>";
+    // echo "Max Price: " . ($maxPrice !== null ? $maxPrice : "null") . "<br>";
+
+    $selectedCategories = isset($_GET['category']) ? $_GET['category'] : [];
+  
+    if (!empty($selectedCategories) && (($minPrice == null) && ($maxPrice == null))) {
+        // var_dump("filtering categories without price");   
+        foreach ($selectedCategories as $selectedCategory) {
+            $category = strtolower(trim($selectedCategory));
+            foreach ($products as $result) {
+                $product = $result;
+                
+                $productCategory = strtolower(trim($product['product_category']));
+              
+                if (
+                    $productCategory == $category
+                ) {
+                    $filteredProducts[] = $result;
+                } 
+            }
+        }
+    } elseif (!empty($selectedCategories) && (!empty($minPrice) || !empty($maxPrice))) {
+        // var_dump("filtering categories and price"); 
+        if ($minPrice === null) {
+            $minPrice = 0;
+        }
+        if ($maxPrice === null) {
+            $maxPrice = PHP_FLOAT_MAX;
+        }
+        foreach ($selectedCategories as $selectedCategory) {
+            $category = strtolower(trim($selectedCategory));
+            foreach ($products as $result) {
+                $product = $result;
+                $productPrice = isset($product['sale_price']) ? $product['sale_price'] : $product['regular_price'];
+                $productCategory = strtolower(trim($product['product_category']));
+                if (
+                    $productCategory = $category && (($productPrice >= $minPrice) &&
+                    ($productPrice <= $maxPrice))
+                ) {
+                    $filteredProducts[] = $result;
+                } 
+            }
+        }
+    }
+     else {
+        foreach ($products as $result) {
+        // var_dump("filtering"); 
+            $product = $result;
+            $productPrice = isset($product['sale_price']) ? $product['sale_price'] : $product['regular_price'];
+        // var_dump( $minPrice); 
+        // var_dump( $productPrice); 
+        // var_dump( $productPrice >= $minPrice); 
+
+        
+
+            if ($minPrice === null) {
+                $minPrice = 0;
+            }
+
+            if ($maxPrice === null) {
+                $maxPrice = PHP_FLOAT_MAX;
+             }
+            if (($minPrice === null || $productPrice >= $minPrice) &&
+                ($maxPrice === null || $productPrice <= $maxPrice)
+            ) {
+                $filteredProducts[] = $result;
+        // var_dump("filtering heree"); 
+
+            }
+        }
+    }
+} else {
+    $filteredProducts = $products;
+}
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -268,7 +351,6 @@ if ($_SESSION["userId"] <> "") {
                                         <a href="vendor-profile.html">
                                         <h6>Seller Products</h6>
                                         <?php
-                                        $products = productListVendor($_GET["id"]);
                                         ?>
                                         </a>
                                         <p><?php echo count($products) ?> Products</p>
@@ -334,7 +416,7 @@ if ($_SESSION["userId"] <> "") {
                             <div class="row">
                             <?php
                                 //var_dump($products);
-                               foreach ($products as $product){
+                               foreach ($filteredProducts as $product){
                                     
                                     // $vendorOfProduct = getVendorbyId($product['vendor_api_id']);
                                     // $pid = $i;
@@ -358,7 +440,7 @@ if ($_SESSION["userId"] <> "") {
                                                             }
                                                         } else {
                                                             ?>
-                                                            <img class="main-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                            <img class="main-image" src="https://api.obanana.com/images/storage/web_images/1710214273217-no_image.png" alt="edit" />
                                                         <?php
                                                         }
                                                         ?>
@@ -489,64 +571,83 @@ if ($_SESSION["userId"] <> "") {
 
                         <!-- Sidebar Category Block -->
                         <div class="ec-sidebar-block">
-                            <div class="ec-sb-title">
-                                <h3 class="ec-sidebar-title">Category</h3>
-                            </div>
-                            <div class="ec-sb-block-content">
-                                <ul>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" checked /> <a href="#">clothes</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" /> <a href="#">Bags</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" /> <a href="#">Shoes</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" /> <a href="#">cosmetics</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" /> <a href="#">electrics</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item">
-                                            <input type="checkbox" /> <a href="#">phone</a><span class="checked"></span>
-                                        </div>
-                                    </li>
-                                    <li id="ec-more-toggle-content" style="padding: 0; display: none;">
+                                <div class="ec-sb-title">
+                                    <h3 class="ec-sidebar-title">Category</h3>
+                                </div>
+                                <div class="ec-sb-block-content">
+                                    <form method="POST" action="catalog-single-vendor-action.php">
                                         <ul>
+                                        <input type="hidden" name="vendorId" value="<?php echo $_GET["id"]?>"/>
+
                                             <li>
                                                 <div class="ec-sidebar-block-item">
-                                                    <input type="checkbox" /> <a href="#">Watch</a><span class="checked"></span>
+                                                    <input type="checkbox" name="category[]" value="Electronics" <?php echo (isset($_POST['category']) && in_array('Electronics', $_POST['category'])) || (isset($_GET['category']) && in_array('Electronics', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Electronics</a><span class="checked"></span>
                                                 </div>
                                             </li>
                                             <li>
                                                 <div class="ec-sidebar-block-item">
-                                                    <input type="checkbox" /> <a href="#">Cap</a><span class="checked"></span>
+                                                    <input type="checkbox" name="category[]" value="Solar" <?php echo (isset($_POST['category']) && in_array('Solar', $_POST['category'])) || (isset($_GET['category']) && in_array('Solar', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Solar</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="E-bike" <?php echo (isset($_POST['category']) && in_array('E-bike', $_POST['category'])) || (isset($_GET['category']) && in_array('E-bike', $_GET['category'])) ? 'checked' : ''; ?> /> <a>E-bike</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="E-vehicle" <?php echo (isset($_POST['category']) && in_array('E-vehicle', $_POST['category'])) || (isset($_GET['category']) && in_array('E-vehicle', $_GET['category'])) ? 'checked' : ''; ?> /> <a>E-vehicle</a><span class="checked"></span>
+
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="Appliance" <?php echo (isset($_POST['category']) && in_array('Appliance', $_POST['category'])) || (isset($_GET['category']) && in_array('Appliance', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Appliance</a><span class="checked"></span>
+
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="Smart Home" <?php echo (isset($_POST['category']) && in_array('Smart Home', $_POST['category'])) || (isset($_GET['category']) && in_array('Smart Home', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Smart Home</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="Home" <?php echo (isset($_POST['category']) && in_array('Home', $_POST['category'])) || (isset($_GET['category']) && in_array('Home', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Home</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="Apparel" <?php echo (isset($_POST['category']) && in_array('Apparel', $_POST['category'])) || (isset($_GET['category']) && in_array('Apparel', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Apparel</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <div class="ec-sidebar-block-item">
+                                                    <input type="checkbox" name="category[]" value="Heavy Equipment" <?php echo (isset($_POST['category']) && in_array('Heavy Equipment', $_POST['category'])) || (isset($_GET['category']) && in_array('Heavy Equipment', $_GET['category'])) ? 'checked' : ''; ?> /> <a>Heavy Equipment</a><span class="checked"></span>
+                                                </div>
+                                            </li>
+                                            <li>
+                                                <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" 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>
-                                    </li>
-                                    <li>
-                                        <div class="ec-sidebar-block-item ec-more-toggle">
-                                            <span class="checked"></span><span id="ec-more-toggle">More
-                                                Categories</span>
-                                        </div>
-                                    </li>
-                                </ul>
+                                        <!-- <button type="submit">Apply</button> -->
+                                    </form>
+                                </div>
                             </div>
-                        </div>
                         <!-- Sidebar Size Block -->
                         <!-- <div class="ec-sidebar-block">
                             <div class="ec-sb-title">
diff --git a/checkouttest.php b/checkouttest.php
index 0aa9c45..1b805a6 100644
--- a/checkouttest.php
+++ b/checkouttest.php
@@ -993,13 +993,13 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
                                                     </div>
                                                     <div class="ec-pro-content">
                                                         <h5 class="ec-pro-title"><a href="product-left-sidebar.php?id=<?php echo $item['product']['product_id']; ?>"><?php echo $item['product']['name']; ?></a></h5>
-                                                        <div class="ec-pro-rating">
+                                                        <!-- <div class="ec-pro-rating">
                                                             <i class="ecicon eci-star fill"></i>
                                                             <i class="ecicon eci-star fill"></i>
                                                             <i class="ecicon eci-star fill"></i>
                                                             <i class="ecicon eci-star fill"></i>
                                                             <i class="ecicon eci-star"></i>
-                                                        </div>
+                                                        </div> -->
                                                         <span class="ec-price">
                                                             <span class="new-price"><?php echo $item['price']; ?> x <?php echo $item['quantity']; ?></span>
                                                         </span>