| Line 608... |
Line 608... |
| 608 |
if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
608 |
if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
| 609 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(loginDetails.getFofoId());
|
609 |
CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(loginDetails.getFofoId());
|
| 610 |
activity.setType(ActivityType.COMMUNICATION_IN);
|
610 |
activity.setType(ActivityType.COMMUNICATION_IN);
|
| 611 |
subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
|
611 |
subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
|
| 612 |
message = String.format("Franchisee message - %s", message);
|
612 |
message = String.format("Franchisee message - %s", message);
|
| 613 |
activity.setMessage(message);
|
- |
|
| 614 |
} else {
|
613 |
} else {
|
| 615 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
614 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
| 616 |
activity.setCreatedBy(authUser.getId());
|
615 |
act
|
| 617 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
|
616 |
subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
|
| 618 |
message = String.format("%s's message - %s", authUser.getFirstName(), message);
|
617 |
message = String.format("%s's message - %s", authUser.getFirstName(), message);
|
| 619 |
if (internal) {
|
618 |
if (internal) {
|
| 620 |
activity.setType(ActivityType.COMMUNICATION_INTERNAL);
|
619 |
activity.setType(ActivityType.COMMUNICATION_INTERNAL);
|
| 621 |
// String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
620 |
// String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
| 622 |
} else {
|
621 |
} else {
|
| 623 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
622 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
| 624 |
}
|
623 |
}
|
| 625 |
}
|
624 |
}
|
| - |
|
625 |
activity.setMessage(message);
|
| 626 |
activityRepository.persist(activity);
|
626 |
activityRepository.persist(activity);
|
| 627 |
csService.addActivity(ticket, activity);
|
627 |
csService.addActivity(ticket, activity);
|
| 628 |
AuthUser authUser = authUsersMap.remove(authUserIds.get(0));
|
628 |
AuthUser authUser = authUsersMap.remove(authUserIds.get(0));
|
| 629 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
629 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
| 630 |
String [] cc = authUsersMap.entrySet().stream().map(x->x.getValue().getEmailId()).toArray(String[]::new);
|
630 |
String [] cc = authUsersMap.entrySet().stream().map(x->x.getValue().getEmailId()).toArray(String[]::new);
|