Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
4689 5151 d 8 h anupam.singh /trunk/Crm/src/main/ Trac # 960, 911
Reveiwer : Rajveer

1.) Cancellation flow initiated from CRM.
2.) Agents can assign tickets at the time of creation.
 
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
3405 5323 d 9 h mandeep.dhir /trunk/ Trac#488 Made Tickets and activities non-user specific  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
/trunk/CRMService/pom.xml
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/resources/shiro.ini
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3390 5325 d 8 h mandeep.dhir /trunk/ Trac#488
- Added few more fields customer name etc. to activity and tickets
- Made thrift model objects enriched with creator and assignee objects
- Added search filter to query tickets, activities, agents from CRM with single method
 
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
/trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
/trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/trunk/CRMService/src/main/resources/mybatis-config.xml
/trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
/trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
/trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3339 5330 d 8 h mandeep.dhir /trunk/ Trac#488
- Added support for Inbox scan of help@shop2020.in account and creating tickets for them
- Added support for creating tickets/activities for unregistered users
 
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
/trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
/trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift