Subversion Repositories SmartDukaan

Rev

Rev 4034 | Rev 4206 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4034 Rev 4035
Line 385... Line 385...
385 
 
 385 
 
386 
            if (userId != null && !userId.isEmpty()) {
 386 
            if (userId != null && !userId.isEmpty()) {
387 
                activity.setCustomerId(Long.parseLong(userId));
 387 
                activity.setCustomerId(Long.parseLong(userId));
388 
            }
 388 
            }
389 
 
 389 
 
- 
 
 390 
            // Handling null values appropriately
- 
 
 391 
            if (assigneeEmailId != null && !assigneeEmailId.isEmpty()) {
- 
 
 392 
                long assigneeId = CRMAuthorizingRealm.getAgent(assigneeEmailId)
- 
 
 393 
                        .getId();
- 
 
 394 
                ticket.setAssigneeId(assigneeId);
- 
 
 395 
                activity.setTicketAssigneeId(assigneeId);
- 
 
 396 
            }
- 
 
 397 
 
390 
            if (ActivityType.SEND_EMAIL_TO_CUSTOMER.equals(activity.getType())) {
 398 
            if (ActivityType.SEND_EMAIL_TO_CUSTOMER.equals(activity.getType())) {
391 
                log.info("Sending mail");
 399 
                log.info("Sending mail");
392 
                Client helperClient = new HelperClient().getClient();
 400 
                Client helperClient = new HelperClient().getClient();
393 
                activity.setUserEmailId(helperClient.saveUserEmailForSending(
 401 
                activity.setUserEmailId(helperClient.saveUserEmailForSending(
394 
                        customerEmailId, CRMConstants.CRM_EMAIL_SENDOR,
 402 
                        customerEmailId, CRMConstants.CRM_EMAIL_SENDOR,
Line 427... Line 435...
427 
                // closes
 435 
                // closes
428 
                activity.setDescription("To: " + toMailIds + "\n\nSubject: " + escalationMailSubject + "\n\n"
 436 
                activity.setDescription("To: " + toMailIds + "\n\nSubject: " + escalationMailSubject + "\n\n"
429 
                        + "Body: " + escalationMailBody);
 437 
                        + "Body: " + escalationMailBody);
430 
            }
 438 
            }
431 
 
 439 
 
432 
            // handling null values appropriately
 - 
 
433 
            if (assigneeEmailId != null && !assigneeEmailId.isEmpty()) {
 - 
 
434 
                long assigneeId = CRMAuthorizingRealm.getAgent(assigneeEmailId)
 - 
 
435 
                        .getId();
 - 
 
436 
                ticket.setAssigneeId(assigneeId);
 - 
 
437 
                activity.setTicketAssigneeId(assigneeId);
 - 
 
438 
            }
 - 
 
439 
 
 - 
 
440 
            User user = null;
 440 
            User user = null;
441 
            userContextServiceClient = new UserClient().getClient();
 441 
            userContextServiceClient = new UserClient().getClient();
442 
            try {
 442 
            try {
443 
                if (customerName != null && !customerName.isEmpty()) {
 443 
                if (customerName != null && !customerName.isEmpty()) {
444 
                    ticket.setCustomerName(customerName);
 444 
                    ticket.setCustomerName(customerName);