Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20167 3720 d 5 h aman.kumar /trunk/ new category delivery attempt failed added. Shipping charge re-evaluation after order cancellation  
/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/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
20110 3734 d 11 h kshitij.sood /trunk/Crm/src/main/ Return Transaction Crm  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ReturnTransactionsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/interceptors
/trunk/Crm/src/main/java/in/shop2020/serving/interceptors/ReturnTransactionsInterceptor.java
/trunk/Crm/src/main/webapp/WEB-INF/content/confirm-return-transaction.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/defective-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/pick-up-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/pickup-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/result.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-all.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-result-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/view-return-order.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/view-return-transaction.vm
/trunk/Crm/src/main/webapp/images/add_button.png
/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/UserOrderInfoController.java
/trunk/Crm/src/main/resources/struts.xml
/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/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
18709 3868 d 10 h manas /trunk/ Changes related to crm ticket generation process  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/PyDTR/src/dtr/api/Routing.py
/trunk/PyDTR/src/dtr/api/Service.py
/trunk/PyDTR/src/dtr/utils/utils.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
17274 3991 d 11 h manish.sharma /trunk/ Committed by Manish Sharma for Adding one more category in CRM Category List on 16-Oct-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
16244 4070 d 11 h manish.sharma /trunk/ Committed by Manish Sharma for Profit Mandi Shopclues Scraping on 29-Jul-2015  
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.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/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
16208 4072 d 6 h manish.sharma /trunk/ Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015  
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/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/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
15698 4100 d 11 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Committed by Manish Sharma for Adding OutBound Role for ProfitMandi Tickets on 29-Jun-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
14882 4170 d 9 h manish.sharma /trunk/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProfitMandiCrmTicketGenerator.py
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.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/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.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/java/in/shop2020/util/EmailReader.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/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/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
11890 4461 d 8 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
7616 4835 d 7 h manish.sharma /trunk/Crm/src/main/ Committed by Manish Sharma for Creating a new Ticket: Category- RTO Refund on 24-Jun-2013  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/js/events.js
7572 4841 d 0 h anupam.singh /trunk/ Added option to search by amazon order id. Also modified "search by mobile number" to fetch orders with given mobile number and not the orders by user associated with that mobile number .  
/trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
/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/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.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/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7372 4860 d 7 h kshitij.sood /trunk/ Added low inventory cancelled order category.  
/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/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
6507 5023 d 13 h anupam.singh /trunk/ Added a method in order service for refunding orders. Gave a handle in crm for the same.  
/trunk/Crm/src/main/webapp/WEB-INF/content/refund-failed.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/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-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6206 5085 d 13 h rajveer /trunk/ Added option to get all or active operators based on parameter passed.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/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-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeOrdersController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
6153 5092 d 8 h anupam.singh /trunk/Crm/src/main/ Cosmetic fixes for CRM  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
5909 5134 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
5884 5139 d 13 h amar.kumar /trunk/Crm/src/main/ Adding restriction to viewing of Store Pickup tickets, so that it can be only viewed by Outbound team  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
4793 5292 d 1 h amar.kumar /trunk/ Ticket ID : #1010
Reviewed by : Anupam Singh		  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.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/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/auth/CRMAuthorizingRealm.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.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/input.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/Agent.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4751 5297 d 1 h anupam.singh /trunk/Crm/src/main/ Reveiwer : Amar

Tickets created when cancellation request is raised were not visible to Outbound team as they were being assigned to admin.		  
/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/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/js/events.js
4689 5303 d 14 h anupam.singh /trunk/Crm/src/main/ Trac # 960, 911
Reveiwer : Rajveer

1.) Cancellation flow initiated from CRM.
2.) Agents can assign tickets at the time of creation.		  
/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/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js

←Prev12Next→

Show All