Subversion Repositories SmartDukaan

(root)/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java – Rev 16091

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
16091	3832 d 9 h	amit.gupta	/trunk/ThriftConfig/src/main/java/in/shop2020/crm/	Rolledback		/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
16090	3832 d 9 h	amit.gupta	/trunk/ThriftConfig/src/main/java/in/shop2020/crm/	description is now htmlsafe.		/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
4241	5135 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
3546	5215 d 4 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
3430	5225 d 23 h	rajveer	/trunk/ThriftConfig/	Changes due to thrift revision upgrade from 0.2 to 0.7		/trunk/ThriftConfig/pom.xml /trunk/ThriftConfig/src/main/java/in/shop2020/config/ConfigException.java /trunk/ThriftConfig/src/main/java/in/shop2020/config/Configuration.java /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/Agent.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/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/datalogger/DataLogger.java /trunk/ThriftConfig/src/main/java/in/shop2020/datalogger/MsgType.java /trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/AwbUpdate.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryType.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsServiceException.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/StationType.java /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/WarehouseLocation.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemShippingInfo.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Alert.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnOrder.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionServiceException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AccountStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Address.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AddressType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Affiliate.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AuthenticationException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CartStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/IPMap.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/LineStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/MasterAffiliate.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Phone.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PhoneType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Promotion.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionTracking.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Sex.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ShoppingCartException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/SocialHandles.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Tracker.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserAffiliateException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunication.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserInternalInfo.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserNote.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserState.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserType.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserWidgetItem.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetException.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetType.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Attribute.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentException.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentGateway.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentGatewayStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Refund.java /trunk/ThriftConfig/src/main/java/in/shop2020/test/Address.java /trunk/ThriftConfig/src/main/java/in/shop2020/test/TestServer.java /trunk/ThriftConfig/src/main/java/in/shop2020/test/TestService.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/CatalogDashboardUser.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperServiceException.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/LogisticsUser.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Mail.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Message.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Report.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/ReportUser.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Role.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/StatisticsUser.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/TextMessage.java /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserEmail.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PurchaseOrder.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
3390	5231 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
3269	5240 d 5 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
3206	5246 d 10 h	mandeep.dhir	/trunk/	Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket		/trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java /trunk/Crm/src/main/java/in/shop2020/util /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java /trunk/Crm/src/main/webapp/css/colorbox.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/js/dataTables.fnDisplayRow.js /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.js /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java /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/Crm/pom.xml /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/resources/shiro.ini /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/Crm/src/main/webapp/css/common.css /trunk/Crm/src/main/webapp/images/ajax-loader.gif /trunk/Crm/src/main/webapp/js/common.js /trunk/Crm/src/main/webapp/js/events.js /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
3168	5250 d 8 h	mandeep.dhir	/trunk/	Trac#488 Updating the thrift file for optional fields Made relevant changes to velocity templates to use isset* methods from thrift model objects		/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.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-index.vm /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.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/Agent.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3106	5252 d 7 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
3028	5258 d 9 h	mandeep.dhir	/trunk/ThriftConfig/src/main/java/in/shop2020/	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/CRMService.java /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.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