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
/
Support
/
src
/
main
/
java
/
in
/
shop2020
/
support
/
controllers
/
VendorReconciliationController.java
– Rev 13276
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
13276
4236 d 7 h
manish.sharma
/trunk/
Committed by Manish Sharma for Bulk Shipment Creation Process on 10-Dec-2014
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketNewInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchOrdersByMasterOrderIdBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrdersByMasterOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrdersByMasterOrderIdRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReceiveReturnBox.java
/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/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchFlipkartOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.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/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6387
4977 d 2 h
amar.kumar
/trunk/Support/src/main/java/in/shop2020/support/controllers/
Adding vendor name in all vendor reconcilliation sheets
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
5945
5060 d 3 h
mandeep.dhir
/trunk/
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer
/trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
/trunk/Support/Converted-2-2012-08-06-16:29:31.xls
/trunk/Support/Converted-2-2012-08-11-14:58:00.xls
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/ThriftGen/thriftsrc/InventoryService
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/runutils/.project
/trunk/runutils/.pydevproject
/trunk/runutils/init.d/inventory-server
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
/trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/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/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5481
5137 d 2 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
5441
5141 d 7 h
phani.kumar
/trunk/Support/src/main/java/in/shop2020/support/controllers/
updates to vendor renconciliation
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
5386
5151 d 5 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
5382
5152 d 2 h
varun.gupta
/trunk/
Added paymentGatewayId as parameter to method when getting payment settlement
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5343
5158 d 23 h
phani.kumar
/trunk/Support/src/main/java/in/shop2020/support/controllers/
vendor reconciliation aramex error handling
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
5208
5172 d 4 h
varun.gupta
/trunk/
Updated Vendor Recon
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
5198
5173 d 11 h
varun.gupta
/trunk/Support/src/main/java/in/shop2020/support/controllers/
Corrected a logged statement
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
5189
5174 d 6 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
5108
5187 d 4 h
varun.gupta
/trunk/Support/src/main/java/in/shop2020/support/controllers/
Now extracting AWB for order identity in place of OrderId for Aramex report
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
5098
5188 d 4 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
5202 d 3 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
4907
5216 d 4 h
varun.gupta
/trunk/Support/src/main/java/in/shop2020/support/controllers/
Replaced method call to save to new payment settlements master table
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
4905
5216 d 4 h
varun.gupta
/trunk/
Now all the settlements are saved into one master table where PaymentId is now replaced by ReferenceId which will be PaymentId for prepaid transactions and Order Id in case of COD
/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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4875
5218 d 6 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
5232 d 16 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
5235 d 6 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
5236 d 22 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
←Prev
1
2
Next→
Show All