SmartDukaan – /trunk/Support/src/main/java/in/

Rev 4801 – Trac #1025 Created a dashboard for viewing courier performance ...

anupam.singh — Mon, 26 Mar 2012 13:45:49 +0530

anupam.singh – 10 file(s) modified
Trac #1025

Created a dashboard for viewing courier performance report in Support webapp.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /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/CourierPerformanceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-performance-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4788 – Changes in shipping process where user will be able to ...

rajveer — Fri, 23 Mar 2012 18:11:45 +0530

rajveer – 5 file(s) modified
Changes in shipping process where user will be able to select or deselect the orders.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.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

Rev 4765 – Fetch color along with billnumber from ETP. And send the ...

rajveer — Wed, 21 Mar 2012 15:37:01 +0530

rajveer – 2 file(s) modified
Fetch color along with billnumber from ETP. And send the updates to server.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java

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 4674 – When two orders use one transaction Id a new cell ...

anupam.singh — Mon, 12 Mar 2012 11:33:01 +0530

anupam.singh – 1 file(s) modified
When two orders use one transaction Id a new cell was not being created for the second order.

Reviewer : Mandeep Dhir

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 4657 – When multiple orders use a single transactionId only the last ...

anupam.singh — Thu, 08 Mar 2012 23:59:03 +0530

anupam.singh – 1 file(s) modified
When multiple orders use a single transactionId only the last order was being used. Fixed this issue now.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 4616 – Added exception logging.

rajveer — Mon, 05 Mar 2012 14:00:38 +0530

rajveer – 1 file(s) modified
Added exception logging.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java

Rev 4604 – When order is not prepaid amount to collect field should ...

anupam.singh — Fri, 02 Mar 2012 16:30:09 +0530

anupam.singh – 1 file(s) modified
When order is not prepaid amount to collect field should be zero

Reviewer : Rajveer

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java

Rev 4601 – Added authentication check for access

varun.gupta — Fri, 02 Mar 2012 15:33:00 +0530

varun.gupta – 1 file(s) modified
Added authentication check for access

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java

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

Rev 4598 – Trac #881 Added transactionId against each product sale in Affiliate ...

anupam.singh — Fri, 02 Mar 2012 13:53:40 +0530

anupam.singh – 1 file(s) modified
Trac #881
Added transactionId against each product sale in Affiliate report.

Reviewer : Amar

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 4585 – Receive billing updates from the client and update the billing ...

rajveer — Wed, 29 Feb 2012 17:48:58 +0530

rajveer – 3 file(s) modified
Receive billing updates from the client and update the billing info from that.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java

Rev 4555 – Modified services with better interface resulting in minimal calls

mandeep.dhir — Wed, 22 Feb 2012 12:44:32 +0530

mandeep.dhir – 16 file(s) modified
Modified services with better interface resulting in minimal calls

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 4531 – Added code to increase availibility in case an item is ...

mandeep.dhir — Sun, 19 Feb 2012 18:21:13 +0530

mandeep.dhir – 1 file(s) modified
Added code to increase availibility in case an item is scanned in

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java

Rev 4497 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:43:39 +0530

mandeep.dhir – 6 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
+ /trunk/Support/src/main/webapp/js/purchase.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 4484 – Changed the name of various order statuses.

rajveer — Fri, 10 Feb 2012 13:57:32 +0530

rajveer – 13 file(s) modified
Changed the name of various order statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4452 – Changed the name of various statuses.

rajveer — Tue, 07 Feb 2012 19:23:07 +0530

rajveer – 13 file(s) modified
Changed the name of various statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4414 – Mark orders as manifested on printing of manifest.

rajveer — Wed, 01 Feb 2012 13:29:10 +0530

rajveer – 1 file(s) modified
Mark orders as manifested on printing of manifest.

~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java

Rev 4410 – Introduced new status Manifested. Also added new method MarkOrdersAsShippedFromWarehouse. Now ...

rajveer — Wed, 01 Feb 2012 12:51:42 +0530

rajveer – 11 file(s) modified
Introduced new status Manifested. Also added new method MarkOrdersAsShippedFromWarehouse. Now old method will mark orders as manifested while new method will mark them as shipped from warehouse. Moved logistics reports generation code in second step.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.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/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4408 – Removed Hardcoding for vendors in raise-po dashboard

anupam.singh — Tue, 31 Jan 2012 18:59:50 +0530

anupam.singh – 2 file(s) modified
Removed Hardcoding for vendors in raise-po dashboard

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm

Rev 4391 – Removed getAwbForNumber method Reviewer : Rajveer

anupam.singh — Mon, 30 Jan 2012 12:00:13 +0530

anupam.singh – 9 file(s) modified
Removed getAwbForNumber method
Reviewer : Rajveer

Rev 4386 – On courier-details dashboard gave functionality to get details given an ...

anupam.singh — Fri, 27 Jan 2012 03:00:14 +0530

anupam.singh – 20 file(s) modified
On courier-details dashboard gave functionality to get details given an AWB number.

~ /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/LogisticsServiceHandler.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/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/models/AwbDetails.java
+ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-info.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Awb.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4371 – changed content disposition to attachment

anupam.singh — Tue, 24 Jan 2012 14:41:07 +0530

anupam.singh – 1 file(s) modified
changed content disposition to attachment

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java

Rev 4370 – Created a dashboard for raising manual PO's Reviewer : ...

anupam.singh — Tue, 24 Jan 2012 13:09:06 +0530

anupam.singh – 11 file(s) modified
Created a dashboard for raising manual PO's

Reviewer : Mandeep

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4305 – Added authentication to product notification report

varun.gupta — Tue, 10 Jan 2012 16:18:17 +0530

varun.gupta – 1 file(s) modified
Added authentication to product notification report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java

Rev 4295 – Ticket #756, #811 - Product Notification Requests Report and Functionality ...

varun.gupta — Fri, 06 Jan 2012 16:56:28 +0530

varun.gupta – 28 file(s) modified
Ticket #756, #811 - Product Notification Requests Report and Functionality to add warranty expiry date to each order at it's creation.

~ /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/catalog/impl/InventoryServiceHandler.py
~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.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/HotspotReconciliationController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/product-notifications-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.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/ProductNotificationRequest.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotificationRequestCount.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4209 – Merge the multiple reports of the same warehouse location.

rajveer — Thu, 15 Dec 2011 15:49:24 +0530

rajveer – 3 file(s) modified
Merge the multiple reports of the same warehouse location.

Rev 4207 – Trac#537 New panel for bulk orders

mandeep.dhir — Thu, 15 Dec 2011 14:42:48 +0530

mandeep.dhir – 27 file(s) modified
Trac#537 New panel for bulk orders

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/css
+ /trunk/Support/src/main/webapp/css/bulk-order.css
+ /trunk/Support/src/main/webapp/css/demo_page.css
+ /trunk/Support/src/main/webapp/css/demo_table.css
+ /trunk/Support/src/main/webapp/css/demo_table_jui.css
+ /trunk/Support/src/main/webapp/images
+ /trunk/Support/src/main/webapp/images/back_disabled.jpg
+ /trunk/Support/src/main/webapp/images/back_enabled.jpg
+ /trunk/Support/src/main/webapp/images/favicon.ico
+ /trunk/Support/src/main/webapp/images/forward_disabled.jpg
+ /trunk/Support/src/main/webapp/images/forward_enabled.jpg
+ /trunk/Support/src/main/webapp/images/Sorting icons.psd
+ /trunk/Support/src/main/webapp/images/sort_asc.png
+ /trunk/Support/src/main/webapp/images/sort_asc_disabled.png
+ /trunk/Support/src/main/webapp/images/sort_both.png
+ /trunk/Support/src/main/webapp/images/sort_desc.png
+ /trunk/Support/src/main/webapp/images/sort_desc_disabled.png
+ /trunk/Support/src/main/webapp/js/bulk-order-common.js
+ /trunk/Support/src/main/webapp/js/bulk-order-events.js
+ /trunk/Support/src/main/webapp/js/jquery.dataTables.min.js
+ /trunk/Support/src/main/webapp/js/jquery.validate.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-error.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-output.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm

Rev 4141 – Added support to download payment reconciliation report for a given ...

chandranshu — Fri, 25 Nov 2011 17:45:31 +0530

chandranshu – 12 file(s) modified
Added support to download payment reconciliation report for a given period

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /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/PaymentReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 4139 – Trac#611 Added a sheet for return orders to Hotspot Reconciliation ...

chandranshu — Fri, 25 Nov 2011 15:42:18 +0530

chandranshu – 1 file(s) modified
Trac#611 Added a sheet for return orders to Hotspot Reconciliation Report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java

Rev 3958 – Corrected the grammar

chandranshu — Mon, 31 Oct 2011 19:50:48 +0530

chandranshu – 1 file(s) modified
Corrected the grammar

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java

Rev 3956 – Added support to upload COD reconciliation report and process it

chandranshu — Mon, 31 Oct 2011 18:36:59 +0530

chandranshu – 18 file(s) modified
Added support to upload COD reconciliation report and process it

~ /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/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /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

Rev 3936 – Added a redirect to the reports dashboard in case a ...

chandranshu — Fri, 28 Oct 2011 16:43:23 +0530

chandranshu – 10 file(s) modified
Added a redirect to the reports dashboard in case a user is not authorized to view a report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 3897 – Started catching the Exception class in place of TException

chandranshu — Tue, 25 Oct 2011 16:28:54 +0530

chandranshu – 1 file(s) modified
Started catching the Exception class in place of TException

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java

Rev 3867 – Added support to close a purchase

chandranshu — Mon, 24 Oct 2011 14:26:38 +0530

chandranshu – 2 file(s) modified
Added support to close a purchase

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 3501 – Trac#504 Removing unnecessary txn lookup

mandeep.dhir — Fri, 30 Sep 2011 15:28:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#504 Removing unnecessary txn lookup

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 3449 – Added a courier-reconciliation report. Removed some unused classes.

chandranshu — Tue, 27 Sep 2011 18:48:52 +0530

chandranshu – 9 file(s) modified
Added a courier-reconciliation report. Removed some unused classes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
x /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm

Rev 3427 – Added the courier reconciliation report

chandranshu — Mon, 26 Sep 2011 18:19:36 +0530

chandranshu – 9 file(s) modified
Added the courier reconciliation report

~ /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/CourierReconciliationController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift