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 3724 d 16 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 3738 d 22 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
16248 4074 d 21 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Committed by Manish Sharma for Profit Mandi Shopclues Scraping on 29-Jul-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
16244 4074 d 22 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 4076 d 17 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
14915 4173 d 16 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
14913 4173 d 16 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
14912 4173 d 16 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
14898 4173 d 18 h manish.sharma /trunk/ Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015  
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
/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/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
14882 4174 d 20 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
13324 4303 d 17 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Shipment Creation Process on 12-Dec-2014  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.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-order-info-index.vm
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
13102 4326 d 0 h kshitij.sood /trunk/Crm/src/main/java/in/shop2020/serving/controllers/  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
11895 4465 d 19 h kshitij.sood /trunk/Crm/src/main/ PD user in side bar  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
11890 4465 d 19 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
9166 4661 d 22 h manish.sharma /trunk/Crm/src/main/ Committed by Manish Sharma for Show Recharge Orders in Search Result of Device No on Dec-19-2013  
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-result-index.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/webapp/js/common.js
7645 4836 d 19 h anupam.singh /trunk/ RTO, Return and DOA flow for Store orders.  
/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/webapp/WEB-INF/content/tickets-edit.vm
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7615 4839 d 18 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ 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/HomeController.java
7606 4841 d 0 h anupam.singh /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Changing logger  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
7572 4845 d 11 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
7387 4858 d 22 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Commited by Manish Sharma for Displaying wallet amount at user page on June-05-2013  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java

←Prev12Next→

Show All