Subversion Repositories SmartDukaan

(root)//trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm – Rev 9184

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

Filtering Options

From rev	To rev	Max revs

Search history for

Show All

Rev	Age	Author	Path	Log message	Diff	Changes
9184	4518 d 10 h	manish.sharma	/trunk/Crm/src/main/webapp/WEB-INF/content/	Committed by Manish Sharma for Attachment URL Encoding Issue on Dec-20-2013		/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
9181	4518 d 10 h	manish.sharma	/trunk/Crm/src/main/webapp/WEB-INF/content/	Committed by Manish Sharma for Attachment URL Encoding Issue on Dec-20-2013		/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
9180	4518 d 10 h	manish.sharma	/trunk/Crm/src/main/webapp/WEB-INF/content/	Committed by Manish Sharma for Attachment URL Encoding Issue on Dec-20-2013		/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
4241	5243 d 13 h	anupam.singh	/trunk/	TracId : #684, #740 Reviewer : Mandeep Dhir 1. Provided a selection list to choose a category for the reason of COD order cancellation. 2. In ticket edit view, showed links to view activity description. 3. Generating activity for bounced mail from send-grid now possible. 4. Column width of tables now different for different columns 5. Files attached in emails from users to CRM agents now visible in the UI. 6. UI enhancements.		/trunk/Crm/src/main/java/in/shop2020/util/EmailUtils.java /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml /trunk/Crm/.project /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.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/serving/controllers/UserOrdersController.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/activity-info-index.vm /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-edit.vm /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-cart-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-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/Activity.java /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3499	5330 d 13 h	mandeep.dhir	/trunk/	Trac#504 Added functionality to help CRM agents to verify COD orders		/trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.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/UserInfoController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.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/activity-info-index.vm /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-edit.vm /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-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/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
3411	5337 d 16 h	mandeep.dhir	/trunk/Crm/src/main/webapp/	Trac#488 Adding a few CSS properties		/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/webapp/css/common.css
3410	5337 d 16 h	mandeep.dhir	/trunk/Crm/src/main/webapp/WEB-INF/content/	Trac#488 Displaying ticket description in detailed activity view		/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
3405	5337 d 17 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
3397	5338 d 18 h	mandeep.dhir	/trunk/Crm/src/main/	Trac#488 Adding advanced search box		/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java /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/webapp/WEB-INF/content/index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.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/css/common.css /trunk/Crm/src/main/webapp/js/common.js /trunk/Crm/src/main/webapp/js/events.js
3390	5339 d 16 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	5344 d 16 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
3106	5360 d 15 h	mandeep.dhir	/trunk/	Trac#488 - Added ActivityType and remodelled ticket/activity a bit. - Made hyperlinks to go to ticket details from activity page - Clicking on 'Saholic URL', the header will go to home page - Added styling over HTML tables displaying shipment updates and activities for a ticket - Removed unnecessary columns from the UI		/trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.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/resources/in/shop2020/crm/persistence/ActivityMapper.xml /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.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/UserActivityController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.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/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-order-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/Activity.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3090	5361 d 17 h	mandeep.dhir	/trunk/Crm/	Trac#488 Added ticket and activity management UIs. Also, added authentication and authorization related features. Logistics' shipment updates are displayed now for every order.		/trunk/Crm/src/main/java/in/shop2020/serving/auth /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java /trunk/Crm/src/main/java/in/shop2020/serving/auth/VerboseFilter.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/LoginController.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/resources/shiro.ini /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/change-password.html /trunk/Crm/src/main/webapp/js/jquery.truncate.min.js /trunk/Crm/src/main/webapp/js/jquery.validate.js /trunk/Crm/src/main/webapp/login.html /trunk/Crm/pom.xml /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/UserOrderInfoController.java /trunk/Crm/src/main/resources/log4j.properties /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/user-order-info-index.vm /trunk/Crm/src/main/webapp/WEB-INF/web.xml /trunk/Crm/src/main/webapp/css/common.css /trunk/Crm/src/main/webapp/js/common.js /trunk/Crm/src/main/webapp/js/events.js