Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
3546 5214 d 17 h mandeep.dhir /trunk/ Trac#511 Changes related to COD orders verification  
/trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.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/TicketMapper.xml
/trunk/Crm/pom.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/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/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-order-info-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/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.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/crm/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3390 5230 d 21 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
3269 5239 d 18 h mandeep.dhir /trunk/ Trac#488 Making customer "not mandatory to be a registered user" for ticket and activity creation  
/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/TicketHandlerTest.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/UserOrdersController.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/tickets-index.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/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3106 5251 d 20 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
3024 5257 d 23 h mandeep.dhir /trunk/CRMService/ Trac#488 Adding service for CRM data  
/trunk/CRMService
/trunk/CRMService/.classpath
/trunk/CRMService/.project
/trunk/CRMService/.settings
/trunk/CRMService/.settings/org.eclipse.jdt.core.prefs
/trunk/CRMService/.settings/org.maven.ide.eclipse.prefs
/trunk/CRMService/pom.xml
/trunk/CRMService/src
/trunk/CRMService/src/main
/trunk/CRMService/src/main/java
/trunk/CRMService/src/main/java/in
/trunk/CRMService/src/main/java/in/shop2020
/trunk/CRMService/src/main/java/in/shop2020/crm
/trunk/CRMService/src/main/java/in/shop2020/crm/domain
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
/trunk/CRMService/src/main/java/in/shop2020/crm/handler
/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
/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
/trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources
/trunk/CRMService/src/main/resources/context.xml
/trunk/CRMService/src/main/resources/in
/trunk/CRMService/src/main/resources/in/shop2020
/trunk/CRMService/src/main/resources/in/shop2020/crm
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence
/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/jdbc.properties
/trunk/CRMService/src/main/resources/log4j.properties
/trunk/CRMService/src/main/resources/mybatis-config.xml
/trunk/CRMService/src/test
/trunk/CRMService/src/test/java
/trunk/CRMService/src/test/java/in
/trunk/CRMService/src/test/java/in/shop2020
/trunk/CRMService/src/test/java/in/shop2020/crm
/trunk/CRMService/src/test/java/in/shop2020/crm/handler
/trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
/trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
/trunk/CRMService/target
/trunk/CRMService/target/classes
/trunk/CRMService/target/classes/context.xml
/trunk/CRMService/target/classes/in
/trunk/CRMService/target/classes/in/shop2020
/trunk/CRMService/target/classes/in/shop2020/crm
/trunk/CRMService/target/classes/in/shop2020/crm/domain
/trunk/CRMService/target/classes/in/shop2020/crm/domain/Activity.class
/trunk/CRMService/target/classes/in/shop2020/crm/domain/Agent.class
/trunk/CRMService/target/classes/in/shop2020/crm/domain/Ticket.class
/trunk/CRMService/target/classes/in/shop2020/crm/handler
/trunk/CRMService/target/classes/in/shop2020/crm/handler/ActivityHandler.class
/trunk/CRMService/target/classes/in/shop2020/crm/handler/AgentHandler.class
/trunk/CRMService/target/classes/in/shop2020/crm/handler/TicketHandler.class
/trunk/CRMService/target/classes/in/shop2020/crm/persistence
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/ActivityMapper.class
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/AgentMapper.class
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/AgentMapper.xml
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/TicketMapper.class
/trunk/CRMService/target/classes/in/shop2020/crm/persistence/TicketMapper.xml
/trunk/CRMService/target/classes/in/shop2020/crm/service
/trunk/CRMService/target/classes/in/shop2020/crm/service/CRMServer.class
/trunk/CRMService/target/classes/in/shop2020/crm/service/handler
/trunk/CRMService/target/classes/in/shop2020/crm/service/handler/CRMServiceHandler.class
/trunk/CRMService/target/classes/jdbc.properties
/trunk/CRMService/target/classes/log4j.properties
/trunk/CRMService/target/classes/mybatis-config.xml
/trunk/CRMService/target/test-classes
/trunk/CRMService/target/test-classes/in
/trunk/CRMService/target/test-classes/in/shop2020
/trunk/CRMService/target/test-classes/in/shop2020/crm
/trunk/CRMService/target/test-classes/in/shop2020/crm/handler
/trunk/CRMService/target/test-classes/in/shop2020/crm/handler/ActivityHandlerTest.class
/trunk/CRMService/target/test-classes/in/shop2020/crm/handler/TicketHandlerTest.class