SmartDukaan – //trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 5099 – Added service method to mark orders as paid to vendor

varun.gupta — Wed, 02 May 2012 14:59:37 +0530

varun.gupta – 6 file(s) modified
Added service method to mark orders as paid to vendor

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

Rev 5067 – Ticket #1148 - Service methods created to support Order Monitor ...

varun.gupta — Thu, 26 Apr 2012 18:30:52 +0530

varun.gupta – 6 file(s) modified
Ticket #1148 - Service methods created to support Order Monitor 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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5062 – Ticket #1184 - Added originalOrderId field in Order and updated ...

varun.gupta — Wed, 25 Apr 2012 17:30:08 +0530

varun.gupta – 8 file(s) modified
Ticket #1184 - Added originalOrderId field in Order and updated code to populate this field

Rev 5031 – Added OrderstatusGroup for refunded orders

varun.gupta — Thu, 19 Apr 2012 15:48:18 +0530

varun.gupta – 6 file(s) modified
Added OrderstatusGroup for refunded orders

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

Rev 4999 – Ticket #1121 auto closing of CRM tickets created related to ...

phani.kumar — Mon, 16 Apr 2012 14:51:46 +0530

phani.kumar – 8 file(s) modified
Ticket #1121 auto closing of CRM tickets created related to nondelivery of order
reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4983 – Ticket #1117 AWB Displays and then Vanishes from My Account

phani.kumar — Fri, 13 Apr 2012 20:03:25 +0530

phani.kumar – 8 file(s) modified
Ticket #1117 AWB Displays and then Vanishes from My Account

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.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
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm

Rev 4910 – Ticket #1039 To introduce & implement 3 new OrderStatus states ...

phani.kumar — Wed, 04 Apr 2012 20:44:30 +0530

phani.kumar – 14 file(s) modified
Ticket #1039 To introduce & implement 3 new OrderStatus states for undelivered orders
Ticket #1040 CRM ticket creation related to undelivery of order
Ticket #1041 Generation of logistics report for orders pending local connection
reviewer: Rajveer

~ /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/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4905 – Now all the settlements are saved into one master table ...

varun.gupta — Wed, 04 Apr 2012 15:17:49 +0530

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

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 4837 – Ticket #1019 - Created OrderStatus group for all open orders ...

varun.gupta — Thu, 29 Mar 2012 13:23:51 +0530

varun.gupta – 6 file(s) modified
Ticket #1019 - Created OrderStatus group for all open orders and modified MyAccount section to incorporate this new group

Rev 4815 – Ticket #985 Add cancel button on order detail page on ...

phani.kumar — Tue, 27 Mar 2012 19:51:23 +0530

phani.kumar – 17 file(s) modified
Ticket #985 Add cancel button on order detail page on Website
Ticket #1023 Tracking of DOA and Return Pickups
Ticket #1022 Changes in Email Sent to Customers after DOA/Return Pickups are Confirmed
reviewer: Rajveer

~ /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/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.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/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/js/myaccount.js

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 4783 – Ticket #990 Need Report for orders which have crossed expected ...

phani.kumar — Thu, 22 Mar 2012 16:14:51 +0530

phani.kumar – 10 file(s) modified
Ticket #990 Need Report for orders which have crossed expected Delivery Date
reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4763 – Added support to verify the correct color is billied in ...

rajveer — Wed, 21 Mar 2012 15:28:54 +0530

rajveer – 6 file(s) modified
Added support to verify the correct color is billied in ETP.

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

Rev 4757 – Trac#974 Marking orders as PO raised

mandeep.dhir — Wed, 21 Mar 2012 12:07:01 +0530

mandeep.dhir – 8 file(s) modified
Trac#974 Marking orders as PO raised

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.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/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4741 – Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and Ticket ...

phani.kumar — Fri, 16 Mar 2012 20:58:16 +0530

phani.kumar – 9 file(s) modified
Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and
Ticket #1000 Bluedart Logistics Reconcilation using thier api

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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 4712 – Added support to mark the order as delivered from dashboard.

rajveer — Wed, 14 Mar 2012 13:42:34 +0530

rajveer – 15 file(s) modified
Added support to mark the order as delivered from dashboard.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkDeliveredEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkDeliveredEventHandler.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/MarkDeliveredBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.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/MarkDeliveredHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkDeliveredRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkDeliveredResponse.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4709 – Added the cancelled orders report.

rajveer — Tue, 13 Mar 2012 17:54:11 +0530

rajveer – 10 file(s) modified
Added the cancelled orders report.

Rev 4661 – Added new order statuses and changed description of INIT status.

rajveer — Fri, 09 Mar 2012 11:33:06 +0530

rajveer – 3 file(s) modified
Added new order statuses and changed description of INIT status.

~ /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 4658 – Support for alphanumeric IMEI numbers

mandeep.dhir — Fri, 09 Mar 2012 11:23:08 +0530

mandeep.dhir – 15 file(s) modified
Support for alphanumeric IMEI numbers

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.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/JacketInfoBox.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/Order.java
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4647 – Added delay reason text in the order

rajveer — Wed, 07 Mar 2012 12:01:46 +0530

rajveer – 15 file(s) modified
Added delay reason text in the order

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddDelayReasonEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddDelayReasonBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddDelayReasonHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddDelayReasonRequest.java
~ /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/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 4607 – Added report to get the slipped orders and send the ...

rajveer — Sat, 03 Mar 2012 14:08:34 +0530

rajveer – 7 file(s) modified
Added report to get the slipped orders and send the mail to concerned persons.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4602 – Added the selection box at the time of authorization of ...

rajveer — Fri, 02 Mar 2012 15:36:41 +0530

rajveer – 6 file(s) modified
Added the selection box at the time of authorization of the pickup number.

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

Rev 4586 – Trac#909 Creating POs for each supplier

mandeep.dhir — Wed, 29 Feb 2012 23:47:01 +0530

mandeep.dhir – 9 file(s) modified
Trac#909 Creating POs for each supplier

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PrintPendingOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4581 – Ticket #889 Aramex Logistics Reconcilation using thier api, order service ...

phani.kumar — Wed, 29 Feb 2012 13:42:15 +0530

phani.kumar – 8 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api, order service update_non_delivery_reason function returns undelivered orders
reviewer: Rajveer

Rev 4579 – Added support to add invoice number in the order. Added ...

rajveer — Wed, 29 Feb 2012 12:27:49 +0530

rajveer – 6 file(s) modified
Added support to add invoice number in the order.
Added support to raise the pickup request with different courier partners.

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

Rev 4506 – Ticket #889 Aramex Logistics Reconcilation using thier api Ticket #891 ...

phani.kumar — Tue, 14 Feb 2012 14:47:59 +0530

phani.kumar – 24 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api
Ticket #891 Support for Preferred vendor in Catalog
reviewer: Mandeep Dhir

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /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/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/model/v1/order/script/AramexLogisticsReconciliation.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /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/ItemInventory.java
~ /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/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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

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

mandeep.dhir – 27 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/ThriftConfig/src/main/java/in/shop2020/generic/Constants.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/ExceptionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Purchase.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchasingServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedgerStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
~ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
+ /trunk/ThriftGen/thriftsrc/PurchaseService
+ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 4495 – Added return flow handling both in backend and front end.

rajveer — Mon, 13 Feb 2012 19:49:36 +0530

rajveer – 22 file(s) modified
Added return flow handling both in backend and front end.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ValidateProductEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ValidateProductEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProductValidationBox.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/OrderDetailsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ValidateProductHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ValidateProductRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ValidateProductResponse.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4488 – Added support of return requesting and request authorisation.

rajveer — Fri, 10 Feb 2012 17:54:55 +0530

rajveer – 8 file(s) modified
Added support of return requesting and request authorisation.

~ /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/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 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 4478 – Added support to receive return in three conditions and than ...

rajveer — Thu, 09 Feb 2012 18:19:17 +0530

rajveer – 14 file(s) modified
Added support to receive return in three conditions and than reship or refund them accordingly.

~ /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/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/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnShipmentCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4454 – Added support to receive DOA request from customer and mark ...

rajveer — Tue, 07 Feb 2012 20:15:34 +0530

rajveer – 6 file(s) modified
Added support to receive DOA request from customer and mark the order as authorised or denied.

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

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 4444 – Added warehouseId in the alert table. Added support to mark ...

rajveer — Mon, 06 Feb 2012 23:30:54 +0530

rajveer – 9 file(s) modified
Added warehouseId in the alert table. Added support to mark alerts as seen.

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 4393 – Adding infrastructure for alerts.

rajveer — Mon, 30 Jan 2012 12:23:10 +0530

rajveer – 4 file(s) modified
Adding infrastructure for alerts.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Alert.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AlertType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift