SmartDukaan – /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm

Rev 5481 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Fri, 22 Jun 2012 17:25:57 +0530

phani.kumar – 9 file(s) modified
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/js/vendor-reconciliation.js
~ /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

Rev 5386 – vendor reconciliation

phani.kumar — Fri, 08 Jun 2012 14:51:53 +0530

phani.kumar – 11 file(s) modified
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/js/vendor-reconciliation.js
~ /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

Rev 5189 – Vendor Reconciliation - added unsettled orders sheet

varun.gupta — Wed, 16 May 2012 13:31:05 +0530

varun.gupta – 11 file(s) modified
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

Rev 5098 – Modified handling of Bluedart report

varun.gupta — Wed, 02 May 2012 14:53:25 +0530

varun.gupta – 2 file(s) modified
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

Rev 5020 – Ticket #1137 - Vendor Reconciliation Report generator tool can handle ...

varun.gupta — Wed, 18 Apr 2012 16:44:33 +0530

varun.gupta – 3 file(s) modified
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

Rev 4875 – Ticket #1038 - Separated method to upload COD settlements

varun.gupta — Mon, 02 Apr 2012 13:23:51 +0530

varun.gupta – 11 file(s) modified
Ticket #1038 - Separated method to upload COD settlements

~ /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/CODPaymentSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4745 – intermediate check-in

varun.gupta — Mon, 19 Mar 2012 02:54:02 +0530

varun.gupta – 2 file(s) modified
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

Rev 4734 – Vendor Reconciliation Report: Now getting Payment object corresponding to an ...

varun.gupta — Fri, 16 Mar 2012 12:57:13 +0530

varun.gupta – 2 file(s) modified
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

Rev 4715 – Added support for reshipped orders, refunds which do not fall ...

varun.gupta — Wed, 14 Mar 2012 21:43:43 +0530

varun.gupta – 9 file(s) modified
Added support for reshipped orders, refunds which do not fall in given date range and COD settlements from Aramex.

~ /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/js/vendor-reconciliation.js
~ /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

Rev 4600 – Vendor Reconciliation Report Generator - v1.0

varun.gupta — Fri, 02 Mar 2012 15:24:31 +0530

varun.gupta – 22 file(s) modified
Vendor Reconciliation Report Generator - v1.0

~ /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/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/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