Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
4241 5133 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
2674 5290 d 3 h vikas /trunk/Crm/ CRM.  
/trunk/Crm
/trunk/Crm/.classpath
/trunk/Crm/.project
/trunk/Crm/.settings
/trunk/Crm/.settings/org.eclipse.jdt.core.prefs
/trunk/Crm/.settings/org.maven.ide.eclipse.prefs
/trunk/Crm/pom.xml
/trunk/Crm/src
/trunk/Crm/src/main
/trunk/Crm/src/main/java
/trunk/Crm/src/main/java/in
/trunk/Crm/src/main/java/in/shop2020
/trunk/Crm/src/main/java/in/shop2020/serving
/trunk/Crm/src/main/java/in/shop2020/serving/controllers
/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/OrderCustomerInputController.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/resources
/trunk/Crm/src/main/resources/log4j.properties
/trunk/Crm/src/main/resources/struts.xml
/trunk/Crm/src/main/resources/velocity.properties
/trunk/Crm/src/main/webapp
/trunk/Crm/src/main/webapp/WEB-INF
/trunk/Crm/src/main/webapp/WEB-INF/content
/trunk/Crm/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/order-customer-input-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/WEB-INF/web.xml
/trunk/Crm/src/main/webapp/css
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/css/demo_table.css
/trunk/Crm/src/main/webapp/images
/trunk/Crm/src/main/webapp/images/Sorting icons.psd
/trunk/Crm/src/main/webapp/images/back_disabled.jpg
/trunk/Crm/src/main/webapp/images/back_enabled.jpg
/trunk/Crm/src/main/webapp/images/favicon.ico
/trunk/Crm/src/main/webapp/images/forward_disabled.jpg
/trunk/Crm/src/main/webapp/images/forward_enabled.jpg
/trunk/Crm/src/main/webapp/images/sort_asc.png
/trunk/Crm/src/main/webapp/images/sort_asc_disabled.png
/trunk/Crm/src/main/webapp/images/sort_both.png
/trunk/Crm/src/main/webapp/images/sort_desc.png
/trunk/Crm/src/main/webapp/images/sort_desc_disabled.png
/trunk/Crm/src/main/webapp/js
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/Crm/src/main/webapp/js/jquery.dataTables.min.js
/trunk/Crm/src/main/webapp/js/jquery.js