WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js

             leadActivityData['id'] = leadId;
             leadActivityData['remark'] = remark;
             leadActivityData['assignTo'] = assignTo
             leadActivityData['status'] = editStatus
             leadActivityData['reason'] = reason
-            leadActivityData['colorCheck'] = conversionprobability
+            leadActivityData['colorCheck'] = (conversionprobability === "true" || conversionprobability === true)
             if (city && city.trim() !== "") {
                 leadActivityData.city = city;
+            }
             if (state && state.trim() !== "") {
+            }
             if (editStatus == "followUp") {
                 leadActivityData['communicationType'] = communicationType
+                var beatVal = $('#beatDate').val();
+                if (beatVal) {
-                leadActivityData['scheldule'] = getDatesFromPicker('input[name="editScheduleTime"]').startDate
+                    // Scheduling by beat — derive schedule from the beat's planDate
-                if (communicationType == 'VISIT') {
+                    // (default to noon) and forward the selection for both VISIT
+                    // and TELEPHONIC so the lead lands on that beat's route.
-                    var beatVal = $('#beatDate').val();
+                    var beatDate = beatVal.split('|')[0];
-                    if (beatVal) {
+                    leadActivityData['scheldule'] = beatDate + 'T12:00:00';
-                        leadActivityData['beatSelection'] = beatVal;
+                    leadActivityData['beatSelection'] = beatVal;
-                    }
+                } else {
+                    leadActivityData['scheldule'] = getDatesFromPicker('input[name="editScheduleTime"]').startDate
+                }
+            }
             console.log(leadActivityData);
             if (confirm("Are you sure you want to add lead!") == true) {
         $('#assignTo option').show();
+    }
+}
+// Clicking or changing status with a pre-existing Assign To selection clears it,
+// so the user must reconfirm the assignee for the new status (avoids stale assignment).
+$(document).on('mousedown change', '#editStatus', function () {
+    if ($('#assignTo').val()) {
+        $('#assignTo').val('');
+        $('#assignTo option').show();
+        $('#beatDate').val('');
+        $('#beatBadges').empty();
+        $("#beatDateSelection").hide();
+        $("#editScheduleTime").show();
+    }
+});
 function loadLeadSearchInfo(search_text) {
     loadSearchLead("main-content", search_text);
+}
 function loadTeamCommitment(domId) {
 // Communication type change: filter assignTo based on type
 $(document).on('change', '#communicationType', function () {
     var val = $(this).val();
     var assignDropdown = $('#assignTo');
-    // Reset beat
+    // Reset beat + restore manual date input
     $('#beatDate').val('');
     $('#beatBadges').empty();
     $("#beatDateSelection").hide();
+    $("#editScheduleTime").show();
     if (val == 'VISIT') {
         // Filter assignTo to sales users only (no BGC)
         if (typeof salesUserIds !== 'undefined') {
             assignDropdown.find('option').each(function () {
                 } else {
                     $(this).show();
+                }
             });
+        }
-        // If assignTo already selected, fetch beats immediately
-        if (assignDropdown.val()) {
-            fetchBeatDates();
-        }
     } else {
         // TELEPHONIC — show all users
         assignDropdown.find('option').show();
+    }
+    // Both VISIT and TELEPHONIC offer beat-day slots when an assignee is set
+    // (TELEPHONIC just uses the beat date as the call slot; backend won't
+    // attach a LeadRoute for it). Non-sales assignees simply get an empty list.
+    if (val && assignDropdown.val()) {
+        fetchBeatDates();
+    }
 });
-// Fetch beats when communicationType or assignTo changes
+// Fetch beats when assignTo changes (works for both VISIT and TELEPHONIC)
-$(document).on('change', '#communicationType, #assignTo', function () {
+$(document).on('change', '#assignTo', function () {
     var commType = $('#communicationType').val();
     var salesAuthId = $('#assignTo').val();
-    if (commType === 'VISIT' && salesAuthId && leadId) {
+    if (commType && salesAuthId && leadId) {
         fetchBeatDates();
-    } else if (commType !== 'VISIT') {
+    } else if (!commType) {
         $("#beatDateSelection").hide();
+    }
 });
 function fetchBeatDates() {
     var salesAuthId = $('#assignTo').val();
-    var scheduleDate = $('input[name="editScheduleTime"]').val();
     if (!salesAuthId || !leadId) return;
     var badgesDiv = $('#beatBadges');
     badgesDiv.html('<span style="color:#999; font-size:12px;">Loading beats...</span>');
     $("#beatDateSelection").show();
     $('#beatDate').val('');
     var url = context + "/lead-geo/beat-dates?leadId=" + leadId + "&salesAuthId=" + salesAuthId;
-    if (scheduleDate) {
-        url += "&scheduleDate=" + encodeURIComponent(scheduleDate);
-    }
     $.ajax({
         url: url,
         method: 'GET',
         success: function (response) {
             var data = response.response || response;
             badgesDiv.empty();
-            // Show the nearest store to the lead's geo location
+            // Stores within radius of the lead — show count + top 3 inline.
+            var radius = (data && data.radiusKm) ? data.radiusKm : 30;
-            if (data && data.nearestStore) {
+            var stores = (data && data.nearestStores) || [];
+            if (stores.length > 0) {
+                var preview = stores.slice(0, 3).map(function (s) {
+                    return '<strong>' + s.code + ' - ' + s.name + '</strong> (' + s.distanceKm + ' km)';
-                var ns = data.nearestStore;
+                }).join(', ');
+                var more = stores.length > 3 ? ' +' + (stores.length - 3) + ' more' : '';
                 badgesDiv.append('<div style="font-size:12px; color:#333; margin-bottom:6px;">' +
-                    'Lead is nearest to: <strong>' + ns.code + ' - ' + ns.name + '</strong> ' +
+                    stores.length + ' partner store(s) within ' + radius + ' km of this lead: ' +
-                    '<span style="color:#e67e22;">(' + ns.distanceKm + ' km)</span></div>');
+                    preview + more + '</div>');
+            }
-            // Show beat slots — these are dates the sales person visits the nearest store
+            // All upcoming beat-dates for the assignee that touch any nearby store.
             if (data && data.beats && data.beats.length > 0) {
                 badgesDiv.append('<div style="font-weight:bold; font-size:11px; color:#666; margin-bottom:4px;">Available Slots (near this lead):</div>');
-                var beats = data.beats.slice(0, 5);
+                var beats = data.beats;
                 for (var i = 0; i < beats.length; i++) {
                     var beat = beats[i];
                     var nearTxt = beat.nearStore ? ' &middot; near ' + beat.nearStore : '';
                     var badge = $('<span class="beat-badge" style="' +
                         'display:inline-block; background:#337ab7; color:#fff; padding:6px 12px; ' +
             badgesDiv.html('<span style="color:#d9534f; font-size:12px;">Error loading beats</span>');
+        }
     });
+}
-// Click on beat badge to select it
+// Click on beat badge to select it. A picked beat becomes the schedule
+// source — the manual date input is hidden (not needed when scheduling by beat).
 $(document).on('click', '.beat-badge', function () {
-    // Deselect others
     $('.beat-badge').css({'background': '#337ab7', 'border-color': '#337ab7'});
-    // Select this one
     $(this).css({'background': '#1a5276', 'border-color': '#f39c12', 'border-width': '2px'});
     $('#beatDate').val($(this).data('value'));
+    $("#editScheduleTime").hide();
 });
 // Generate Geo Link for lead
 $(document).on('click', '.generateGeoLink', function (e) {
     e.stopPropagation();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js – Rev 36740 → 36741