BlueGrey
calm
Elegant
Català-Valencià – Catalan
中文 – Chinese (Simplified)
中文 – Chinese (Traditional)
Česky – Czech
Dansk – Danish
Nederlands – Dutch
English – English
Suomi – Finnish
Français – French
Deutsch – German
עברית – Hebrew
हिंदी – Hindi
Magyar – Hungarian
Bahasa Indonesia – Indonesian
Italiano – Italian
日本語 – Japanese
한국어 – Korean
Македонски – Macedonian
मराठी – Marathi
Norsk – Norwegian
Polski – Polish
Português – Portuguese
Português – Portuguese (Brazil)
Русский – Russian
Slovenčina – Slovak
Slovenščina – Slovenian
Español – Spanish
Svenska – Swedish
Türkçe – Turkish
Українська – Ukrainian
Oëzbekcha – Uzbek
Subversion Repositories
SmartDukaan
(root)
/
trunk
/
PyProj
/
src
/
shop2020
/
thriftpy
/
crm
/
CRMService-remote
– Rev 14882
Rev
Hide changed files
|
Details
|
Compare with Previous
|
Blame
|
RSS feed
Filtering Options
From rev
To rev
Max revs
Search history for
Show All
Rev
Age
Author
Path
Log message
Diff
Changes
14882
4041 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
6104
4964 d 14 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
5020 d 0 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
4948
5145 d 10 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
4008
5299 d 12 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
3499
5339 d 11 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
3431
5343 d 4 h
rajveer
/trunk/PyProj/src/shop2020/thriftpy/
Thrift version updated from 0.2 to 0.7
/trunk/PyProj/src/shop2020/thriftpy/config/Configuration-remote
/trunk/PyProj/src/shop2020/thriftpy/config/Configuration.py
/trunk/PyProj/src/shop2020/thriftpy/config/constants.py
/trunk/PyProj/src/shop2020/thriftpy/config/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/constants.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger-remote
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/constants.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService-remote
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService.py
/trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
/trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/constants.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/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/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.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/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/constants.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/constants.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
3376
5349 d 13 h
rajveer
/trunk/PyProj/src/shop2020/
Implemented new method isAlive()
/trunk/PyProj/src/shop2020/thriftpy/generic
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService-remote
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService.py
/trunk/PyProj/src/shop2020/thriftpy/generic/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
/trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.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/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/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/model/v1/user/PromotionService.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/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
3131
5369 d 6 h
rajveer
/trunk/PyProj/src/shop2020/thriftpy/crm/
CRM service python stub.
/trunk/PyProj/src/shop2020/thriftpy/crm
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/crm/constants.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py