Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
16094 3926 d 8 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
16093 3926 d 8 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
16092 3926 d 8 h amit.gupta /trunk/Crm/src/main/ description is now htmlsafe.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
5224 5082 d 2 h amar.kumar /trunk/Crm/src/main/ changes to fix issues in creation of activitites for existing customer  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/js/common.js
5203 5086 d 1 h amar.kumar /trunk/Crm/src/main/ Ticket Id : #1265 #1277
Reviewed by : Anupam Singh

Enhancements in Activity creation/display and ticket/activity reports.		  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.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/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
4241 5229 d 5 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
4205 5240 d 21 h mandeep.dhir /trunk/Crm/src/main/webapp/WEB-INF/content/ Added null check for ticket category  
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
4142 5257 d 9 h mandeep.dhir /trunk/ Trac#686 UI Enhancements in Crm
- Revamped Order info page
- Cleaned up code to access the model objects directly in vm files
- Added advanced search options for ticket category and activity type
- Removed code related to UserCommunications
- Improved CartPageController and vm files
- Changed ticket edit page to reflect first orders and then tickets		  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-communication-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-index.vm
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.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/UserCartController.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/CRMEmailProcessor.java
/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/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.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
3499 5316 d 5 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
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