From d655abe31e238b2de0de45ddee37fc5f5dda36d5 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Thu, 26 Feb 2026 15:18:09 +0530 Subject: [PATCH] FIX_SalesTracker4 --- app/Controllers/LeadsController.php | 24 +-- app/Controllers/SalesController.php | 115 +++++++------ app/Views/layout/header.php | 2 +- app/Views/lead_filter.php | 2 +- app/Views/leads_dash.php | 4 +- app/Views/leads_form.php | 8 +- app/Views/leads_form_handler.php | 4 +- app/Views/leads_list.php | 16 +- app/Views/leads_non_eb.php | 6 +- app/Views/sales/activity_view.php | 160 ++---------------- .../sales/branch_level_dashboard_view.php | 35 ++-- .../sales/sales_manager_level_dashboard.php | 80 ++++++++- app/Views/sales/tracker_view.php | 24 ++- 13 files changed, 219 insertions(+), 261 deletions(-) diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 2c2d9bcf..cfe01bbe 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -302,8 +302,8 @@ class LeadsController extends BaseController public function viewLeadsList() { - $data['tab_name'] = 'Leads'; - $data['page_name'] = 'Leads'; + $data['tab_name'] = 'Opportunities'; + $data['page_name'] = 'Opportunities'; // Set basic data $data['issuer'] = $this->issuer; @@ -372,7 +372,7 @@ class LeadsController extends BaseController 'lead_type' => [ 'rules' => 'integer', - 'errors' => ['required' => 'Lead Type is required'] + 'errors' => ['required' => 'Opportunity Type is required'] ], 'issuer' => [ 'rules' => 'required', @@ -934,10 +934,10 @@ class LeadsController extends BaseController } if (count($insertCount) > 0) { - return $this->respond(['status' => true, 'lead_id' => $insert, 'message' => 'New Lead created successfully', 'data' => $data], 200); + return $this->respond(['status' => true, 'lead_id' => $insert, 'message' => 'New Opportunity created successfully', 'data' => $data], 200); } - return $this->respond(['status' => false, 'lead_id' => $insert, 'message' => "Failed to create Lead", 'data' => $data], 200); + return $this->respond(['status' => false, 'lead_id' => $insert, 'message' => "Failed to create Opportunity", 'data' => $data], 200); } private function updateOldLead($id, $data) @@ -946,9 +946,9 @@ class LeadsController extends BaseController $this->insertMultiFilesData($data[0]['multi_file_data'], $id, $data[0]['lead_form_type']); $this->insertLeadStatus($id, $data[0]['status'], 3); - return $this->respond(['status' => true, 'lead_id' => $id, 'message' => "Lead updated successfully", 'data' => $data], 200); + return $this->respond(['status' => true, 'lead_id' => $id, 'message' => "Opportunity updated successfully", 'data' => $data], 200); } - return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Lead", 'data' => $data], 200); + return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Opportunity", 'data' => $data], 200); } // Get the Single Lead data for edit uisng ajax (do not delete) @@ -1305,7 +1305,7 @@ class LeadsController extends BaseController if (!$lead_data) { // Handle case where lead doesn't exist - throw new \Exception('Lead not found'); + throw new \Exception('Opportunity not found'); } // 4. Conditional query - only fetch if needed @@ -1494,7 +1494,7 @@ class LeadsController extends BaseController $lead_id = $data['lead_id'] ?? null; if (!$lead_id) { - return $this->respond(['status' => false, 'message' => 'Lead ID is required'], 400); + return $this->respond(['status' => false, 'message' => 'Opportunity ID is required'], 400); } $rfq_created = $this->RFQModel->where('lead_id', $lead_id)->where('is_active', 1)->countAllResults(); @@ -2796,7 +2796,7 @@ class LeadsController extends BaseController $file_name_with_path = WRITEPATH . "/uploads/lead_files/" . $lead_data['file_name']; if (!$lead_data) { - return ['status' => 'failed', 'message' => 'Lead data not found']; + return ['status' => 'failed', 'message' => 'Opportunity data not found']; } try{ @@ -5583,7 +5583,7 @@ class LeadsController extends BaseController // dd($file_name_with_path); if (!$lead_data) { - return ['status' => 'failed', 'message' => 'Lead data not found']; + return ['status' => 'failed', 'message' => 'Opportunity data not found']; } if ($lead_data['file_name']) { @@ -6579,7 +6579,7 @@ class LeadsController extends BaseController return $this->respond([ 'status' => false, 'code' => 400, - 'message' => 'Lead ID is required' + 'message' => 'Opportunity ID is required' ], 400); } diff --git a/app/Controllers/SalesController.php b/app/Controllers/SalesController.php index 3de595f8..a830542e 100644 --- a/app/Controllers/SalesController.php +++ b/app/Controllers/SalesController.php @@ -88,7 +88,7 @@ class SalesController extends BaseController } // Otherwise fetch ALL sales managers in this branch - elseif (in_array($role,[1,2,3,4,5])) { + elseif (in_array($role,[1,5])) { $data['users'] = $db->table('user_profiles up') ->select('up.id, up.first_name, up.last_name, up.nhance_branch_id') @@ -793,7 +793,7 @@ class SalesController extends BaseController // dd($logged_user_id, $nhance_branch_id, $role, $team_id ); - if (in_array($role,[5])) { + if (in_array($role,[1,5])) { $sales_manager_ids = array_column( $db->table('user_profiles up') @@ -822,36 +822,46 @@ class SalesController extends BaseController public function branchLevelDashboard($branchId,$sales_manager_ids) { - $data['tab_name'] = 'Dashboard'; - $data['page_name'] = 'Dashboard'; // Hardcoded branch ID as requested // $branchId = 1; try { - // 1. Lead Statistics - $stats = $this->leadModel->getLeadStats(); // Using existing model method - - // 2. Activity Statistics - $activityStats = [ - 'total' => $this->activityModel->countAllResults(), - 'completed' => $this->activityModel->where('status', 'completed')->countAllResults(), - 'pending' => $this->activityModel->where('status', 'pending')->countAllResults(), - ]; - - // 3. Team Performance (Aggregating activity counts per user) - $db = \Config\Database::connect(); - // Final safe check - if (empty($sales_manager_ids)) { + $sales_manager_ids = array_values(array_map('intval', $sales_manager_ids)); + + // Final safe check + if (empty($sales_manager_ids)) { // No valid IDs — skip queries or return empty - $teamPerformance = []; - $recentActivities = []; - $leadsOverview = []; - } else { + $total_leads = 0; + $total_activity = 0; + $total_completed_activity = 0; + $total_pending_activity = 0; + $pending_activities = []; + $recent_activities = []; + $teamPerformance = []; + + $leadsOverview = []; + } else { - if (empty($sales_manager_ids) || !is_array($sales_manager_ids)) { - $sales_manager_ids = array_filter((array) $sales_manager_ids); // removes null, "", 0 - } + if (empty($sales_manager_ids) || !is_array($sales_manager_ids)) { + $sales_manager_ids = array_filter((array) $sales_manager_ids); // removes null, "", 0 + } + + // 1. Lead Statistics + $total_leads = $this->leadModel->whereIn('assigned_to', $sales_manager_ids)->countAllResults(); // Use countAllResults, NOT countAll + // echo $this->leadModel->getLastQuery();die(); + + // 2. Total activity + $total_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->countAllResults(); + // 3. Completed activity + $total_completed_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->where('status', 'completed')->countAllResults(); + + // 4. Pending activity + $total_pending_activity = $this->activityModel->whereIn('assigned_to', $sales_manager_ids)->where('status', 'pending')->countAllResults(); + + $db = \Config\Database::connect(); + + // 5. Team Performance $teamPerformance = $db->table('user_profiles as u') ->select('u.first_name, u.last_name, u.profile as role, (SELECT COUNT(*) FROM sales_activities WHERE assigned_to = u.id) as total_acts, @@ -861,25 +871,25 @@ class SalesController extends BaseController ->where('u.is_active', 1) ->get()->getResultArray(); - // 4. Recent Activities (Joining for Lead Names) - $recentActivities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name') + // 6. Recent Activities (Joining for Lead Names) + $recent_activities = $this->activityModel->select('sales_activities.*, sales_actual_leads.company_name') ->join('sales_actual_leads', 'sales_actual_leads.lead_id = sales_activities.lead_id') ->orderBy('sales_activities.scheduled_date', 'DESC') ->limit(6) ->findAll(); - $sales_manager_ids = array_values(array_map('intval', $sales_manager_ids)); - $recentActivities = $db->table('sales_activities sa') - ->select('sa.activity_id,sa.lead_id,sa.activity_type,sa.scheduled_date,sa.status,sa.assigned_to,sal.company_name,up.first_name AS assigned_to_name') - ->join('(SELECT lead_id, MAX(company_name) AS company_name FROM sales_actual_leads GROUP BY lead_id) sal','sal.lead_id = sa.lead_id','left') + // 7. Pending Activities (List) + $pending_activities = $db->table('sales_activities sa') + ->select('sa.activity_id,sa.lead_id,sa.activity_type,sa.scheduled_date,sa.status,sa.assigned_to,sal.company_name,up.first_name AS assigned_to_name,sa.notes') ->join('user_profiles up', 'up.id = sa.assigned_to', 'left') + ->join('sales_actual_leads sal', 'sal.lead_id = sa.lead_id', 'left') // ✅ ADD THIS ->orderBy('sa.scheduled_date', 'DESC') - ->limit(6) ->whereIn('sa.assigned_to', $sales_manager_ids) + ->where('sa.status', 'pending') ->get()->getResultArray(); - // 5. All Leads Overview - $leadsOverview = $db->table('sales_actual_leads sal') + // 8. All Leads Overview + $leadsOverview = $db->table('sales_actual_leads sal') ->select('sal.lead_id,sal.company_name,sal.status,up.first_name AS assigned_to, COUNT(DISTINCT sa.activity_id) AS activities, COUNT(DISTINCT l.id) AS opportunities @@ -888,39 +898,34 @@ class SalesController extends BaseController ->join('sales_activities sa', 'sa.lead_id = sal.lead_id', 'left') ->join('leads l', 'l.actual_lead_id = sal.lead_id', 'left') ->groupBy('sal.lead_id, sal.company_name, sal.status, up.first_name') - ->having('COUNT(DISTINCT sa.activity_id) + COUNT(DISTINCT l.id) >', 0) // ← this line + // ->having('COUNT(DISTINCT sa.activity_id) + COUNT(DISTINCT l.id) >', 0) // ← this line ->orderBy('sal.created_at', 'DESC') ->whereIn('sal.assigned_to', $sales_manager_ids) ->get() ->getResultArray(); - } - // 6. activityBreakdown - $total = $db->table('sales_activities')->countAll(); - + // 9. Activity BrakDown $activityBreakdown = $db->table('sales_activities') - ->select("activity_type, COUNT(*) AS total, ROUND(COUNT(*) * 100.0 / {$total}, 0) AS percentage", false) + ->select("activity_type, COUNT(*) AS total, ROUND(COUNT(*) * 100.0 / {$total_activity}, 0) AS percentage", false) + ->whereIn('assigned_to', $sales_manager_ids) ->groupBy('activity_type') ->orderBy('total', 'DESC') ->get() ->getResultArray(); - - $teamPerformance = array_filter($teamPerformance, function($row) { - return ($row['total_acts'] + $row['done_acts']) > 0; - }); - - + } $data = [ - 'total_leads' => $stats['total'], - 'total_activities' => $activityStats['total'], - 'completed_acts' => $activityStats['completed'], - 'pipeline_value' => '15.0L', // Hardcoded placeholder from PDF [cite: 14] - 'team' => $teamPerformance, - 'recent_acts' => $recentActivities, - 'leads_overview' => $leadsOverview, + 'total_leads' => $total_leads, + 'total_acts' => $total_activity, + 'total_completed_acts' => $total_completed_activity, + 'total_pending_acts'=> $total_pending_activity, + 'pipeline_value' => '15.0L', // Hardcoded placeholder from PDF [cite: 14] + 'team' => $teamPerformance, + 'recent_acts' => $recent_activities, + 'pending_acts' => $pending_activities, + 'leads_overview' => $leadsOverview, 'activity_breakdown'=> $activityBreakdown, - 'tab_name' => "Sales Dashboard", - 'page_name' => "Sales Dashboard" + 'tab_name' => "Sales Dashboard", + 'page_name' => "Sales Dashboard" ]; // dd($data); diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 67198829..f5109843 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -2073,7 +2073,7 @@ /assets/images/leads_sb.png" alt="Logo" height="20"> - Leads + Opportunities diff --git a/app/Views/lead_filter.php b/app/Views/lead_filter.php index 07cf83bb..620d4a08 100644 --- a/app/Views/lead_filter.php +++ b/app/Views/lead_filter.php @@ -39,7 +39,7 @@
- + - + $value) { @@ -739,7 +739,7 @@ hide_list_show_add(); - var page_title = 'Edit Lead'; + var page_title = 'Edit Opportunity'; $('#page_title').text(page_title); $('#leads_primarykey').val(res.data.id); diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php index 01960410..69b7b665 100644 --- a/app/Views/leads_form_handler.php +++ b/app/Views/leads_form_handler.php @@ -954,7 +954,7 @@ if (isset($selected_lead_type)) { hide_list_show_add(); - $('#page_title').text('Edit Lead'); + $('#page_title').text('Edit Opportunity'); $('#leads_primarykey').val(data.id || ''); $('#actual_lead_id').val(data.actual_lead_id || 0); $('#policy_start_date').val(data.policy_end_date || ''); @@ -1129,7 +1129,7 @@ if (isset($selected_lead_type)) { } } - $('#page_title').text('Edit Lead'); + $('#page_title').text('Edit Opportunity'); $('#leads_primarykey').val(data.id || ''); $('#actual_lead_id').val(data.actual_lead_id || 0); $('#policy_start_date').val(data.policy_end_date || ''); diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php index 98b9f232..7ad9f74a 100644 --- a/app/Views/leads_list.php +++ b/app/Views/leads_list.php @@ -151,7 +151,7 @@ table.dataTable tbody td {
-

Leads List

+

Opportunities List

@@ -165,7 +165,7 @@ table.dataTable tbody td {
S.No  
-
Lead Type  
+
Opportunity Type  
Issuer  
Client Type  
Client / Branch  
@@ -257,7 +257,7 @@ table.dataTable tbody td {
- +
@@ -265,14 +265,14 @@ table.dataTable tbody td {
- +
- +
@@ -467,7 +467,7 @@ table.dataTable tbody td { lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]], buttons: [ { - text: 'Add', + text: ' Add ', className: 'btn app-btn-primary mr-2', action: function(e, dt, node, config) { openLeadTypeAskModal(); @@ -481,7 +481,7 @@ table.dataTable tbody td { { extend: 'csv', text: ' CSV ', - title: 'Policy-Tranction-Inception-List', + title: 'Opportunity-List', className: 'app-btn-primary ', exportOptions: { columns: ':not(:last-child)' @@ -523,7 +523,7 @@ table.dataTable tbody td { // let Lead_type = $('#openLeadTypeAskModal').val() let Lead_type = $('input[name="lead_form_type"]:checked').val(); console.log('Lead_type ', Lead_type) - let url = '' + Lead_type + let url = '' + Lead_type + '/0'; console.log('url ', url) window.location.href = url; diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php index 6d2049f0..e41f6026 100644 --- a/app/Views/leads_non_eb.php +++ b/app/Views/leads_non_eb.php @@ -66,7 +66,7 @@ - Add Lead + Add Opportunity
- + + + + +
@@ -283,7 +284,7 @@ - + @@ -352,7 +353,7 @@ - + @@ -502,7 +503,8 @@
- + +
@@ -934,7 +936,7 @@ function renderCard(opps) { } function renderTimeline(acts) { const cont = document.getElementById('timelineContainer'); - const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🎬", Share: "📄", Todo: "✓" }; + const activityIcons = { Call: "📞", Email: "✉️", Meeting: "📅", Visit: "🚗",Demo: "🖥️", Share: "📄", Todo: "✓" }; if (acts.length === 0) { cont.classList.add('no-line'); @@ -1044,7 +1046,8 @@ document.getElementById('addLeadForm').onsubmit = async (e) => { let companyRegex = /^[A-Za-z\s]+$/; let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - let phoneRegex = /^\+?[0-9\s]{10,20}$/; // Phone regex (+, numbers, spaces allowed, 10-20 length) + // let phoneRegex = /^\+?[0-9\s]{0,10}$/; // Phone regex (+, numbers, spaces allowed, 10-20 length) + let phoneRegex = /^\d{10}$/; // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field function showError(message, fieldName) { @@ -1081,7 +1084,8 @@ document.getElementById('addLeadForm').onsubmit = async (e) => { } if (phone && !phoneRegex.test(phone)) { - return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone'); + // return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone'); + return showError("Phone number can contain only numbers (10 digits)", 'phone'); } if (!data.status) { @@ -1170,7 +1174,8 @@ document.getElementById('editLeadForm').onsubmit = async (e) => { let companyRegex = /^[A-Za-z\s]+$/; let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - let phoneRegex = /^\+?[0-9\s]{10,20}$/; + // let phoneRegex = /^\+?[0-9\s]{10,20}$/; + let phoneRegex = /^\d{10}$/; let gstRegex = /^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z][0-9A-Z]Z[0-9A-Z]$/; // 1. HELPER FUNCTION: Shows Toastr and focuses the specific field @@ -1208,7 +1213,8 @@ document.getElementById('editLeadForm').onsubmit = async (e) => { } if (phone && !phoneRegex.test(phone)) { - return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone'); + // return showError("Phone number can contain only +, numbers and spaces (10–20 digits).", 'phone'); + return showError("Phone number can contain only numbers (10 digits)", 'phone'); } if (gst && !gstRegex.test(gst)) {