Subversion Repositories SmartDukaan

Rev

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

Rev 24620 Rev 24621
Line 635... Line 635...
635
			activity.setMessage(message);
635
			activity.setMessage(message);
636
			activity.setCreatedBy(authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getId());
636
			activity.setCreatedBy(authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getId());
637
			activity.setTicketId(ticketId);
637
			activity.setTicketId(ticketId);
638
			activity.setCreateTimestamp(LocalDateTime.now());
638
			activity.setCreateTimestamp(LocalDateTime.now());
639
			activity.setType(ActivityType.COMMUNICATION_OUT);
639
			activity.setType(ActivityType.COMMUNICATION_OUT);
640
			//this.activityRelatedMail(to, null, subject, message);
640
			this.activityRelatedMail(to, null, subject, message);
641
		} else {
641
		} else {
642
			if (ActivityType.RESOLVED_ACCEPTED == lastActivity) {
642
			if (ActivityType.RESOLVED_ACCEPTED == lastActivity) {
643
				ticket.setLastActivity(lastActivity);
643
				ticket.setLastActivity(lastActivity);
644
				ticket.setCloseTimestamp(LocalDateTime.now());
644
				ticket.setCloseTimestamp(LocalDateTime.now());
645
				activity.setMessage(ActivityType.RESOLVED.toString());
645
				activity.setMessage(ActivityType.RESOLVED.toString());
Line 656... Line 656...
656
				activity.setMessage(INTERNAL_REOPEN_ACTIVITY_MESSAGE);
656
				activity.setMessage(INTERNAL_REOPEN_ACTIVITY_MESSAGE);
657
				activity.setCreatedBy(0);
657
				activity.setCreatedBy(0);
658
				activity.setTicketId(ticketId);
658
				activity.setTicketId(ticketId);
659
				activity.setType(ActivityType.COMMUNICATION_IN);
659
				activity.setType(ActivityType.COMMUNICATION_IN);
660
				activity.setCreateTimestamp(LocalDateTime.now());
660
				activity.setCreateTimestamp(LocalDateTime.now());
661
				//this.activityRelatedMail(to, cc, subject, message);
661
				this.activityRelatedMail(to, cc, subject, message);
662
				//this.activityRelatedMail(retailerService.getFofoRetailer(loginDetails.getFofoId()).getEmail(), null, subject, String.format(PARTNER_REOPEN, ticketId));
662
				this.activityRelatedMail(retailerService.getFofoRetailer(loginDetails.getFofoId()).getEmail(), null, subject, String.format(PARTNER_REOPEN, ticketId));
663
			}
663
			}
664
 
664
 
665
		}
665
		}
666
		ticketRepository.persist(ticket);
666
		ticketRepository.persist(ticket);
667
		activityRepository.persist(activity);
667
		activityRepository.persist(activity);