From 3e8e62a13143d8852cdfc63eae22d10e211ac9a5 Mon Sep 17 00:00:00 2001
From: Jun Barroga <jun.barroga@obanana.com>
Date: Tue, 27 Feb 2024 08:56:59 +0800
Subject: [PATCH 1/2] Vendor Page Modifications

---
 admin/config.php                        |   2 +-
 admin/login.php                         |   2 +-
 admin/vendor-card.php                   | 340 ++++++++++++----------
 assets/css/style.css                    |   2 +-
 checkouttest.php                        |   4 +-
 functions.php                           |  10 +-
 vendor-dashboard-orders-edit-action.php |   6 +
 vendor-dashboard-orders-edit.php        |   4 +
 vendor-settings.php                     | 367 +++++++++++++++---------
 9 files changed, 444 insertions(+), 293 deletions(-)

diff --git a/admin/config.php b/admin/config.php
index 57d9763..7f523ab 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -1,6 +1,6 @@
 <?php
 $_SESSION["is_test"]=true;
-$_SESSION["test_email_rcpt"]="stacyjoycemapano@gmail.com";
+$_SESSION["test_email_rcpt"]="junjihadbarroga@gmail.com";
 $_SESSION["sales_email"]="stacyjoycemapano@gmail.com";
 $_SESSION["data_endpoint"]="api.obanana.shop";
 if ($_SESSION["is_test"]){
diff --git a/admin/login.php b/admin/login.php
index a1883c5..41be8d6 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -81,7 +81,7 @@ if ($_SESSION["isLoggedIn"] == true and $_SESSION["user_type"] == "admin"){
                                     <?php
                                 }
                             ?>
-                            <form action="/login_action.php" method="post">
+                            <form action="../login_action.php" method="post">
                                 <div class="mb-3 mt-3">
                                     <label for="email">Email:</label>
                                     <input type="email" class="form-control" id="email" placeholder="Enter email" name="name">
diff --git a/admin/vendor-card.php b/admin/vendor-card.php
index 111c49c..a08d6b5 100644
--- a/admin/vendor-card.php
+++ b/admin/vendor-card.php
@@ -852,168 +852,212 @@ $products = productList();
                                     </div>
                                 </div>
                                 <script>
-function deleteVendor(vendorId){
+                                        function deleteVendor(vendorId){
                                         let text = "Please confirm delete action!\nClick OK or Cancel button.";
                                         if (confirm(text) == true) {
                                             window.open("vendor-delete-action.php?id=" + vendorId, "_self");
                                         }
                                     }
                                     function uploadFile(vendorId) {
-                                        validateEmail(vendorId).then(isEmailAvailable => {
-                                            if (!isEmailAvailable) {
-                                                // Display an error message and prevent form submission
-                                                $('#email-error-message-' + vendorId).text('Email is already in use').show();
-                                            } else {
-                                                // Proceed with form submission
-                                                $('#email-error-message-' + vendorId).text('').hide();
+    const originalEmail = document.getElementById('email-' + vendorId).defaultValue;
+    const updatedEmail = document.getElementById('email-' + vendorId).value;
+    const isEmailModified = originalEmail !== updatedEmail;
 
-                                                // Rest of the code for file upload and API request
-                                                var fileInput = document.getElementById('fileInput' + vendorId);
-                                                var file = fileInput.files[0];
+    if (isEmailModified) {
+        validateEmail(vendorId).then(isEmailAvailable => {
+            if (!isEmailAvailable) {
+                $('#email-error-message-' + vendorId).text('Email is already in use').show();
+            } else {
+                $('#email-error-message-' + vendorId).text('').hide();
 
-                                                const updatedUser = document.getElementById('user_login-' + vendorId).value;
-                                                const firstName = document.getElementById('firstName-' + vendorId).value;
-                                                const lastName = document.getElementById('lastName-' + vendorId).value;
-                                                const updatedEmail = document.getElementById('email-' + vendorId).value;
-                                                const phone = document.getElementById('phone-' + vendorId).value;
-                                                const description = document.getElementById('description-' + vendorId).value;
-                                                const status = document.getElementById('status-' + vendorId).value;
-                                                const updatedAddress1 = document.getElementById('address_1-' + vendorId).value;
-                                                const updatedAddress2 = document.getElementById('address_2-' + vendorId).value;
-                                                const barangay = document.getElementById('barangay-' + vendorId).value;
-                                                const city = document.getElementById('city-' + vendorId).value;
-                                                const province = document.getElementById('province-' + vendorId).value;
-                                                const country = document.getElementById('country-' + vendorId).value;
+                var fileInput = document.getElementById('fileInput' + vendorId);
+                var file = fileInput.files[0];
 
-                                                // Check if a file is selected for upload
-                                                if (file) {
-                                                    var formData = new FormData();
-                                                    formData.append('image_id', vendorId);
-                                                    formData.append('category', 'vendor');
-                                                    formData.append('image', file);
+                const updatedUser = document.getElementById('user_login-' + vendorId).value;
+                const firstName = document.getElementById('firstName-' + vendorId).value;
+                const lastName = document.getElementById('lastName-' + vendorId).value;
+                const phone = document.getElementById('phone-' + vendorId).value;
+                const description = document.getElementById('description-' + vendorId).value;
+                const status = document.getElementById('status-' + vendorId).value;
+                const updatedAddress1 = document.getElementById('address_1-' + vendorId).value;
+                const updatedAddress2 = document.getElementById('address_2-' + vendorId).value;
+                const barangay = document.getElementById('barangay-' + vendorId).value;
+                const city = document.getElementById('city-' + vendorId).value;
+                const province = document.getElementById('province-' + vendorId).value;
+                const country = document.getElementById('country-' + vendorId).value;
 
-                                                    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
-                                                            method: 'POST',
-                                                            body: formData
-                                                        })
-                                                        .then(response => {
-                                                            if (response.ok) {
-                                                                return response.json();
-                                                            } else {
-                                                                console.error('File upload failed');
-                                                                throw new Error('File upload failed');
-                                                            }
-                                                        })
-                                                        .then(result => {
-                                                            const filename = result.filename;
+                var formData = new FormData();
+                formData.append('image_id', vendorId);
+                formData.append('category', 'vendor');
+                formData.append('image', file); // Include the file data in the form data
 
-                                                            const payload = {
-                                                                vendor_image: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
-                                                                user_login: updatedUser,
-                                                                first_name: firstName,
-                                                                last_name: lastName,
-                                                                user_email: updatedEmail,
-                                                                phone: phone,
-                                                                vendor_description: description,
-                                                                status: status,
-                                                                address: [{
-                                                                    address_1: updatedAddress1,
-                                                                    address_2: updatedAddress2,
-                                                                    barangay: barangay,
-                                                                    city: city,
-                                                                    province: province,
-                                                                    country: country,
-                                                                }]
-                                                            };
+                fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
+                        method: 'POST',
+                        body: formData
+                    })
+                    .then(response => {
+                        if (response.ok) {
+                            return response.json();
+                        } else {
+                            console.error('File upload failed');
+                            throw new Error('File upload failed');
+                        }
+                    })
+                    .then(result => {
+                        const filename = result.filename;
 
-                                                            // Make another API request using the extracted filename
-                                                            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorId, {
-                                                                method: 'PATCH',
-                                                                headers: {
-                                                                    'Content-Type': 'application/json'
-                                                                },
-                                                                body: JSON.stringify(payload)
-                                                            });
-                                                        })
-                                                        .then(secondResponse => {
-                                                            if (secondResponse.ok) {
-                                                                console.log('Second request successful');
-                                                                location.reload();
-                                                            } else {
-                                                                console.error('Second request failed');
-                                                            }
-                                                        })
-                                                        .catch(error => {
-                                                            console.error('Error during fetch:', error);
-                                                        });
-                                                } else {
-                                                    // If no file selected, only update the email
-                                                    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorId, {
-                                                            method: 'PATCH',
-                                                            headers: {
-                                                                'Content-Type': 'application/json'
-                                                            },
-                                                            body: JSON.stringify({
-                                                                user_login: updatedUser,
-                                                                first_name: firstName,
-                                                                last_name: lastName,
-                                                                user_email: updatedEmail,
-                                                                vendor_description: description,
-                                                                status: status,
-                                                                phone: phone,
-                                                                address: [{
-                                                                    address_1: updatedAddress1,
-                                                                    address_2: updatedAddress2,
-                                                                    barangay: barangay,
-                                                                    city: city,
-                                                                    province: province,
-                                                                    country: country,
-                                                                }]
-                                                            })
-                                                        })
-                                                        .then(response => {
-                                                            if (response.ok) {
-                                                                console.log('Email update successful');
-                                                                location.reload();
-                                                            } else {
-                                                                console.error('Email update failed');
-                                                            }
-                                                        })
-                                                        .catch(error => {
-                                                            console.error('Error during fetch:', error);
-                                                        });
-                                                }
-                                            }
-                                        });
-                                    }
+                        const payload = {
+                            vendor_image: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+                            user_login: updatedUser,
+                            first_name: firstName,
+                            last_name: lastName,
+                            user_email: updatedEmail,
+                            phone: phone,
+                            vendor_description: description,
+                            status: status,
+                            address: [{
+                                address_1: updatedAddress1,
+                                address_2: updatedAddress2,
+                                barangay: barangay,
+                                city: city,
+                                province: province,
+                                country: country,
+                            }]
+                        };
+
+                        return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorId, {
+                            method: 'PATCH',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify(payload)
+                        });
+                    })
+                    .then(secondResponse => {
+                        if (secondResponse.ok) {
+                            console.log('Second request successful');
+                            location.reload();
+                        } else {
+                            console.error('Second request failed');
+                        }
+                    })
+                    .catch(error => {
+                        console.error('Error during fetch:', error);
+                    });
+            }
+        });
+    }else {
+    $('#email-error-message-' + vendorId).text('').hide();
+
+    const updatedUser = document.getElementById('user_login-' + vendorId).value;
+    const firstName = document.getElementById('firstName-' + vendorId).value;
+    const lastName = document.getElementById('lastName-' + vendorId).value;
+    const updatedEmail = document.getElementById('email-' + vendorId).value;
+    const phone = document.getElementById('phone-' + vendorId).value;
+    const description = document.getElementById('description-' + vendorId).value;
+    const status = document.getElementById('status-' + vendorId).value;
+    const updatedAddress1 = document.getElementById('address_1-' + vendorId).value;
+    const updatedAddress2 = document.getElementById('address_2-' + vendorId).value;
+    const barangay = document.getElementById('barangay-' + vendorId).value;
+    const city = document.getElementById('city-' + vendorId).value;
+    const province = document.getElementById('province-' + vendorId).value;
+    const country = document.getElementById('country-' + vendorId).value;
+
+    var fileInput = document.getElementById('fileInput' + vendorId);
+    var file = fileInput.files[0];
+
+    var formData = new FormData();
+    formData.append('image_id', vendorId);
+    formData.append('category', 'vendor');
+    formData.append('image', file);
+
+    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
+            method: 'POST',
+            body: formData
+        })
+        .then(response => {
+            if (response.ok) {
+                return response.json();
+            } else {
+                console.error('File upload failed');
+                throw new Error('File upload failed');
+            }
+        })
+        .then(result => {
+            const filename = result.filename;
+
+            const payload = {
+                vendor_image: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+                user_login: updatedUser,
+                first_name: firstName,
+                last_name: lastName,
+                user_email: updatedEmail,
+                phone: phone,
+                vendor_description: description,
+                status: status,
+                address: [{
+                    address_1: updatedAddress1,
+                    address_2: updatedAddress2,
+                    barangay: barangay,
+                    city: city,
+                    province: province,
+                    country: country,
+                }]
+            };
+
+            // Make API request using the extracted filename
+            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorId, {
+                method: 'PATCH',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(payload)
+            });
+        })
+        .then(secondResponse => {
+            if (secondResponse.ok) {
+                console.log('Second request successful');
+                location.reload();
+            } else {
+                console.error('Second request failed');
+            }
+        })
+        .catch(error => {
+            console.error('Error during fetch:', error);
+        });
+}
+
+}
+
+function validateEmail(vendorId) {
+    var emailInput = document.getElementById('email-' + vendorId);
+    var email = emailInput.value;
+
+    if (email.trim() !== '') {
+        return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/search?q=' + email)
+            .then(response => {
+                if (response.ok) {
+                    return response.json();
+                } else {
+                    throw new Error('Failed to check email availability');
+                }
+            })
+            .then(data => {
+                const isEmailAvailable = parseInt(data.results.length) === 0;
+                $('#email-error-message-' + vendorId).text(isEmailAvailable ? '' : 'Email is already in use').show();
+                return isEmailAvailable;
+            })
+            .catch(error => {
+                console.error('Error during email validation:', error);
+                return false;
+            });
+    } else {
+        $('#email-error-message-' + vendorId).text('').hide();
+        return Promise.resolve(true);
+    }
+}
 
-                                    function validateEmail(vendorId) {
-                                        var emailInput = document.getElementById('email-' + vendorId);
-                                        var email = emailInput.value;
 
-                                        if (email.trim() !== '') {
-                                            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/search?q=' + email)
-                                                .then(response => {
-                                                    if (response.ok) {
-                                                        return response.json();
-                                                    } else {
-                                                        throw new Error('Failed to check email availability');
-                                                    }
-                                                })
-                                                .then(data => {
-                                                    const isEmailAvailable = parseInt(data.results.length) === 0;
-                                                    $('#email-error-message-' + vendorId).text(isEmailAvailable ? '' : 'Email is already in use').show();
-                                                    return isEmailAvailable;
-                                                })
-                                                .catch(error => {
-                                                    console.error('Error during email validation:', error);
-                                                    return false;
-                                                });
-                                        } else {
-                                            $('#email-error-message-' + vendorId).text('').hide();
-                                            return Promise.resolve(true);
-                                        }
-                                    }
                                 </script>
 
                                 <!-- <script>
diff --git a/assets/css/style.css b/assets/css/style.css
index 7c6fbae..cae6629 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -35085,7 +35085,7 @@ input[type=email]:focus::-webkit-input-placeholder {
 .ec-vendor-profile-card .ec-vendor-block-profile .ec-vendor-block-img .ec-vendor-block-bg {
   width: 100%;
   height: 200px;
-  background-image: url(../images/banner/7.jpg);
+  background-image:none;
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
diff --git a/checkouttest.php b/checkouttest.php
index 6a07a4f..46c0ad0 100644
--- a/checkouttest.php
+++ b/checkouttest.php
@@ -605,7 +605,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
                                                         <span class="ec-price">
                                                             <span class="new-price">Subtotal: <?php echo $checkout['shipping_fee'] + $checkout['total_amount']; ?></span>
                                                         </span>
-                                                        <div class="ec-pro-option">
+                                                        <!-- <div class="ec-pro-option">
                                                             <div class="ec-pro-color">
                                                                 <span class="ec-pro-opt-label">Color</span>
                                                                 <ul class="ec-opt-swatch ec-change-img">
@@ -629,7 +629,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
                                                                     </li>
                                                                 </ul>
                                                             </div>
-                                                        </div>
+                                                        </div> -->
                                                     </div>
                                                 </div>
                                             <?php } ?>
diff --git a/functions.php b/functions.php
index cffbd8a..ae5ff93 100644
--- a/functions.php
+++ b/functions.php
@@ -1382,17 +1382,23 @@ function getOrderbyVendorId($id)
   return $response;
 }
 
-function editOrderStatus($orderId, $status, $currentStatus, $trackingNumber, $courierName, $token)
+function editOrderStatus($orderId, $status, $currentStatus, $trackingNumber, $courierName, $paymentStatus, $paymentReference, $token)
 {
   $curl = curl_init();
   $data = array(
     'status' => $status
   );
-  if ($currentStatus == "TO SHIP" || $currentStatus == "T Ship") {
+  if ($currentStatus == "TO SHIP" || $currentStatus == "To Ship") {
     // $data['tracking_number'] = $trackingNumber;
     $data['tracking_number'] = $trackingNumber;
     $data['courier_name'] = $courierName;
   }
+  if ($currentStatus == "TO RECEIVE" || $currentStatus == "To Receive") {
+    // $data['tracking_number'] = $trackingNumber;
+    $data['payment']['status'] = $paymentStatus;
+    $data['payment']['reference_number'] = $paymentReference;
+
+  }
   $params3 = json_encode($data);
   curl_setopt_array($curl, array(
     CURLOPT_URL => "https://".$_SESSION["data_endpoint"]."/api/v1/orders/" . $orderId,
diff --git a/vendor-dashboard-orders-edit-action.php b/vendor-dashboard-orders-edit-action.php
index f86541a..b47079e 100644
--- a/vendor-dashboard-orders-edit-action.php
+++ b/vendor-dashboard-orders-edit-action.php
@@ -5,15 +5,19 @@ $orderId =  $_SESSION['vendorOrderId'];
 $currentStatus = $_POST['order_status'];
 $trackingNumber = $_POST['tracking_number'];
 $courirerName = $_POST['courier_name'];
+$paymentReference = $_POST['payment_reference'];
 $token = $_SESSION['token'];
 // $status = "TO SHIP";
 
 if ($currentStatus === 'TO PAY' || $currentStatus === 'To Pay') {
     $status = 'TO SHIP';
+    $paymentStatus = 'UNPAID';
 } elseif ($currentStatus === 'TO SHIP' || $currentStatus === 'To Ship') {
     $status = 'TO RECEIVE';
+    $paymentStatus = 'UNPAID';
 } elseif ($currentStatus === 'TO RECEIVE' || $currentStatus === 'To Receive') {
     $status = 'COMPLETED';
+    $paymentStatus = 'PAID';
 }
 
 $response = editOrderStatus(
@@ -22,6 +26,8 @@ $response = editOrderStatus(
           $currentStatus,
           $trackingNumber,
           $courirerName,
+          $paymentStatus,
+          $paymentReference,
           $token
          );
 $array = json_decode($response,true);
diff --git a/vendor-dashboard-orders-edit.php b/vendor-dashboard-orders-edit.php
index 9d3a41a..06b7ac9 100644
--- a/vendor-dashboard-orders-edit.php
+++ b/vendor-dashboard-orders-edit.php
@@ -199,6 +199,10 @@ $array = json_decode($result, true);
                                                             <label for="inputEmail4" class="form-label">Payment Status</label>
                                                             <input type="text" class="form-control slug-title" value="<?php echo $array['payment']['status'] ?>" readonly>
                                                         </div>
+                                                        <div class="col-md-6" style="display:none;">
+                                                            <label for="inputEmail4" class="form-label">Payment Reference</label>
+                                                            <input type="text" name="payment_reference" class="form-control slug-title" value="<?php echo htmlspecialchars($array['payment']['reference_number']); ?>">
+                                                        </div>
                                                         <div class="col-md-6">
                                                             <label for="inputEmail4" class="form-label">Status</label>
                                                             <input type="text" class="form-control slug-title" name="order_status" value="<?php echo $array['status'] ?>" readonly>
diff --git a/vendor-settings.php b/vendor-settings.php
index 3758f5f..8e1f553 100644
--- a/vendor-settings.php
+++ b/vendor-settings.php
@@ -137,26 +137,42 @@ if ($_SESSION["userId"] <> "") {
                     <div class="ec-vendor-dashboard-card ec-vendor-setting-card">
                         <div class="ec-vendor-card-body">
                             <?php
-
-                            // var_dump($vendor);
                             ?>
                             <div class="row">
                                 <div class="col-md-12">
                                     <div class="ec-vendor-block-profile">
+                                        <!-- 02-23-2023 Jun Jihad Vendor Header Paceholder -->
                                         <div class="ec-vendor-block-img space-bottom-30 ">
-                                            <div class="ec-vendor-block-bg profBg" style="background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;" id="myElement">
+                                        <?php
+                                            if (!isset($vendorData['vendor_banner']) || empty($vendorData['vendor_banner'])) {
+                                                $banner_style = 'background-color: orange !important; background-image: none !important;  width: 100% !important; height: 200px !important; background-size: cover !important; background-position: center !important; border-radius: 5px !important;';
+                                            } else {
+                                                $banner_style = 'background-image: url(' . $vendorData['vendor_banner'] . ') !important;  width: 100% !important; height: 200px !important; background-size: cover !important; background-position: center !important; background-repeat: no-repeat !important; background-blend-mode: overlay !important; background-color: rgba(0, 0, 0, 0.6) !important; border-radius: 5px !important;';
+                                            }
+                                            ?>
+                                        <div class="ec-vendor-block-bg" style="<?php echo $banner_style; ?>">
                                                 <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>
 
                                             <div class="ec-vendor-block-detail">
-                                                <img class="v-img" src=<?php echo $vendorData['vendor_image'] ?> alt="vendor image">
+                                            <?php
+                                                $vendor_image_modal = isset($vendorData['vendor_image']) ?$vendorData['vendor_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
+                                                ?>
+                                                <img class="v-img" src=<?php echo $vendor_image_modal ?> alt="vendor image">
                                                 <h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
                                             </div>
                                         </div>
+                                        <!-- 02-23-2023 Jun Jihad Vendor Header Paceholder -->
+                                        <!-- 02-23-2023 Jun Jihad Vendor Description -->
                                         <div class="ec-vendor-block-about space-bottom-30">
                                             <h5>About Us</h5>
-                                            <p><?php echo $vendorData["vendor_description"] ?></p>
+                                            <?php if (!empty($vendorData['vendor_description'])): ?>
+                                                <p><?php echo $vendorData['vendor_description']; ?></p>
+                                            <?php else: ?>
+                                                <p>No description available.</p>
+                                            <?php endif; ?>
                                         </div>
+                                        <!-- 02-23-2023 Jun Jihad Vendor Description -->
                                         <h5>Account Information</h5>
 
                                         <div class="row">
@@ -164,7 +180,7 @@ if ($_SESSION["userId"] <> "") {
                                                 <div class="ec-vendor-detail-block ec-vendor-block-email space-bottom-30">
                                                     <h6>E-mail address </h6>
                                                     <ul>
-                                                        <li><strong><?php echo $vendorData["user_email"] ?></strong></li>
+                                                        <li style="padding:3%"><strong><?php echo $vendorData["user_email"] ?></strong></li>
                                                     </ul>
                                                 </div>
                                             </div>
@@ -172,7 +188,7 @@ if ($_SESSION["userId"] <> "") {
                                                 <div class="ec-vendor-detail-block ec-vendor-block-contact space-bottom-30">
                                                     <h6>Contact nubmer</h6>
                                                     <ul>
-                                                        <li><strong><?php echo $vendorData["phone"] ?></strong></li>
+                                                        <li style="padding:3%"><strong><?php echo $vendorData["phone"] ?></strong></li>
                                                     </ul>
                                                 </div>
                                             </div>
@@ -335,6 +351,7 @@ if ($_SESSION["userId"] <> "") {
                 const firstName = document.getElementById('cfirstname-').value;
                 const lastName = document.getElementById('clastname-').value;
                 const phone = document.getElementById('cphone-').value;
+                const description = document.getElementById('cdescription-').value;
 
                 // If no file selected, only update the email
                 fetch(`https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/${vendorid}`, {
@@ -347,6 +364,7 @@ if ($_SESSION["userId"] <> "") {
                             first_name: firstName,
                             last_name: lastName,
                             phone: phone,
+                            vendor_description:description
                         })
                     })
                     .then(response => {
@@ -369,24 +387,22 @@ if ($_SESSION["userId"] <> "") {
         <script>
             const vendorid = `<?php echo $_SESSION["LoggedInVendorId"]; ?>`;
             document.addEventListener('DOMContentLoaded', function() {
-                // Get the select elements
-                const provinceSelect = $('#provinceSelect'); // Use jQuery to select the element
-                const citySelect = $('#citySelect'); // Use jQuery to select the element
-                const barangaySelect = $('#barangaySelect'); // Use jQuery to select the element
+                const provinceSelect = $('#provinceSelect'); 
+                const citySelect = $('#citySelect'); 
+                const barangaySelect = $('#barangaySelect'); 
 
-                // Initialize Select2 on the provinceSelect, citySelect, and barangaySelect elements
                 provinceSelect.select2({
                     dropdownParent: $('#secondModal'),
-                    containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+                    containerCssClass: 'select2-zindex-high' 
                 });
 
                 citySelect.select2({
                     dropdownParent: $('#secondModal'),
-                    containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+                    containerCssClass: 'select2-zindex-high' 
                 });
                 barangaySelect.select2({
                     dropdownParent: $('#secondModal'),
-                    containerCssClass: 'select2-zindex-high' // Optional, add a custom class for styling
+                    containerCssClass: 'select2-zindex-high' 
                 });
 
                 // Fetch provinces data
@@ -400,23 +416,19 @@ if ($_SESSION["userId"] <> "") {
                         }
                     })
                     .then(provincesData => {
-                        // Iterate through the provinces data and add options
+                       
                         provincesData.forEach(province => {
                             const option = new Option(province.name, province.code);
                             provinceSelect.append(option);
                         });
 
-                        // Add an extra option manually
                         const extraOption = new Option('Metro Manila', '130000000');
                         provinceSelect.append(extraOption);
 
-                        // Add event listener to provinceSelect
                         provinceSelect.on('change', function() {
-                            // Clear existing options in citySelect and barangaySelect
                             citySelect.html('<option value="" disabled selected hidden>Select City</option>');
                             barangaySelect.html('<option value="" disabled selected hidden>Select Barangay</option>');
 
-                            // Fetch and update cities/municipalities based on the selected province
                             updateCities();
                         });
                     })
@@ -424,13 +436,11 @@ if ($_SESSION["userId"] <> "") {
                         console.error('Error:', error);
                     });
 
-                // Function to update city/municipality options based on the selected province
                 function updateCities() {
-                    const selectedProvinceCode = provinceSelect.val(); // Use val() to get the selected value with Select2
+                    const selectedProvinceCode = provinceSelect.val();
                     if (selectedProvinceCode) {
                         let citiesEndpoint;
                         if (selectedProvinceCode === '130000000') {
-                            // Check if Metro Manila is selected
                             citiesEndpoint = 'https://psgc.gitlab.io/api/regions/130000000/cities-municipalities/';
                         } else {
                             citiesEndpoint = `https://psgc.gitlab.io/api/provinces/${selectedProvinceCode}/cities-municipalities/`;
@@ -446,7 +456,6 @@ if ($_SESSION["userId"] <> "") {
                                 }
                             })
                             .then(citiesData => {
-                                // Iterate through the cities data and add options
                                 citiesData.forEach(city => {
                                     const option = new Option(city.name, city.code);
                                     citySelect.append(option);
@@ -457,13 +466,9 @@ if ($_SESSION["userId"] <> "") {
                             });
                     }
                 }
-
-                // Add event listener to citySelect
                 citySelect.on('change', function() {
-                    // Clear existing options in barangaySelect
                     barangaySelect.html('<option value="" disabled selected hidden>Select Barangay</option>');
 
-                    // Fetch and update barangays based on the selected city/municipality
                     const selectedCityCode = citySelect.val();
                     if (selectedCityCode) {
                         fetch(`https://psgc.gitlab.io/api/cities-municipalities/${selectedCityCode}/barangays/`)
@@ -476,7 +481,6 @@ if ($_SESSION["userId"] <> "") {
                                 }
                             })
                             .then(barangaysData => {
-                                // Iterate through the barangays data and add options
                                 barangaysData.forEach(barangay => {
                                     const option = new Option(barangay.name, barangay.code);
                                     barangaySelect.append(option);
@@ -491,14 +495,11 @@ if ($_SESSION["userId"] <> "") {
 
 
                 $('#submitBtn').on('click', function() {
-                    // Retrieve existing addresses from the API
                     fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid)
                         .then(response => response.json())
                         .then(data => {
-                            // Get the existing addresses array
                             const existingAddresses = data.address || [];
 
-                            // Get the new address details
                             const firstName = $('#addressFirstName').val();
                             const lastName = $('#addressLastName').val();
                             const contact = $('#addressContact').val();
@@ -510,7 +511,6 @@ if ($_SESSION["userId"] <> "") {
                             const country = $('#addressCountry').val();
 
 
-                            // Create a new address object
                             const newAddress = {
                                 first_name: firstName,
                                 last_name: lastName,
@@ -523,10 +523,8 @@ if ($_SESSION["userId"] <> "") {
                                 country: country,
                             };
 
-                            // Add the new address to the existing addresses
                             existingAddresses.push(newAddress);
 
-                            // Make a PATCH request to update the addresses array
                             return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
                                 method: 'PATCH',
                                 headers: {
@@ -539,16 +537,13 @@ if ($_SESSION["userId"] <> "") {
                         })
                         .then(response => {
                             if (response.ok) {
-                                // Handle success (e.g., show a success message)
                                 location.reload();
                             } else {
-                                // Handle error
                                 console.error('Failed to submit data');
                                 alert('Failed to submit data');
                             }
                         })
                         .catch(error => {
-                            // Handle network or other errors
                             console.error('Error:', error);
                             alert('Error submitting data');
                         });
@@ -706,11 +701,18 @@ if ($_SESSION["userId"] <> "") {
                                         <label><i class="fi-rr-edit"></i></label>
                                     </div>
                                     <div class="thumb-preview ec-preview">
-                                        <div class="image-thumb-preview">
-                                            <img class="image-thumb-preview ec-image-preview v-img" src=<?php echo $vendorData['vendor_banner'] ?> alt="edit" />
-                                        </div>
+                                    <div class="image-thumb-preview">
+                                        <?php
+                                        if (!isset($vendorData['vendor_banner']) || empty($vendorData['vendor_banner'])) {
+                                            $banner_style2 = 'background-color: orange !important; background-image: none !important;  width: 100% !important; height: 200px !important; background-size: cover !important; background-position: center !important; border-radius: 5px !important;';
+                                            echo '<div class="image-thumb-preview ec-image-preview v-img" style="' . $banner_style2 . '"></div>';
+                                        } else {
+                                            echo '<img class="image-thumb-preview ec-image-preview v-img" src="' . $vendorData['vendor_banner'] . '" alt="edit" />';
+                                        }
+                                        ?>
                                     </div>
                                 </div>
+                                </div>
                             </div>
                             <div class="ec-vendor-block-detail">
                                 <div class="thumb-upload">
@@ -719,118 +721,201 @@ if ($_SESSION["userId"] <> "") {
                                         <label><i class="fi-rr-edit"></i></label>
                                     </div>
                                     <div class="thumb-preview ec-preview">
-                                        <div class="image-thumb-preview">
-                                            <img class="image-thumb-preview ec-image-preview v-img" src=<?php echo $vendorData['vendor_image'] ?> alt="edit" />
-                                        </div>
+                                    <div class="image-thumb-preview">
+                                        <?php if (!empty($vendorData['vendor_image'])): ?>
+                                            <img class="image-thumb-preview ec-image-preview v-img" src="<?php echo $vendorData['vendor_image']; ?>" alt="edit" />
+                                        <?php else: ?>
+                                            <img class="image-thumb-preview ec-image-preview v-img" src="https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg" alt="edit" />
+                                        <?php endif; ?>
+                                    </div>
                                     </div>
                                 </div>
                             </div>
                             <script>
-                                function uploadVendorProfileImage() {
-                                    var vendorid = '<?php echo $_SESSION["LoggedInVendorId"] ?>';
-                                    var file = document.getElementById('imageUpload').files[0];
-                                    if (file) {
-                                        var formData = new FormData();
-                                        formData.append('image_id', vendorid);
-                                        formData.append('category', 'vendor');
-                                        formData.append('image', file);
+                               function uploadVendorProfileImage() {
+    var vendorid = '<?php echo $_SESSION["LoggedInVendorId"] ?>';
+    var file = document.getElementById('imageUpload').files[0];
+    if (file) {
+        const reader = new FileReader();
 
-                                        fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
-                                                method: 'POST',
-                                                body: formData
-                                            })
-                                            .then(response => {
-                                                if (response.ok) {
-                                                    return response.json();
-                                                } else {
-                                                    console.error('File upload failed');
-                                                    throw new Error('File upload failed');
-                                                }
-                                            })
-                                            .then(result => {
-                                                const filename = result.filename;
+        reader.onload = function(event) {
+            const img = new Image();
+            img.onload = function() {
+                const canvas = document.createElement('canvas');
+                const ctx = canvas.getContext('2d');
+                const maxWidth = 1200;
+                const maxHeight = 1000;
+                const aspectRatio = img.width / img.height;
+                let newWidth = img.width;
+                let newHeight = img.height;
 
-                                                const payload = {
-                                                    vendor_image: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+                if (img.width > maxWidth) {
+                    newWidth = maxWidth;
+                    newHeight = newWidth / aspectRatio;
+                }
 
-                                                };
+                if (newHeight > maxHeight) {
+                    newHeight = maxHeight;
+                    newWidth = newHeight * aspectRatio;
+                }
 
-                                                console.log('Payload:', payload);
+                canvas.width = newWidth;
+                canvas.height = newHeight;
+                ctx.drawImage(img, 0, 0, newWidth, newHeight);
 
-                                                return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
-                                                    method: 'PATCH',
-                                                    headers: {
-                                                        'Content-Type': 'application/json'
-                                                    },
-                                                    body: JSON.stringify(payload)
-                                                });
-                                            })
-                                            .then(secondResponse => {
-                                                if (secondResponse.ok) {
-                                                    console.log('Second request successful');
-                                                    location.reload();
-                                                } else {
-                                                    console.error('Second request failed');
-                                                }
-                                            })
-                                            .catch(error => {
-                                                console.error('Error during fetch:', error);
-                                            });
-                                    }
-                                }
+                canvas.toBlob((blob) => {
+                    const resizedFile = new File([blob], file.name, {
+                        type: 'image/jpeg'
+                    });
 
-                                function uploadProfileBanner() {
-                                    var vendorid = '<?php echo $_SESSION["LoggedInVendorId"] ?>';
-                                    var file = document.getElementById('thumbUpload01').files[0];
-                                    if (file) {
-                                        var formData = new FormData();
-                                        formData.append('image_id', vendorid + '_banner');
-                                        formData.append('category', 'vendor');
-                                        formData.append('image', file);
+                    var formData = new FormData();
+                    formData.append('image_id', vendorid);
+                    formData.append('category', 'vendor');
+                    formData.append('image', resizedFile);
 
-                                        fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
-                                                method: 'POST',
-                                                body: formData
-                                            })
-                                            .then(response => {
-                                                if (response.ok) {
-                                                    return response.json();
-                                                } else {
-                                                    console.error('File upload failed');
-                                                    throw new Error('File upload failed');
-                                                }
-                                            })
-                                            .then(result => {
-                                                const filename = result.filename;
+                    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
+                            method: 'POST',
+                            body: formData
+                        })
+                        .then(response => {
+                            if (response.ok) {
+                                return response.json();
+                            } else {
+                                console.error('File upload failed');
+                                throw new Error('File upload failed');
+                            }
+                        })
+                        .then(result => {
+                            const filename = encodeURI(result.filename);
 
-                                                const payload = {
-                                                    vendor_banner: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+                            const payload = {
+                                vendor_image: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+                            };
 
-                                                };
+                            console.log('Payload:', payload);
 
-                                                console.log('Payload:', payload);
+                            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
+                                method: 'PATCH',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify(payload)
+                            });
+                        })
+                        .then(secondResponse => {
+                            if (secondResponse.ok) {
+                                console.log('Second request successful');
+                                location.reload();
+                            } else {
+                                console.error('Second request failed');
+                            }
+                        })
+                        .catch(error => {
+                            console.error('Error during fetch:', error);
+                        });
+                }, 'image/jpeg');
+            };
+
+            img.src = event.target.result;
+        };
+
+        reader.readAsDataURL(file);
+    }
+}
+
+function uploadProfileBanner() {
+    var vendorid = '<?php echo $_SESSION["LoggedInVendorId"] ?>';
+    var file = document.getElementById('thumbUpload01').files[0];
+    if (file) {
+        const reader = new FileReader();
+
+        reader.onload = function(event) {
+            const img = new Image();
+            img.onload = function() {
+                const canvas = document.createElement('canvas');
+                const ctx = canvas.getContext('2d');
+                const maxWidth = 1200;
+                const maxHeight = 1000;
+                const aspectRatio = img.width / img.height;
+                let newWidth = img.width;
+                let newHeight = img.height;
+
+                if (img.width > maxWidth) {
+                    newWidth = maxWidth;
+                    newHeight = newWidth / aspectRatio;
+                }
+
+                if (newHeight > maxHeight) {
+                    newHeight = maxHeight;
+                    newWidth = newHeight * aspectRatio;
+                }
+
+                canvas.width = newWidth;
+                canvas.height = newHeight;
+                ctx.drawImage(img, 0, 0, newWidth, newHeight);
+
+                canvas.toBlob((blob) => {
+                    const resizedFile = new File([blob], file.name, {
+                        type: 'image/jpeg'
+                    });
+
+                    var formData = new FormData();
+                    formData.append('image_id', vendorid + '_banner');
+                    formData.append('category', 'vendor');
+                    formData.append('image', resizedFile);
+
+                    fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/upload_image', {
+                            method: 'POST',
+                            body: formData
+                        })
+                        .then(response => {
+                            if (response.ok) {
+                                return response.json();
+                            } else {
+                                console.error('File upload failed');
+                                throw new Error('File upload failed');
+                            }
+                        })
+                        .then(result => {
+                            const filename = encodeURI(result.filename);
+                            // const filename = result.filename;
+
+                            const payload = {
+                                vendor_banner: `https://<?php echo $_SESSION["data_endpoint"]; ?>/images/storage/vendor_uploads/${filename}`,
+
+                            };
+
+                            console.log('Payload:', payload);
+
+                            return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
+                                method: 'PATCH',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify(payload)
+                            });
+                        })
+                        .then(secondResponse => {
+                            if (secondResponse.ok) {
+                                console.log('Second request successful');
+                                location.reload();
+                            } else {
+                                console.error('Second request failed');
+                            }
+                        })
+                        .catch(error => {
+                            console.error('Error during fetch:', error);
+                        });
+                }, 'image/jpeg');
+            };
+
+            img.src = event.target.result;
+        };
+
+        reader.readAsDataURL(file);
+    }
+}
 
-                                                return fetch('https://<?php echo $_SESSION["data_endpoint"]; ?>/api/v1/vendors/' + vendorid, {
-                                                    method: 'PATCH',
-                                                    headers: {
-                                                        'Content-Type': 'application/json'
-                                                    },
-                                                    body: JSON.stringify(payload)
-                                                });
-                                            })
-                                            .then(secondResponse => {
-                                                if (secondResponse.ok) {
-                                                    console.log('Second request successful');
-                                                    location.reload();
-                                                } else {
-                                                    console.error('Second request failed');
-                                                }
-                                            })
-                                            .catch(error => {
-                                                console.error('Error during fetch:', error);
-                                            });
-                                    }
-                                }
                             </script>
                             <div class="ec-vendor-upload-detail">
                                 <form class="row g-3">
@@ -854,6 +939,12 @@ if ($_SESSION["userId"] <> "") {
                                         <label for="cphone-" class="text-dark font-weight-medium pt-3 mb-2">Contact Number</label>
                                         <input type="text" class="form-control" id="cphone-" value="<?php echo $vendorData['phone'] ?>">
                                     </div>
+                                        <!-- 02-23-2023 Jun Jihad Vendor Description Field-->
+                                     <div class="form-group">
+                                        <label for="cdescription-" class="text-dark font-weight-medium pt-3 mb-2">Vendor Description</label>
+                                        <textarea class="form-control" id="cdescription-"><?php echo $vendorData['vendor_description']; ?></textarea>
+                                    </div>
+                                        <!-- 02-23-2023 Jun Jihad Vendor Description Field-->
 
                                     <!-- <div class="col-md-12 space-t-15">
                                         <button type="submit" class="btn btn-primary">Update</button>
-- 
2.40.1


From 1572bac6dec435bf89a3ce338b9dcc9b3da91add Mon Sep 17 00:00:00 2001
From: Jun Barroga <jun.barroga@obanana.com>
Date: Tue, 27 Feb 2024 09:11:14 +0800
Subject: [PATCH 2/2] Vendor Page Updates

---
 catalog-single-vendor.php |  64 +++++++++++------
 checkouttest.php          |   2 +
 functions.php             |  20 +++---
 header.php                |   8 +--
 index.php                 |  43 +++++++-----
 product-left-sidebar.php  | 143 ++++++++++++++++++++++----------------
 vendor-dashboard.php      |  12 ++--
 vendor-list.php           |  17 +++--
 vendor-settings.php       |   7 +-
 wishlist.php              |  10 +--
 10 files changed, 201 insertions(+), 125 deletions(-)

diff --git a/catalog-single-vendor.php b/catalog-single-vendor.php
index 6923744..1d8b0ce 100644
--- a/catalog-single-vendor.php
+++ b/catalog-single-vendor.php
@@ -217,14 +217,15 @@ if ($_SESSION["userId"] <> "") {
                         <div class="ec-page-description ec-page-description-info">
                             <div class="ec-page-block">
                                 <div class="ec-catalog-vendor">
-                                    <?php
+                                <a href="vendor-profile.html">
+                                <?php
                                     if (isset($vendor["vendor_image"])) {
-                                    ?><img src="<?php echo $vendor["vendor_image"] ?>" alt="vendor img"><?php
-                                                                                                    } else {
-                                                                                                        ?><img src="assets/images/vendor/5.jpg" alt="vendor img"><?php
-                                                                                                                                                                }
-                                                                                                                                                                    ?>
-
+                                        ?><img src="<?php echo $vendor["vendor_image"] ?>" alt="vendor img"><?php
+                                    } else {
+                                        ?><img src="assets/images/vendor/5.jpg" alt="vendor img"><?php
+                                    }
+                                ?>
+                                </a>
                                 </div>
 
                                 <div class="ec-catalog-vendor-info row">
@@ -234,20 +235,25 @@ if ($_SESSION["userId"] <> "") {
                                         </a>
                                         <p>( Retail Business )</p>
                                     </div>
-                                    <div class="col-lg-3 col-md-6 ec-catalog-ratings pad-15">
+                                    <!-- raymart remove level feb 22 2024 -->
+                                    <!-- <div class="col-lg-3 col-md-6 ec-catalog-ratings pad-15">
                                         <h6>Level</h6>
                                         <p>Level : 9 out of 10</p>
-                                    </div>
+                                    </div> -->
                                     <div class="col-lg-3 col-md-6 ec-catalog-pro-count pad-15">
+                                        <a href="vendor-profile.html">
                                         <h6>Seller Products</h6>
                                         <?php
                                         $products = productListVendor($_GET["id"]);
                                         ?>
+                                        </a>
                                         <p><?php echo count($products) ?> Products</p>
                                     </div>
                                     <div class="col-lg-3 col-md-6 ec-catalog-since pad-15">
+                                        <a href="vendor-profile.html">
                                         <h6>Seller since</h6>
                                         <p><?php echo $vendor["date_registered"] ?></p>
+                                        </a>
                                     </div>
                                 </div>
                             </div>
@@ -311,17 +317,18 @@ if ($_SESSION["userId"] <> "") {
                                         <div class="ec-product-inner">
                                             <div class="ec-pro-image-outer">
                                                 <div class="ec-pro-image">
-                                                    <a href="shop-left-sidebar-col-4.php" class="image">
-                                                        <?php
+                                                    <!-- raymart added for link for product feb 22 2024 -->
+                                                    <a class="image" href="product-left-sidebar.php?id=<?php echo $product["_id"] ?>"<?php echo $product["product_image"] ?>>
+                                                        <?php 
                                                         if (isset($product["product_image"]) && $product["product_image"] <> "") {
                                                         ?>
                                                             <img class="main-image" src="<?php echo $product["product_image"] ?>" alt="Product" />
-                                                            <img class="hover-image" src="<?php echo $product["product_image"] ?>" alt="Product" />
+                                                            <!-- <img class="hover-image" src="<?php echo $product["product_image"] ?>" alt="Product" /> -->
                                                         <?php
                                                         } else {
                                                         ?>
                                                             <img class="main-image" src="assets/images/product-image/6_1.jpg" alt="Product" />
-                                                            <img class="hover-image" src="assets/images/product-image/6_2.jpg" alt="Product" />
+                                                            <!-- <img class="hover-image" src="assets/images/product-image/6_2.jpg" alt="Product" /> -->
                                                         <?php
                                                         }
                                                         ?>
@@ -342,15 +349,17 @@ if ($_SESSION["userId"] <> "") {
                                             </div>
                                             <div class="ec-pro-content">
                                                 <h5 class="ec-pro-title"><a href="product-left-sidebar.php?id=<?php echo $product["_id"] ?>"><?php echo $product["product_name"] ?></a></h5>
-                                                <div class="ec-pro-rating">
+                                                <!-- raymart remove ratings feb 22 2024 -->
+                                                <!-- <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> -->
                                                 <div class="ec-pro-list-desc">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum is simply dutmmy text ever since the 1500s, when an unknown printer took a galley.</div>
                                                 <span class="ec-price">
+                                                    <!-- raymart added $ to pesos function feb 22 2024 -->
                                                     <?php if (isset($product["sale_price"]) && $product["sale_price"] > 0) : ?>
                                                         <span class="old-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
                                                         <span class="new-price">&#8369;<?php echo number_format($product["sale_price"], 2, ".", ",") ?></span>
@@ -362,9 +371,22 @@ if ($_SESSION["userId"] <> "") {
                                                     <?php else : ?>
                                                         <span class="inquire-text">Inquire</span>
                                                     <?php endif; ?>
+
+                                                    <!-- <?php if (isset($product["sale_price"]) && $product["sale_price"] > 0) : ?>
+                                                        <span class="old-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
+                                                        <span class="new-price">&#8369;<?php echo number_format($product["sale_price"], 2, ".", ",") ?></span>
+                                                    <?php elseif (isset($product["regular_price"]) && $product["regular_price"] != "") : ?>
+                                                        <span class="new-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
+
+                                                    <?php elseif ($product["regular_price"] == "" || $product["regular_price"] == null) : ?>
+                                                        <span class="inquire-text">Inquire</span>
+                                                    <?php else : ?>
+                                                        <span class="inquire-text">Inquire</span>
+                                                    <?php endif; ?> -->
                                                 </span>
                                                 <div class="ec-pro-option">
-                                                    <div class="ec-pro-color">
+                                                    <!-- raymart remove color and size function feb  22 2024 -->
+                                                    <!-- <div class="ec-pro-color">
                                                         <span class="ec-pro-opt-label">Color</span>
                                                         <ul class="ec-opt-swatch ec-change-img">
                                                             <?php
@@ -381,8 +403,8 @@ if ($_SESSION["userId"] <> "") {
                                                             }
                                                             ?>
                                                         </ul>
-                                                    </div>
-                                                    <div class="ec-pro-size">
+                                                    </div> -->
+                                                    <!-- <div class="ec-pro-size">
                                                         <span class="ec-pro-opt-label">Size</span>
                                                         <ul class="ec-opt-size">
                                                             <li class="active"><a href="#" class="ec-opt-sz" data-old="$25.00" data-new="$20.00" data-tooltip="Small">S</a></li>
@@ -390,7 +412,7 @@ if ($_SESSION["userId"] <> "") {
                                                             <li><a href="#" class="ec-opt-sz" data-old="$30.00" data-new="$25.00" data-tooltip="Large">X</a></li>
                                                             <li><a href="#" class="ec-opt-sz" data-old="$35.00" data-new="$30.00" data-tooltip="Extra Large">XL</a></li>
                                                         </ul>
-                                                    </div>
+                                                    </div> -->
                                                 </div>
                                             </div>
                                         </div>
@@ -864,7 +886,7 @@ if ($_SESSION["userId"] <> "") {
     <!-- Footer navigation panel for responsive display end -->
 
     <!-- Recent Purchase Popup  -->
-    <div class="recent-purchase">
+    <!-- <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>
@@ -872,7 +894,7 @@ if ($_SESSION["userId"] <> "") {
             <p>10 Minutes ago</p>
         </div>
         <a href="javascript:void(0)" class="icon-btn recent-close">×</a>
-    </div>
+    </div> -->
     <!-- Recent Purchase Popup end -->
 
     <!-- Cart Floating Button -->
diff --git a/checkouttest.php b/checkouttest.php
index 46c0ad0..f0ad9e4 100644
--- a/checkouttest.php
+++ b/checkouttest.php
@@ -605,6 +605,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
                                                         <span class="ec-price">
                                                             <span class="new-price">Subtotal: <?php echo $checkout['shipping_fee'] + $checkout['total_amount']; ?></span>
                                                         </span>
+                                                        <!-- 02-22-2024 Stacy hide variation -->
                                                         <!-- <div class="ec-pro-option">
                                                             <div class="ec-pro-color">
                                                                 <span class="ec-pro-opt-label">Color</span>
@@ -630,6 +631,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
                                                                 </ul>
                                                             </div>
                                                         </div> -->
+                                                        <!-- 02-22-2024 Stacy hide variation -->
                                                     </div>
                                                 </div>
                                             <?php } ?>
diff --git a/functions.php b/functions.php
index ae5ff93..23f6d72 100644
--- a/functions.php
+++ b/functions.php
@@ -521,8 +521,9 @@ function vendorExists($email)
 function sendEmail_obanana($fName, $lName, $email, $phone, $message)
 {
   if($_SESSION["is_test"]==true && $_SESSION["test_email_rcpt"]!=""){
-    $testEmail = $_SESSION["test_email_rcpt"];
+    $email = $_SESSION["test_email_rcpt"];
   }
+  $salesEmail = $_SESSION["sales_email"];
   $msgto_obanana = "
               <h4>Greetings from Obanana!</h4>
               <ul>
@@ -541,7 +542,7 @@ function sendEmail_obanana($fName, $lName, $email, $phone, $message)
         ],
         "To" => [
           [
-            "Email" => $testEmail,
+            "Email" => $salesEmail,
             "Name" => "Subscriber"
           ]
         ],
@@ -639,8 +640,9 @@ function sendEmail_customer($fName, $lName, $email)
 function contact_Seller($cstm_email, $prd_name, $prd_qnty, $message)
 {
   if($_SESSION["is_test"]==true && $_SESSION["test_email_rcpt"]!=""){
-    $testEmail = $_SESSION["test_email_rcpt"];
+    $cstm_email = $_SESSION["test_email_rcpt"];
   }
+  $salesEmail = $_SESSION["sales_email"];
   $msgto_seller = "
               <h4>Greetings from Obanana!</h4>
               <ul>
@@ -659,7 +661,7 @@ function contact_Seller($cstm_email, $prd_name, $prd_qnty, $message)
         ],
         "To" => [
           [
-            "Email" => $testEmail,
+            "Email" => $salesEmail,
             "Name" => "Subscriber"
           ]
         ],
@@ -697,9 +699,9 @@ function contact_Seller($cstm_email, $prd_name, $prd_qnty, $message)
 
 function contact_Inquirer($cstm_email)
 {
-  // if($_SESSION["is_test"]==true && $_SESSION["test_email_rcpt"]!=""){
-  //   $testEmail = $_SESSION["test_email_rcpt"];
-  // }
+  if($_SESSION["is_test"]==true && $_SESSION["test_email_rcpt"]!=""){
+    $cstm_email = $_SESSION["test_email_rcpt"];
+  }
   $msgto_inquirer = "
               <h4>Greetings from Obanana!</h4>
               <ul>
@@ -717,8 +719,8 @@ function contact_Inquirer($cstm_email)
         ],
         "To" => [
           [
-            // "Email" => $cstm_email,
-            "Email" => "stacyjoycemapano@gmail.com",
+            "Email" => $cstm_email,
+            //"Email" => "stacyjoycemapano@gmail.com",
 
             "Name" => "Subscriber"
           ]
diff --git a/header.php b/header.php
index 71d2a17..3477429 100644
--- a/header.php
+++ b/header.php
@@ -977,15 +977,15 @@
                                     <li><a href="javascript:void(0)" data-scroll="collection" class="nav-scroll">Top
                                             Collection</a></li>
                                     <li><a href="javascript:void(0)" data-scroll="categories" class="nav-scroll">Categories</a></li>
-                                    <li><a href="javascript:void(0)" data-scroll="offers" class="nav-scroll">Offers</a></li>
+                                    <!-- <li><a href="javascript:void(0)" data-scroll="offers" class="nav-scroll">Offers</a></li> -->
                                     <li><a href="javascript:void(0)" data-scroll="vendors" class="nav-scroll">Top
                                             Vendors</a></li>
                                     <li><a href="javascript:void(0)" data-scroll="services" class="nav-scroll">Services</a></li>
                                     <li><a href="javascript:void(0)" data-scroll="arrivals" class="nav-scroll">New
                                             Arrivals</a></li>
-                                    <li><a href="javascript:void(0)" data-scroll="reviews" class="nav-scroll">Client
-                                            Review</a></li>
-                                    <li><a href="javascript:void(0)" data-scroll="insta" class="nav-scroll">Instagram Feed</a></li>
+                                    <!-- <li><a href="javascript:void(0)" data-scroll="reviews" class="nav-scroll">Client
+                                            Review</a></li> -->
+                                    <!-- <li><a href="javascript:void(0)" data-scroll="insta" class="nav-scroll">Instagram Feed</a></li> -->
                                 </ul>
                             </li>
                         </ul>
diff --git a/index.php b/index.php
index 3a27575..4b4dd0e 100644
--- a/index.php
+++ b/index.php
@@ -568,6 +568,7 @@ if ($_SESSION["userId"] <> "") {
                                             <div class="ec-product-inner">
                                                 <div class="ec-pro-image-outer">
                                                     <div class="ec-pro-image">
+                                                    <a href="product-left-sidebar.php?id=<?php echo $forAll[$pid]["_id"]; ?>">
                                                         <!-- raymart added function for images feb 21 2024-->
                                                         <?php
                                                             if (isset($forAll[$pid]['images'])) {
@@ -584,6 +585,7 @@ if ($_SESSION["userId"] <> "") {
                                                             <?php
                                                             }
                                                             ?>
+                                                    </a>
                                                         <!-- <a href="product-left-sidebar.php?id=<?php echo $forAll[$pid]["_id"]; ?>" class="image">
                                                             <img class="main-image" src="<?php echo $forAll[$pid]["product_image"] ?>" alt="Product" />
                                                             <img class="hover-image" src="<?php echo $forAll[$pid]["product_image"] ?>" alt="Product" />
@@ -669,22 +671,24 @@ if ($_SESSION["userId"] <> "") {
                                             <div class="ec-product-inner">
                                                 <div class="ec-pro-image-outer">
                                                     <div class="ec-pro-image">
+                                                    <a href="product-left-sidebar.php?id=<?php echo $electronics[$pid]["_id"]; ?>">
                                                         <!-- raymart added function for images feb 21 2024-->
-                                                    <?php
-                                                        if (isset($electronics[$pid]['images'])) {
-                                                            $image_urls = explode(',', $electronics[$pid]['images']);
-                                                            if (!empty($image_urls)) {
-                                                                $first_image_url = trim($image_urls[0]);
-                                                        ?>
-                                                                <img class="main-image" src="<?php echo $first_image_url; ?>" alt="edit" />
+                                                        <?php
+                                                            if (isset($electronics[$pid]['images'])) {
+                                                                $image_urls = explode(',', $electronics[$pid]['images']);
+                                                                if (!empty($image_urls)) {
+                                                                    $first_image_url = trim($image_urls[0]);
+                                                            ?>
+                                                                    <img class="main-image" src="<?php echo $first_image_url; ?>" alt="edit" />
+                                                                <?php
+                                                                }
+                                                            } else {
+                                                                ?>
+                                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
                                                             <?php
                                                             }
-                                                        } else {
                                                             ?>
-                                                            <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
-                                                        <?php
-                                                        }
-                                                        ?>
+                                                    </a>
                                                         <!-- <a href="product-left-sidebar.php?id=<?php echo $electronics[$pid]["_id"]; ?>" class="image">
                                                             <img class="main-image" src="<?php echo $electronics[$pid]["product_image"] ?>" alt="Product" />
                                                             <img class="hover-image" src="<?php echo $electronics[$pid]["product_image"] ?>" alt="Product" />
@@ -772,6 +776,7 @@ if ($_SESSION["userId"] <> "") {
                                             <div class="ec-product-inner">
                                                 <div class="ec-pro-image-outer">
                                                     <div class="ec-pro-image">
+                                                    <a href="product-left-sidebar.php?id=<?php echo $smartHome[$pid]["_id"]; ?>">
                                                         <!-- raymart added function for images feb 21 2024-->
                                                         <?php
                                                             if (isset($smartHome[$pid]['images'])) {
@@ -788,6 +793,7 @@ if ($_SESSION["userId"] <> "") {
                                                             <?php
                                                             }
                                                             ?>
+                                                    </a>
                                                         <!-- <a href="product-left-sidebar.php?id=<?php echo $smartHome[$pid]["_id"]; ?>" class="image">
                                                             <img class="main-image" src="<?php echo $smartHome[$pid]["product_image"] ?>" alt="Product" />
                                                             <img class="hover-image" src="<?php echo $smartHome[$pid]["product_image"] ?>" alt="Product" />
@@ -873,6 +879,7 @@ if ($_SESSION["userId"] <> "") {
                                             <div class="ec-product-inner">
                                                 <div class="ec-pro-image-outer">
                                                     <div class="ec-pro-image">
+                                                    <a href="product-left-sidebar.php?id=<?php echo $forVehicle[$pid]["_id"]; ?>">
                                                         <!-- raymart added function for images feb 21 2024-->
                                                         <?php
                                                             if (isset($forVehicle[$pid]['images'])) {
@@ -889,6 +896,7 @@ if ($_SESSION["userId"] <> "") {
                                                             <?php
                                                             }
                                                             ?>
+                                                    </a>
                                                         <!-- <a href="product-left-sidebar.php?id=<?php echo $forVehicle[$pid]["_id"]; ?>" class="image">
                                                             <img class="main-image" src="<?php echo $forVehicle[$pid]["product_image"] ?>" alt="Product" />
                                                             <img class="hover-image" src="<?php echo $forVehicle[$pid]["product_image"] ?>" alt="Product" />
@@ -1324,16 +1332,17 @@ if ($_SESSION["userId"] <> "") {
                                 <div class="ec-vendor-info">
                                     <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>" class="name"><?php echo $vendor['user_login'] ?></a>
                                     <p class="prod-count"><?php echo count($vendorProducts) ?> Products</p>
-                                    <div class="ec-pro-rating">
+                                    <!-- raymart remove ratings and sales feb 22 2024 -->
+                                    <!-- <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 class="ec-sale">
+                                    </div> -->
+                                    <!-- <div class="ec-sale">
                                         <p title="Weekly sales">Sales 954</p>
-                                    </div>
+                                    </div> -->
                                 </div>
                             </div>
                             <div class="ec-vendor-prod">
@@ -1476,6 +1485,7 @@ if ($_SESSION["userId"] <> "") {
                             <div class="ec-product-inner">
                                 <div class="ec-pro-image-outer">
                                     <div class="ec-pro-image">
+                                    <a href="product-left-sidebar.php?id=<?php echo $newArrival[$pid]["_id"]; ?>">
                                         <!-- raymart added function for images feb 21 2024-->
                                         <?php
                                             if (isset($newArrival[$pid]['images'])) {
@@ -1492,6 +1502,7 @@ if ($_SESSION["userId"] <> "") {
                                             <?php
                                             }
                                             ?>
+                                    </a>
                                         <!-- <a href="product-left-sidebar.php?id=<?php echo $newArrival[$pid]["_id"]; ?>" class="image">
                                             <img class="main-image" src="<?php echo $newArrival[$pid]["product_image"] ?>" alt="Product" />
                                             <img class="hover-image" src="<?php echo $newArrival[$pid]["product_image"] ?>" alt="Product" />
diff --git a/product-left-sidebar.php b/product-left-sidebar.php
index 1e39dd0..0c7ec8f 100644
--- a/product-left-sidebar.php
+++ b/product-left-sidebar.php
@@ -320,7 +320,9 @@ if (isset($_GET['id'])) {
                                                         $productImage = $i;
                                                     }
                                                     ?>
-                                                    <img class="img-responsive" src="<?php echo $productImage; ?>" alt="" style="width: 100%; height: 100%; object-fit: cover; object-position: center center;">
+                                                    <!-- <img class="img-responsive" src="<?php #echo $productImage; ?>" alt="" style="width: 100%; height: 100%; object-fit: cover; object-position: center center;"> -->
+                                                    <!-- 02-26-2024 Stacy updated img width & height -->
+                                                    <img class="img-responsive" src="<?php echo $productImage; ?>" alt="" style="max/width: 90px; height: 120px; object-fit: cover; object-position: center center;">
                                                 </div>
                                             <?php
                                             }
@@ -336,7 +338,8 @@ if (isset($_GET['id'])) {
                                         <h5 class="ec-single-title" id="productTitle"><?php echo $product_details['product_name']; ?></h5>
                                         <!-- <h5 class="ec-single-title" id="productTitlemodal"><?php echo $product_details['product_name']; ?></h5> -->
 
-                                        <div class="ec-single-rating-wrap">
+                                        <!-- 02-22-2024 Stacy hide -->
+                                        <!-- <div class="ec-single-rating-wrap">
                                             <div class="ec-single-rating">
                                                 <i class="ecicon eci-star fill"></i>
                                                 <i class="ecicon eci-star fill"></i>
@@ -346,10 +349,11 @@ if (isset($_GET['id'])) {
                                             </div>
                                             <span class="ec-read-review"><a href="#ec-spt-nav-review">Be the first to
                                                     review this product</a></span>
-                                        </div>
+                                        </div> -->
                                         <div class="ec-single-desc" id="shortDescription"><?php echo $product_details['product_description']; ?></div>
 
-                                        <div class="ec-single-sales">
+                                        <!-- 02-22-2024 Stacy hide -->
+                                        <!-- <div class="ec-single-sales">
                                             <div class="ec-single-sales-inner">
                                                 <div class="ec-single-sales-title">sales accelerators</div>
                                                 <div class="ec-single-sales-visitor">real time <span>24</span> visitor
@@ -364,7 +368,8 @@ if (isset($_GET['id'])) {
                                                     <div class="ec-single-count-desc">Time is Running Out!</div>
                                                 </div>
                                             </div>
-                                        </div>
+                                        </div> -->
+                                        
                                         <div class="ec-single-price-stoke">
                                             <div class="ec-single-price">
                                                 <span class="ec-single-ps-title">As low as</span>
@@ -397,32 +402,32 @@ if (isset($_GET['id'])) {
                                                     <div class="ec-pro-variation-content">
                                                         <ul class="eccart-pro-items">
                                                         <?php
-$main_product_image = isset($product_details["product_image"]) ? $product_details["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
-?>
-<a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($product_details), ENT_QUOTES, 'UTF-8'); ?>)">
-    <li style="width: 100px; height: 100px">
-        <img src="<?php echo $main_product_image; ?>" alt="product">
-        <?php foreach ($product_details['variables'] as $variable) { ?>
-            <p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
-        <?php } ?>
-    </li>
-</a>
+                                                            $main_product_image = isset($product_details["product_image"]) ? $product_details["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
+                                                            ?>
+                                                            <a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($product_details), ENT_QUOTES, 'UTF-8'); ?>)">
+                                                                <li style="width: 100px; height: 100px">
+                                                                    <img src="<?php echo $main_product_image; ?>" alt="product">
+                                                                    <?php foreach ($product_details['variables'] as $variable) { ?>
+                                                                        <p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
+                                                                    <?php } ?>
+                                                                </li>
+                                                            </a>
 
-<?php
-foreach ($variation_details as $index => $variation) {
-    $variationImage = isset($variation["product_image"]) ? $variation["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
-?>
-    <a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($variation), ENT_QUOTES, 'UTF-8'); ?>)">
-        <li style="width: 100px; height: 100px">
-            <img src="<?php echo $variationImage; ?>" alt="product">
-            <?php foreach ($variation['variables'] as $variable) { ?>
-                <p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
-            <?php } ?>
-        </li>
-    </a>
-<?php
-}
-?>
+                                                            <?php
+                                                            foreach ($variation_details as $index => $variation) {
+                                                                $variationImage = isset($variation["product_image"]) ? $variation["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
+                                                            ?>
+                                                                <a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($variation), ENT_QUOTES, 'UTF-8'); ?>)">
+                                                                    <li style="width: 100px; height: 100px">
+                                                                        <img src="<?php echo $variationImage; ?>" alt="product">
+                                                                        <?php foreach ($variation['variables'] as $variable) { ?>
+                                                                            <p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
+                                                                        <?php } ?>
+                                                                    </li>
+                                                                </a>
+                                                            <?php
+                                                            }
+                                                            ?>
 
                                                         </ul>
                                                     </div>
@@ -462,35 +467,57 @@ foreach ($variation_details as $index => $variation) {
                                         <?php
                                         }
                                         ?>
-<!-- 20240212 Jun Jihad Include Parent Product in the Variation Selection -->
+                                        <!-- 20240212 Jun Jihad Include Parent Product in the Variation Selection -->
 
+                                        <!-- 02-22-2024 Stacy modified this block of code -->
                                         <div class="ec-single-qty">
 
-                                            <div class="qty-plus-minuses">
-                                                <div class="qty-btn" onclick="decrement()">-</div>
-                                                <input class="qty-inputs" type="number" name="ec_qtybtn" value="<?php echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; ?>" id="qty-input" />
-                                                <div class="qty-btn" onclick="increment()">+</div>
-                                            </div>
-
-                                            <div class="ec-single-cart">
+                                            <div class="qty-plus-minuses" style="display:flex; overflow:visible;">
+                                                <!-- <div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>
+                                                <input class="qty-inputs" style="width:100px; height:40px" type="number" name="ec_qtybtn" value="<?php #echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; ?>" id="qty-input" />
+                                                <div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div> -->
+                                            
+                                                <div class="ec-single-cart" style="display:flex; flex-direction:row; width:80%; overflow:visible; text-align:center; align-items:center; ">
                                                 <!-- 02-13-24 Jun Jihad Contact Seller will appear to Variable products with no price -->
                                                 <?php
-    if ($_SESSION["isLoggedIn"]) {
-        if ($product_details['product_type'] === "variable") {
-            echo '<button class="btn btn-primary" id="addToCartButton" style="display:none">Add To Cart</button>';
-            echo '<button type="button" class="btn btn-primary" id="contactSellerButton" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
-        } else {
-            if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) {
-                echo '<div id="addToCartMessage"></div>';
-                echo '<button class="btn btn-primary" id="addToCartButton">Add To Cart</button>';
-            } else {
-                echo '<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
-            }
-        }
-    } else {
-        echo '<p>Please log in to add to cart.</p>';
-    }
-?>
+                                                    if ($_SESSION["isLoggedIn"]) {
+                                                        if ($product_details['product_type'] === "variable") {
+                                                            echo '<div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>';
+                                                            echo '<input class="qty-inputs" style="width:110px; height:40px" type="number" name="ec_qtybtn" value="';
+                                                            echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; 
+                                                            echo '" id="qty-input" />';
+                                                            echo '<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div>';
+                                                            echo '<div style="display:flex; margin-left:45px;"><button type="button" class="btn btn-primary" id="contactSellerButton" style="background:#ffaa00; width:190px;" data-bs-toggle="modal" data-bs-target="#priceModal"><i class="fi-rr-envelope" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Contact Seller</button>';
+                                                            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></div>';
+                                                            
+                                                        } else {
+                                                            if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) {
+                                                                echo '<div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>';
+                                                                echo '<input class="qty-inputs" style="width:100px; height:40px" type="number" name="ec_qtybtn" value="';
+                                                                echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; 
+                                                                echo '" id="qty-input" />';
+                                                                echo '<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div>';
+                                                                echo '<div id="addToCartMessage"></div>';
+                                                                echo '<button class="btn btn-primary" id="addToCartButton" style="background:#ffaa00; margin-left:55px;"><i class="fi-rr-shopping-bag" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Add To Cart</button>';
+                                                                echo '<div 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>';
+                                                            } else {
+                                                                echo '<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
+                                                            }
+                                                        }
+                                                    } else {
+                                                        echo '<div class="login-button" style=""><p style="color:red; text-wrap:nowrap;">Please log in to your account.</p>';
+                                                        echo '<a href="login.php" style="margin-left:-2px;"><button type="button" class="btn btn-primary" style="margin-left:-2px; margin-top:-20px; background:#ffaa00; border-radius:10px; letter-spacing:1px;" data-bs-toggle="modal">LOGIN</button></a></div>';
+                                                    }
+                                                ?>
+                                                <!-- <div class="ec-single-wishlist" style="border: 1px solid yellow;">
+                                                    <a class="ec-btn-group wishlist" style="padding-left:40px;" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart"></i></a>
+                                                </div> -->
+                                        <!-- 02-22-2024 Stacy modified this block of code -->
+                                                
                                                 <!-- 02-13-24 Jun Jihad Contact Seller will appear to Variable products with no price -->
 
 
@@ -509,10 +536,9 @@ foreach ($variation_details as $index => $variation) {
                                                 //     echo '<p>Please log in to add to cart.</p>';
                                                 // }
                                                 ?> -->
+                                                </div>
                                             </div>
 
-
-
                                             <div class="modal fade" id="priceModal" tabindex="-1" role="dialog" aria-labelledby="priceModalLabel" aria-hidden="true">
                                                 <div class="modal-dialog modal-dialog-centered" role="document">
                                                     <div class="modal-content">
@@ -584,9 +610,10 @@ foreach ($variation_details as $index => $variation) {
                                                 </div>
                                             </div>
 
-                                            <div class="ec-single-wishlist">
+                                            <!-- <div class="ec-single-wishlist">
                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart"></i></a>
-                                            </div>
+                                            </div> -->
+
                                             <!-- <div class="ec-single-quickview">
                                                 <a href="#" class="ec-btn-group quickview" data-link-action="quickview" title="Quick view" data-bs-toggle="modal" data-bs-target="#ec_quickview_modal"><i class="fi-rr-eye"></i></a>
                                             </div> -->
diff --git a/vendor-dashboard.php b/vendor-dashboard.php
index c6a8eab..d0dda4e 100644
--- a/vendor-dashboard.php
+++ b/vendor-dashboard.php
@@ -122,7 +122,7 @@ if (is_array($vendorOrderss)) {
                         <!-- Sidebar Category Block -->
                         <div class="ec-sidebar-block">
                             <div class="ec-vendor-block">
-                                <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-color:orange; 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">
                                     <h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
@@ -160,7 +160,8 @@ if (is_array($vendorOrderss)) {
                                 <h3> <?php echo count($vendorOrders); ?></h3>
                             </div>
                         </div>
-                        <div class="col-lg-3 col-md-6">
+                        <!-- 02-26-2024 Stacy commented out -->
+                        <!-- <div class="col-lg-3 col-md-6">
                             <div class="ec-vendor-dashboard-sort-card color-green">
                                 <h5>Earnings</h5>
                                 <h3>$56<span>/ Day</span></h3>
@@ -171,7 +172,7 @@ if (is_array($vendorOrderss)) {
                                 <h5>Sales</h5>
                                 <h3>550<span>/ Mo</span></h3>
                             </div>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="ec-vendor-dashboard-card space-bottom-30">
                         <div class="ec-vendor-card-header">
@@ -426,7 +427,8 @@ if (is_array($vendorOrderss)) {
                             </div>
                         </div>
                     </div>
-                    <div class="ec-vendor-dashboard-card">
+                    <!-- 02-26-2024 Stacy commented out -->
+                    <!-- <div class="ec-vendor-dashboard-card">
                         <div class="ec-vendor-card-header">
                             <h5>Growth statastics</h5>
                             <div class="ec-header-btn">
@@ -436,7 +438,7 @@ if (is_array($vendorOrderss)) {
                         <div class="ec-vendor-card-body">
                             <canvas id="growthChart"></canvas>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>
diff --git a/vendor-list.php b/vendor-list.php
index fb6a8bc..3897c62 100644
--- a/vendor-list.php
+++ b/vendor-list.php
@@ -179,6 +179,7 @@ $products = productList();
                         <div class="ec-multi-vendor-detail">
                             <div class="ec-page-description ec-page-description-info description-info-list">
                                 <div class="ec-catalog-vendor">
+                                <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>"></a>
                                     <?php
                                         if(!isset($vendor['vendor_image'])){
                                             ?><img src="assets/images/vendor/1.jpg" alt="vendor img"><?php
@@ -198,15 +199,19 @@ $products = productList();
                                                 <p>( Retail Business )</p>
                                             </div>
                                         </div>
-                                        <div class="col-lg-3 col-md-6 detail-card-space">
+                                        <!-- <div class="col-lg-3 col-md-6 detail-card-space">
                                             <div class="ec-catalog-ratings catalog-detail-card">
-                                                <h6>Level</h6>
+                                                <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
+                                                    <h6>Level</h6>
+                                                </a>
                                                 <p>( Level : 9 out of 10 )</p>
                                             </div>
-                                        </div>
+                                        </div> -->
                                         <div class="col-lg-3 col-md-6 detail-card-space">
                                             <div class="ec-catalog-pro-count catalog-detail-card">
-                                                <h6>Seller Products</h6>
+                                                <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
+                                                    <h6>Seller Products</h6>
+                                                </a>
                                                 <?php
                                                         $vendorId = $vendor['_id'];
                                                         $product = array_filter($products, function ($var) use ($vendorId) {
@@ -217,7 +222,9 @@ $products = productList();
                                         </div>
                                         <div class="col-lg-3 col-md-6 detail-card-space">
                                             <div class="ec-catalog-since catalog-detail-card">
-                                                <h6>Seller since</h6>
+                                                <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
+                                                    <h6>Seller since</h6>
+                                                </a>
                                                 <p><?php echo $vendor['date_registered']; ?></p>
                                             </div>
                                         </div>
diff --git a/vendor-settings.php b/vendor-settings.php
index 8e1f553..cc4246c 100644
--- a/vendor-settings.php
+++ b/vendor-settings.php
@@ -155,10 +155,11 @@ if ($_SESSION["userId"] <> "") {
                                             </div>
 
                                             <div class="ec-vendor-block-detail">
-                                            <?php
-                                                $vendor_image_modal = isset($vendorData['vendor_image']) ?$vendorData['vendor_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
+                                                <!-- 02-26-2024 Stacy added placeholder-->
+                                                <?php
+                                                $vendor_image = isset($vendorData[0]['vendor_image']) ? $vendorData[0]['vendor_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
                                                 ?>
-                                                <img class="v-img" src=<?php echo $vendor_image_modal ?> alt="vendor image">
+                                                <img class="v-img" src=<?php echo $vendor_image ?> alt="vendor image">
                                                 <h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
                                             </div>
                                         </div>
diff --git a/wishlist.php b/wishlist.php
index b3005f0..a1e189d 100644
--- a/wishlist.php
+++ b/wishlist.php
@@ -182,7 +182,8 @@ if ($_SESSION["userId"] <> "") {
                                         <input type="checkbox" class="product-checkbox" style="width: 20px; height: 20px; "value="<?php echo $product["_id"]; ?>">
                                             <div class="ec-pro-image-outer">
                                                 <div class="ec-pro-image">
-                                                    <a href="shop-left-sidebar-col-4.php" class="image">
+                                                    <a href="product-left-sidebar.php?id=<?php echo $product["_id"]; ?>" class="image">
+                                                    <!-- <a href="shop-left-sidebar-col-4.php" class="image"> -->
                                                         <img class="main-image" src="<?php echo $product["product_image"]; ?>" alt="Product" />
                                                         <!-- <img class="hover-image" src="<?php echo $product["product_image"]; ?>" alt="Product" /> -->
                                                     </a>
@@ -403,7 +404,8 @@ if ($_SESSION["userId"] <> "") {
         </div>
     <section>
     <!-- Start Offer section -->
-    <section class="labels section-space-p">
+    <!-- raymart remove start offer section from style feb 22 2024-->
+    <!-- <section class="labels section-space-p">
         <div class="container">
             <div class="row">
                 <div class="col-md-12 text-center">
@@ -537,7 +539,7 @@ if ($_SESSION["userId"] <> "") {
 
 
     <!-- Recent Purchase Popup  -->
-    <div class="recent-purchase">
+    <!-- <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>
@@ -545,7 +547,7 @@ if ($_SESSION["userId"] <> "") {
             <p>10 Minutes ago</p>
         </div>
         <a href="javascript:void(0)" class="icon-btn recent-close">×</a>
-    </div>
+    </div> -->
     <!-- Recent Purchase Popup end -->
 
 
-- 
2.40.1