Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20174 3467 d 22 h aman.kumar /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ new ticket category  
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
18709 3621 d 18 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 3744 d 19 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
14882 3923 d 17 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 4214 d 16 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
7598 4591 d 17 h kshitij.sood /trunk/ Committed by Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013  
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
7372 4613 d 15 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
6677 4749 d 14 h amar.kumar /trunk/ Changes for Adding new TicketCategory for ON_TIME_GUARANTEE  
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
6176 4843 d 14 h amit.gupta /trunk/ Contact us extended for recharge.  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.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/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/css/contactus.css
/trunk/Website/src/main/webapp/js/contact-us.js
6104 4846 d 22 h rajveer /trunk/ Added uncertain recharge processor task with new category.  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
/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/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5791 4902 d 7 h anupam.singh /trunk/ Trac # 1526
CRM ticket will now be created for orders which are at pickup stores and their return date is nearing.
 
/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/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/script/PickupStoreReturns.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
5407 4965 d 6 h amar.kumar /trunk/ Ticket Id : #1352 #1372 #1373
Changes for
1) Adding new ticket category
2) Showing trust level while COD verification
3) Creating tickets from UserCommunication table
4) Adding dummy vm file for AddressController

Reviewed By : Anupam Singh
 
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
/trunk/Website/src/main/webapp/WEB-INF/content/address.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/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.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/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
4948 5027 d 18 h phani.kumar /trunk/ Ticket #1040 CRM ticket creation related to undelivery of order
reviewer: Rajveer
 
/trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.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/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4681 5057 d 15 h amar.kumar /trunk/ Trac ID : #901, #961
Reviewed By : Anupam Singh
 
/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/tickets-edit.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/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4490 5085 d 20 h anupam.singh /trunk/ Added DOA Request and return request raised handling in CRM. On ticket info page clicking on activity now shows attachments as well.

Trac #894, #862, #863

Reviewer : Mandeep Dhir
 
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.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/serving/controllers/UserOrderInfoController.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/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.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/Item.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4267 5130 d 22 h anupam.singh /trunk/ Trac#805

Task to generate tickets for flagged payments.
Ability to allow or block such payments in CRM.

Reviewer : Mandeep Dhir
 
/trunk/CRMService/src/main/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.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/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
4008 5181 d 20 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
3578 5210 d 18 h mandeep.dhir /trunk/ Trac#508 Adding functionality in CRM to help agents reach users that failed to make payments for transactions
Invoking refundOrder and verifyOrder methods in TransactionService (as suggested by Chandranshu)
 
/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/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/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-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/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/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3499 5221 d 18 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
3430 5225 d 12 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

Show All