Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
23245 3027 d 1 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
23244 3027 d 1 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
22363 3167 d 22 h ashik.ali /trunk/Crm/src/main/ Verify Retailer Feature  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/verify-doc-index.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
22350 3168 d 3 h ashik.ali /trunk/Crm/src/main/  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
21937 3216 d 18 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
21936 3216 d 18 h amit.gupta /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
21934 3216 d 18 h amit.gupta /trunk/Crm/src/main/ Added user verification(b2b)  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/verify-doc-index.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/js/common.js
11893 4322 d 22 h kshitij.sood /trunk/Crm/src/main/webapp/WEB-INF/content/  
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
11890 4322 d 23 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
4008 5290 d 2 h mandeep.dhir /trunk/ Trac#595 Robust handling of Failed payments, COD transactions and delayed orders by CRM. TransacitonService and PaymentService now persist relevant transactions, payments to their own database. Then CRM polls these new tables and processes them (creation of tickets essentially)  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentRequiringExtraProcessingHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.java
/trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.xml
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/ExtraPaymentProcessingType.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/FailedPaymentsProcessor.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.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/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/user-info-index.vm
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/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/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/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
3853 5309 d 1 h mandeep.dhir /trunk/ Trac#582 Truncating test when no. of rows on one page in datatables change  
/trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.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/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
3499 5330 d 1 h mandeep.dhir /trunk/ Trac#504 Added functionality to help CRM agents to verify COD orders  
/trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
/trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.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/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.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/activity-editNew.vm
/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-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-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/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.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/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/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/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.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
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
2674 5399 d 23 h vikas /trunk/Crm/ CRM.  
/trunk/Crm
/trunk/Crm/.classpath
/trunk/Crm/.project
/trunk/Crm/.settings
/trunk/Crm/.settings/org.eclipse.jdt.core.prefs
/trunk/Crm/.settings/org.maven.ide.eclipse.prefs
/trunk/Crm/pom.xml
/trunk/Crm/src
/trunk/Crm/src/main
/trunk/Crm/src/main/java
/trunk/Crm/src/main/java/in
/trunk/Crm/src/main/java/in/shop2020
/trunk/Crm/src/main/java/in/shop2020/serving
/trunk/Crm/src/main/java/in/shop2020/serving/controllers
/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/OrderCustomerInputController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.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/resources
/trunk/Crm/src/main/resources/log4j.properties
/trunk/Crm/src/main/resources/struts.xml
/trunk/Crm/src/main/resources/velocity.properties
/trunk/Crm/src/main/webapp
/trunk/Crm/src/main/webapp/WEB-INF
/trunk/Crm/src/main/webapp/WEB-INF/content
/trunk/Crm/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/order-customer-input-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-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-orders-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/web.xml
/trunk/Crm/src/main/webapp/css
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/css/demo_table.css
/trunk/Crm/src/main/webapp/images
/trunk/Crm/src/main/webapp/images/Sorting icons.psd
/trunk/Crm/src/main/webapp/images/back_disabled.jpg
/trunk/Crm/src/main/webapp/images/back_enabled.jpg
/trunk/Crm/src/main/webapp/images/favicon.ico
/trunk/Crm/src/main/webapp/images/forward_disabled.jpg
/trunk/Crm/src/main/webapp/images/forward_enabled.jpg
/trunk/Crm/src/main/webapp/images/sort_asc.png
/trunk/Crm/src/main/webapp/images/sort_asc_disabled.png
/trunk/Crm/src/main/webapp/images/sort_both.png
/trunk/Crm/src/main/webapp/images/sort_desc.png
/trunk/Crm/src/main/webapp/images/sort_desc_disabled.png
/trunk/Crm/src/main/webapp/js
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/Crm/src/main/webapp/js/jquery.dataTables.min.js
/trunk/Crm/src/main/webapp/js/jquery.js