Subversion Repositories SmartDukaan

(root)//trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm – Rev 5481

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
5481	5064 d 15 h	phani.kumar	/trunk/	Ticket #1428 Generate Reconciliation report for Vendor payments based on date range Ticket #1427 In Vendor Reconciliation add Delhivery support reviewer: Rajveer Singh		/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/Support/src/main/webapp/js/vendor-reconciliation.js /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5386	5078 d 17 h	phani.kumar	/trunk/	vendor reconciliation		/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/Support/src/main/webapp/js/vendor-reconciliation.js /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5189	5101 d 18 h	varun.gupta	/trunk/	Vendor Reconciliation - added unsettled orders sheet		/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.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/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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5098	5115 d 17 h	varun.gupta	/trunk/Support/src/main/	Modified handling of Bluedart report		/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
5020	5129 d 15 h	varun.gupta	/trunk/Support/	Ticket #1137 - Vendor Reconciliation Report generator tool can handle string values for reference Id and amount		/trunk/Support/pom.xml /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
4875	5145 d 19 h	varun.gupta	/trunk/	Ticket #1038 - Separated method to upload COD settlements		/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODPaymentSettlement.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/model/v1/order/ttypes.py /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4745	5160 d 5 h	varun.gupta	/trunk/Support/src/main/	intermediate check-in		/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
4734	5162 d 19 h	varun.gupta	/trunk/Support/src/main/	Vendor Reconciliation Report: Now getting Payment object corresponding to an order irrespective of Payment Status. Added Error messages.		/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
4715	5164 d 10 h	varun.gupta	/trunk/	Added support for reshipped orders, refunds which do not fall in given date range and COD settlements from Aramex.		/trunk/Support/src/main/webapp/js/vendor-reconciliation.js /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4600	5176 d 17 h	varun.gupta	/trunk/	Vendor Reconciliation Report Generator - v1.0		/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PaymentSettlement.java /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentGatewayHandler.java /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentGatewayMapper.java /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentGatewayMapper.xml /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py /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/model/v1/order/ttypes.py /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.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/OrderService/OrderService.thrift /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift