Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
35735 221 d 11 h amit /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Remove AlertClient dependency from CRMServiceHandler  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
21891 3359 d 9 h amit.gupta /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
21888 3359 d 11 h amit.gupta /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
21887 3359 d 12 h amit.gupta /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
21885 3359 d 13 h amit.gupta /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
21882 3359 d 13 h amit.gupta /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
14902 4170 d 7 h manish.sharma /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
11890 4462 d 9 h kshitij.sood /trunk/ Crm changes related to bulk order enquiry & private deals.  
/trunk/Crm/src/main/java/in/shop2020/util/BulkOrderEmailReader.java
/trunk/Crm/src/main/java/in/shop2020/util/DesEncrypter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.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/UserInfoController.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/orders-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.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/ttypes.py
/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/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.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
9338 4637 d 10 h manish.sharma /trunk/ Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse on Jan-09-2014  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java
/trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.java
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
8384 4727 d 8 h manish.sharma /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
8381 4727 d 9 h manish.sharma /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
8371 4727 d 15 h manish.sharma /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
7871 4800 d 7 h amar.kumar /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Updating Ticket Categories to be monitored through Alert Service  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
7596 4839 d 9 h kshitij.sood /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Committed by Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
5936 5127 d 9 h amar.kumar /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Changes to end monitoring of tickets through Alert Service if ticket is closed without any other activity  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
5916 5133 d 15 h amar.kumar /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Making changes to monitor tickets through Alert Service only if category is one of the following
1) cod verification
2) undelivered
3) store pickup

And we will end monitoring only if one of the following activities occur on the ticket
1) send email to customer
2) escalate
3) called customer
 
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
5909 5135 d 8 h amar.kumar /trunk/ Changes for new page in Crm for showing ticket category with open ticket count
Reviewed by : Anupam Singh
 
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-open.vm
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.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/TicketMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/input.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/CRMService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
5851 5143 d 10 h amar.kumar /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/ Started monitoring of new tickets through Alert Service. Warning and Critical Threshold is taken as 4hrs and 6hrs. Any subsequent activity in ticket will stop monitoring.
Reviewed By : Amit Gupta
 
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
5286 5229 d 5 h amar.kumar /trunk/ Changes to show Inactive Agents for old tickets and refreshing agents map after change password from manage agent page  
/trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.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/AgentMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
5168 5242 d 10 h amar.kumar /trunk/ Ticket Id : #1251 #1228
Reviewed by Anupam Singh
 
/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/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/AgentMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js

Show All