From 1b7b1e0f83c57d27a3698d433772c2b5d7add6b1 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Mon, 23 Mar 2026 09:11:40 +0530
Subject: [PATCH] FIX_SalesTracker_QA2

---
 app/Views/sales/activity_view.php |  4 ++--
 app/Views/sales/tracker_view.php  | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/Views/sales/activity_view.php b/app/Views/sales/activity_view.php
index 5aeb31fe..687c9fb0 100644
--- a/app/Views/sales/activity_view.php
+++ b/app/Views/sales/activity_view.php
@@ -123,7 +123,7 @@
     .timeline-item:last-child::before { display: none !important;}
 
     /* opportunities Styling */
-    .opportunities-list {  display: grid;  gap: 15px;}
+    .opportunities-list {  display: grid;  gap: 15px; margin-bottom: 12px; }
     .opportunity-card {  background: white;  border-radius: 12px;  padding: 20px;  border: 1px solid #e0e0e0;  transition: all 0.2s;}
     .opportunity-header {  display: flex;  justify-content: space-between;  align-items: start;  margin-bottom: 15px;}
     .opportunity-title {  font-weight: 600;  font-size: 16px;  margin-bottom: 5px;}
@@ -814,7 +814,7 @@ function renderCard(opps) {
         // ${o.client_short_name}
         return `
             <div class="opportunities-list" id="leadOpportunitiesList">
-                <div class="opportunity-card">
+                <div class="opportunity-card" style="bottom:2px;">
                     <div class="opportunity-header">
                         <div class="opportunity-title">${lead_type}</div>
                     </div>
diff --git a/app/Views/sales/tracker_view.php b/app/Views/sales/tracker_view.php
index bb50e05d..a130b2bc 100644
--- a/app/Views/sales/tracker_view.php
+++ b/app/Views/sales/tracker_view.php
@@ -71,7 +71,7 @@
     .timeline-item:last-child::before { display: none !important;}
 
     /* opportunities Styling */
-    .opportunities-list {  display: grid;  gap: 15px;}
+    .opportunities-list {  display: grid;  gap: 15px; margin-bottom: 12px; }
     .opportunity-card {  background: white;  border-radius: 12px;  padding: 20px;  border: 1px solid #e0e0e0;  transition: all 0.2s;}
     .opportunity-header {  display: flex;  justify-content: space-between;  align-items: start;  margin-bottom: 15px;}
     .opportunity-title {  font-weight: 600;  font-size: 16px;  margin-bottom: 5px;}
@@ -657,7 +657,7 @@
                                                 <button type="button" id="btnSaveContact" class="btn btn-sm btn-info text-white" style="width:42%" title="Save">
                                                     ✔ 
                                                 </button>
-                                                <button type="button" id="btnClearContact" class="btn btn-sm btn-secondary text-white" style="width:42%" title="Clear">
+                                                <button type="button" id="btnClearContact" class="btn btn-sm btn-danger text-white" style="width:42%" title="Clear">
                                                     ✕
                                                 </button>
                                             </div>
@@ -1101,7 +1101,7 @@ function renderCard(opps) {
         // ${o.client_short_name}
         return `
             <div class="opportunities-list" id="leadOpportunitiesList">
-                <div class="opportunity-card">
+                <div class="opportunity-card" style="bottom:2px;">
                     <div class="opportunity-header">
                         <div class="opportunity-title">${lead_type}</div>
                     </div>
@@ -1903,16 +1903,23 @@ async function openEditLeadModal(id) {
                             <div class="fw-bold text-truncate" style="font-size:14px;">${contact.name} ${primaryBadge}</div>
                         </div>
 
-                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;">${contact.mobile}</div>
-                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;"><div class="text-truncate">${contact.designation}</div></div>
+                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;">${contact.mobile || '-'}</div>
+                        <div style="flex: 2; min-width: 0; color:#666; font-size:13px;"><div class="text-truncate">${contact.designation || '-'}</div></div>
 
                         <div class="d-flex" style="gap:5px;">
                             <button type="button" class="btnEditContact" data-id="${contact.contact_id}" data-info='${JSON.stringify(contact)}' title="Edit Contact Person"
-                                style="background:none; border:none; cursor:pointer; color:#1976d2; font-size:18px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;"
-                                onmouseover="this.style.background='#e3f2fd'" onmouseout="this.style.background='none'">✏️</button>
+                                style="background:none; border:none; cursor:pointer; font-size:16px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;"
+                                onmouseover="this.style.background='#e3f2fd'; this.querySelector('i').style.color='#1976d2';" 
+                                onmouseout="this.style.background='none'; this.querySelector('i').style.color='#555';">
+                                <i class="ri-pencil-fill" style="color:#555;"></i>
+                            </button>
+
                             <button type="button" class="btnRemoveContact" data-id="${contact.contact_id}" title="Remove Contact Person"
-                                style="background:none; border:none; cursor:pointer; color:#1976d2; font-size:18px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;" 
-                                onmouseover="this.style.background='#ffebee'" onmouseout="this.style.background='none'">🗑️</button>
+                                style="background:none; border:none; cursor:pointer; font-size:16px; flex-shrink:0; padding:4px 6px; border-radius:6px; transition:background 0.2s;"
+                                onmouseover="this.style.background='#ffebee'; this.querySelector('i').style.color='#d32f2f';" 
+                                onmouseout="this.style.background='none'; this.querySelector('i').style.color='#555';">
+                                <i class="ri-delete-bin-fill" style="color:#555;"></i>
+                            </button>
                         </div>
                     </div>
                 `;
@@ -1950,7 +1957,7 @@ document.getElementById('contactPersonsList').onclick = async (e) => {
         document.getElementById('contact_is_primary').checked = contactData.is_primary == 1;
 
         // Change Button UI
-        document.getElementById('btnSaveContact').innerHTML = "✏️";
+        document.getElementById('btnSaveContact').innerHTML = "<i class='ri-pencil-fill'></i>";
         document.getElementById('btnSaveContact').title = "Update";
         document.getElementById('btnSaveContact').style.background = "#02a8b5";
         document.getElementById('contact_name').focus();