SmartDukaan – //trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java

Rev 3206 – Trac#488 Added support to mail a customer from CRM as ...

mandeep.dhir — Tue, 06 Sep 2011 10:53:03 +0530

mandeep.dhir – 38 file(s) modified
Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java@3177)
x /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/java/in/shop2020/util
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/css/colorbox.css
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/images
+ /trunk/Crm/src/main/webapp/css/images/border.png
+ /trunk/Crm/src/main/webapp/css/images/controls.png
+ /trunk/Crm/src/main/webapp/css/images/loading.gif
+ /trunk/Crm/src/main/webapp/css/images/loading_background.png
~ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.js
~ /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-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.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/log4j.properties
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /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/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 3168 – Trac#488 Updating the thrift file for optional fields Made relevant ...

mandeep.dhir — Fri, 02 Sep 2011 12:37:48 +0530

mandeep.dhir – 13 file(s) modified
Trac#488 Updating the thrift file for optional fields
Made relevant changes to velocity templates to use isset* methods from thrift model objects

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /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-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3106 – Trac#488 - Added ActivityType and remodelled ticket/activity a bit. ...

mandeep.dhir — Wed, 31 Aug 2011 13:29:30 +0530

mandeep.dhir – 28 file(s) modified
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/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/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /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/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/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3028 – Trac#488 Adding ThriftConfig files for CRM service. Also updating one ...

mandeep.dhir — Thu, 25 Aug 2011 11:01:18 +0530

mandeep.dhir – 10 file(s) modified
Trac#488 Adding ThriftConfig files for CRM service. Also updating one for UserContextService

+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketPriority.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java