Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
22985 2989 d 8 h amit.gupta /trunk/Support/src/main/webapp/WEB-INF/content/  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
22984 2989 d 8 h amit.gupta /trunk/Support/src/main/webapp/WEB-INF/content/  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
20717 3301 d 8 h amit.gupta /trunk/Support/src/main/webapp/WEB-INF/content/ Added Aramex  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
8644 4474 d 1 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added Fedex in the cod reconciliation list.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
7736 4586 d 8 h manish.sharma /trunk/Support/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Multiple Pincode Updation on 11-Jul-2013  
/trunk/Support/src/main/webapp/WEB-INF/content/pincode.vm
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
7070 4686 d 7 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added Redexpress as courier partner.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
7069 4686 d 7 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added Redexpress as courier partner.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
6664 4764 d 7 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ On time guarantee field added for updating dashboard.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
6524 4789 d 1 h rajveer /trunk/ Added code for on time guarantee.  
/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/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
6322 4828 d 8 h amar.kumar /trunk/ Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp

Reviewed by Anupam Singh		  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
/trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
/trunk/Support/src/main/webapp/css/pincode.css
/trunk/Support/src/main/webapp/js/pincode.js
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/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/script/CatalogComparer.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
5376 4986 d 1 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added delhivery in the cod reconciliation report.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
5375 4986 d 1 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added delhivery in the cod reconciliation report.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
4673 5075 d 2 h rajveer /trunk/Support/src/main/webapp/WEB-INF/content/ Added aramex as option.  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
3956 5205 d 1 h chandranshu /trunk/ Added support to upload COD reconciliation report and process it  
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/IPaymentHandler.java
/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/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.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/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift