Subversion Repositories SmartDukaan

Rev

Rev 37893 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37893 Rev 37991
Line 879... Line 879...
879
 
879
 
880
            // Assignee name (blank if missing)
880
            // Assignee name (blank if missing)
881
            String assignTo = "";
881
            String assignTo = "";
882
            if (authIdAndAuthUserMap.containsKey(lead.getAssignTo())) {
882
            if (authIdAndAuthUserMap.containsKey(lead.getAssignTo())) {
883
                AuthUser user = authIdAndAuthUserMap.get(lead.getAssignTo());
883
                AuthUser user = authIdAndAuthUserMap.get(lead.getAssignTo());
884
                assignTo = (user.getFirstName() + " " + user.getLastName()).trim();
884
                assignTo = user.getFullName();
885
            }
885
            }
886
 
886
 
887
            rows.add(Arrays.asList(
887
            rows.add(Arrays.asList(
888
                    lead.getId(),
888
                    lead.getId(),
889
                    displaySource(lead),
889
                    displaySource(lead),
Line 1177... Line 1177...
1177
        } else {
1177
        } else {
1178
            lead.setColor("Yellow");
1178
            lead.setColor("Yellow");
1179
        }
1179
        }
1180
        // change
1180
        // change
1181
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
1181
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
1182
        String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
1182
        String authUserName = authUser.getFullName();
1183
        lead.setCreatedBy(authUserName);
1183
        lead.setCreatedBy(authUserName);
1184
        lead.setAuthId(authUser.getId());
1184
        lead.setAuthId(authUser.getId());
1185
        LOGGER.info("lead --- {}", lead);
1185
        LOGGER.info("lead --- {}", lead);
1186
        // Stamp before the insert: region, owner, stage and an SLA clock.
1186
        // Stamp before the insert: region, owner, stage and an SLA clock.
1187
        lmsAssignmentService.stamp(lead, "A");
1187
        lmsAssignmentService.stamp(lead, "A");
Line 1480... Line 1480...
1480
        // recipients.add("ranu.rajput@smartdukaan.com");
1480
        // recipients.add("ranu.rajput@smartdukaan.com");
1481
 
1481
 
1482
        String leadName = ((lead.getFirstName() != null ? lead.getFirstName() : "")
1482
        String leadName = ((lead.getFirstName() != null ? lead.getFirstName() : "")
1483
                + " " + (lead.getLastName() != null ? lead.getLastName() : "")).trim();
1483
                + " " + (lead.getLastName() != null ? lead.getLastName() : "")).trim();
1484
        if (leadName.isEmpty()) leadName = "Lead #" + lead.getId();
1484
        if (leadName.isEmpty()) leadName = "Lead #" + lead.getId();
1485
        String assigneeName = ((assignee.getFirstName() != null ? assignee.getFirstName() : "")
1485
        String assigneeName = assignee.getFullName();
1486
                + " " + (assignee.getLastName() != null ? assignee.getLastName() : "")).trim();
-
 
1487
 
1486
 
1488
        String subject = "Lead assigned — " + leadName + " → " + assigneeName;
1487
        String subject = "Lead assigned — " + leadName + " → " + assigneeName;
1489
        StringBuilder text = new StringBuilder();
1488
        StringBuilder text = new StringBuilder();
1490
        text.append("A lead has been assigned.\n\n");
1489
        text.append("A lead has been assigned.\n\n");
1491
        text.append("Lead:        ").append(leadName).append("\n");
1490
        text.append("Lead:        ").append(leadName).append("\n");
Line 1499... Line 1498...
1499
                    .append("\n");
1498
                    .append("\n");
1500
        }
1499
        }
1501
        text.append("Assignee:    ").append(assigneeName).append("\n");
1500
        text.append("Assignee:    ").append(assigneeName).append("\n");
1502
        if (status != null) text.append("Status:      ").append(status).append("\n");
1501
        if (status != null) text.append("Status:      ").append(status).append("\n");
1503
        if (requestedBy != null) {
1502
        if (requestedBy != null) {
1504
            String rbName = ((requestedBy.getFirstName() != null ? requestedBy.getFirstName() : "")
1503
            String rbName = requestedBy.getFullName();
1505
                    + " " + (requestedBy.getLastName() != null ? requestedBy.getLastName() : "")).trim();
-
 
1506
            text.append("Assigned by: ").append(rbName.isEmpty() ? ("#" + requestedBy.getId()) : rbName).append("\n");
1504
            text.append("Assigned by: ").append(rbName.isEmpty() ? ("#" + requestedBy.getId()) : rbName).append("\n");
1507
        }
1505
        }
1508
 
1506
 
1509
        try {
1507
        try {
1510
            javax.mail.internet.MimeMessage message = gmailRelaySender.createMimeMessage();
1508
            javax.mail.internet.MimeMessage message = gmailRelaySender.createMimeMessage();