Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
7792 4564 d 10 h anupam.singh /trunk/ - Changes to logistics provider details
- Added support for uploading awb list in file as well as downloading reports in excel		  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
/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/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
/trunk/Support/src/main/webapp/js/courier-details.js
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.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/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
7558 4598 d 13 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ Move stores to rto in transit.  
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
6643 4757 d 9 h rajveer /trunk/ Added support to store awb updates in our system.  
/trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.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/utils/orderTablePoller.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/AwbUpdate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
5976 4878 d 10 h anupam.singh /trunk/PyProj/src/shop2020/model/v1/order/script/ order.delivery_timestamp is already of datetime type. No need to format it.  
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
5944 4882 d 9 h mandeep.dhir /trunk/PyProj/src/ Separating catalog and inventory services Trac#1594 Reviewer: Rajveer  
/trunk/PyProj/src/shop2020/clients/InventoryClient.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/inventory
/trunk/PyProj/src/shop2020/model/v1/inventory/InventoryHistoryServer.py
/trunk/PyProj/src/shop2020/model/v1/inventory/InventoryServer.py
/trunk/PyProj/src/shop2020/model/v1/inventory/__init__.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/__init__.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script
/trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.sh
/trunk/PyProj/src/shop2020/model/v1/inventory/script/InitialInventoryLoader.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryStockReportGenerator.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/__init__.py
/trunk/PyProj/src/shop2020/model/v1/inventory/test
/trunk/PyProj/src/shop2020/model/v1/inventory/test/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/ClearItemAvailabilityCache.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.sh
/trunk/PyProj/src/shop2020/model/v1/catalog/script/InitialInventoryLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/ProcurementReportProcessor.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src
/trunk/PyProj/src/dist
/trunk/PyProj/src/shop2020/clients/CatalogClient.py
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
/trunk/PyProj/src/shop2020/model/v1/order/test/TestGetValidOrdersCount.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Tablet_campaign.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/test/domain/Test1.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
5870 4897 d 13 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ Removed unused parameters.  
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
5869 4897 d 13 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ Corrected the pickup store return process.  
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
5791 4905 d 23 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
5677 4925 d 14 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ Job to send mail to courier partners to inform them about return pickups from the store.  
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py