| Line 603... |
Line 603... |
| 603 |
if (ticket.getCloseTimestamp() == null) {
|
603 |
if (ticket.getCloseTimestamp() == null) {
|
| 604 |
Activity activity = new Activity();
|
604 |
Activity activity = new Activity();
|
| 605 |
activity.setCreatedBy(0);
|
605 |
activity.setCreatedBy(0);
|
| 606 |
activity.setCreateTimestamp(LocalDateTime.now());
|
606 |
activity.setCreateTimestamp(LocalDateTime.now());
|
| 607 |
String subject = null;
|
607 |
String subject = null;
|
| - |
|
608 |
String mailMessage=null;
|
| 608 |
activity.setMessage(message);
|
609 |
activity.setMessage(message);
|
| 609 |
if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
610 |
if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
| 610 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(loginDetails.getFofoId());
|
611 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(loginDetails.getFofoId());
|
| 611 |
activity.setType(ActivityType.COMMUNICATION_IN);
|
612 |
activity.setType(ActivityType.COMMUNICATION_IN);
|
| 612 |
subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
|
613 |
subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
|
| 613 |
message = String.format("Franchisee message - %s", message);
|
614 |
mailMessage = String.format("Franchisee message - %s", message);
|
| 614 |
} else {
|
615 |
} else {
|
| 615 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
616 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
| 616 |
activity.setCreatedBy(authUser.getId());
|
617 |
activity.setCreatedBy(authUser.getId());
|
| 617 |
authUsersMap.remove(authUser.getId());
|
618 |
authUsersMap.remove(authUser.getId());
|
| 618 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
|
619 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
|
| 619 |
message = String.format("%s's message - %s", authUser.getFirstName(), message);
|
620 |
mailMessage = String.format("%s's message - %s", authUser.getFirstName(), message);
|
| 620 |
if (internal) {
|
621 |
if (internal) {
|
| 621 |
activity.setType(ActivityType.COMMUNICATION_INTERNAL);
|
622 |
activity.setType(ActivityType.COMMUNICATION_INTERNAL);
|
| 622 |
// String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
623 |
// String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
| 623 |
} else {
|
624 |
} else {
|
| 624 |
String updatedBy = "SD Team";
|
625 |
String updatedBy = "SD Team";
|
| 625 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(ticket.getFofoId());
|
626 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(ticket.getFofoId());
|
| 626 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), updatedBy);
|
627 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), updatedBy);
|
| 627 |
message = String.format("%s's message - %s", updatedBy, message);
|
628 |
String partnerMessage = String.format("%s's message - %s", updatedBy, message);
|
| 628 |
this.activityRelatedMail(customRetailer.getEmail(), null, "subject", message);
|
629 |
this.activityRelatedMail(customRetailer.getEmail(), null, "subject", partnerMessage);
|
| 629 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
630 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
| 630 |
}
|
631 |
}
|
| 631 |
}
|
632 |
}
|
| 632 |
activityRepository.persist(activity);
|
633 |
activityRepository.persist(activity);
|
| 633 |
csService.addActivity(ticket, activity);
|
634 |
csService.addActivity(ticket, activity);
|
| Line 635... |
Line 636... |
| 635 |
if(authUser==null) {
|
636 |
if(authUser==null) {
|
| 636 |
authUser = authUsersMap.remove(authUserIds.get(1));
|
637 |
authUser = authUsersMap.remove(authUserIds.get(1));
|
| 637 |
}
|
638 |
}
|
| 638 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
639 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
| 639 |
String [] cc = authUsersMap.entrySet().stream().map(x->x.getValue().getEmailId()).toArray(String[]::new);
|
640 |
String [] cc = authUsersMap.entrySet().stream().map(x->x.getValue().getEmailId()).toArray(String[]::new);
|
| 640 |
this.activityRelatedMail(authUser.getEmailId(), cc, subject, message);
|
641 |
this.activityRelatedMail(authUser.getEmailId(), cc, subject, mailMessage);
|
| 641 |
} else {
|
642 |
} else {
|
| 642 |
throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
|
643 |
throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
|
| 643 |
}
|
644 |
}
|
| 644 |
return "response";
|
645 |
return "response";
|
| 645 |
}
|
646 |
}
|