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

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 5055 – Ticket #1156 - Email addresses from product notifications, sent in ...

varun.gupta — Tue, 24 Apr 2012 18:08:25 +0530

varun.gupta – 8 file(s) modified
Ticket #1156 - Email addresses from product notifications, sent in past, can now be downloaded

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /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/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

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 4996 – Trac #1127 - Added functionality to modify existing quick-links

varun.gupta — Mon, 16 Apr 2012 12:04:21 +0530

varun.gupta – 11 file(s) modified
Trac #1127 - Added functionality to modify existing quick-links

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 4985 – PLB related changes Added methods in service to read the ...

mandeep.dhir — Sat, 14 Apr 2012 12:17:05 +0530

mandeep.dhir – 7 file(s) modified
PLB related changes
Added methods in service to read the keys of missed inventory updates.
Trac#1118

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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 4979 – Modelling of holidays on for all vendors. This will take ...

rajveer — Fri, 13 Apr 2012 16:48:46 +0530

rajveer – 6 file(s) modified
Modelling of holidays on for all vendors. This will take care of monthly, weekly and specific holidays for all vendors.

Rev 4957 – Ticket #1026 Enhancement need in selection criteria for master sheet ...

phani.kumar — Thu, 12 Apr 2012 11:50:46 +0530

phani.kumar – 13 file(s) modified
Ticket #1026 Enhancement need in selection criteria for master sheet generator
reviewer: Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4948 – Ticket #1040 CRM ticket creation related to undelivery of order ...

phani.kumar — Wed, 11 Apr 2012 16:08:43 +0530

phani.kumar – 7 file(s) modified
Ticket #1040 CRM ticket creation related to undelivery of order
reviewer: Rajveer

~ /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/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4934 – Added changes for Loading items with least delivery date on ...

amit.gupta — Mon, 09 Apr 2012 15:02:59 +0530

amit.gupta – 15 file(s) modified
Added changes for Loading items with least delivery date on top...

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.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 4865 – Changes method isCodAllowed to handle more conditions like based on ...

rajveer — Sat, 31 Mar 2012 19:52:56 +0530

rajveer – 7 file(s) modified
Changes method isCodAllowed to handle more conditions like based on pricing etc.

~ /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/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

Rev 4846 – Trac#1043 Handling cases where itemnumber to itemId mapping is not ...

mandeep.dhir — Fri, 30 Mar 2012 10:09:26 +0530

mandeep.dhir – 11 file(s) modified
Trac#1043 Handling cases where itemnumber to itemId mapping is not unique

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /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/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ItemNumberHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ItemNumberMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml

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 4806 – Ticket #1008 - Helper service modified to store quick links ...

varun.gupta — Mon, 26 Mar 2012 16:21:02 +0530

varun.gupta – 12 file(s) modified
Ticket #1008 - Helper service modified to store quick links and a UI created to manage these

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

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 4793 – Ticket ID : #1010 Reviewed by : Anupam Singh

amar.kumar — Sun, 25 Mar 2012 00:25:05 +0530

amar.kumar – 21 file(s) modified
Ticket ID : #1010
Reviewed by : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.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 4762 – Ticket #995 Refinements to catalog/item model reviewer: Rajveer

phani.kumar — Wed, 21 Mar 2012 14:07:30 +0530

phani.kumar – 24 file(s) modified
Ticket #995 Refinements to catalog/item model
reviewer: Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.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/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.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/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/AddNewCategory.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/one_time_Item_product_group_change.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/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/VendorItemMapping.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4758 – Exposing purchaseOrderId

mandeep.dhir — Wed, 21 Mar 2012 12:26:16 +0530

mandeep.dhir – 5 file(s) modified
Exposing purchaseOrderId

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.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 4754 – Trac#974 Trac#975 Adding UI for PO create, amend etc. ALso ...

mandeep.dhir — Wed, 21 Mar 2012 10:45:42 +0530

mandeep.dhir – 27 file(s) modified
Trac#974 Trac#975 Adding UI for PO create, amend etc.
ALso UI for inventory read and edit.
Display Vendor name, date in POs list
On PO creation, list the vendors to whom PO can be sent.
For selected Vendor,display the PO to be generated to users who later can amend the PO, (quantity, add/remove lineitem etc.) before actually creating and sending mail for PO to vendors.
Display COD vs Prepaid count, total amount of PO being raised etc. as well
Allow quantity, item and color amends in existing PO
Feature to resend the amended PO to vendor in mail
Ability to find PO given an item pending scan
Users should be sent emails to remind them to create PO
We should also be able to audit all the amends made to a PO

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.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/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/css/common.css
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/output.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/helpers/impl/model/Agent.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

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 4725 – Ticket #962 itemloader script changed to reduce duplicate items and ...

phani.kumar — Thu, 15 Mar 2012 16:36:23 +0530

phani.kumar – 14 file(s) modified
Ticket #962 itemloader script changed to reduce duplicate items and catalogdash board also changed
reviewer: mandeep dhir

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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 4693 – Adding support for user agents for authorization in inventory web ...

mandeep.dhir — Tue, 13 Mar 2012 12:23:23 +0530

mandeep.dhir – 4 file(s) modified
Adding support for user agents for authorization in inventory web app

+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Mail.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 4682 – Removed option to cancel from OM dashboard. Changed CANCELED ...

rajveer — Mon, 12 Mar 2012 18:50:11 +0530

rajveer – 8 file(s) modified
Removed option to cancel from OM dashboard. Changed CANCELED status to COD_VERIFICATION_FAILED. Changed REFUNDED status to CANCELLED_DUE_TO_LOW_INVENTORY.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.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/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4681 – Trac ID : #901, #961 Reviewed By : Anupam Singh

amar.kumar — Mon, 12 Mar 2012 18:42:41 +0530

amar.kumar – 9 file(s) modified
Trac ID : #901, #961
Reviewed By : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4668 – Ticket 928 - COD validation moved in service

varun.gupta — Fri, 09 Mar 2012 15:10:07 +0530

varun.gupta – 7 file(s) modified
Ticket 928 - COD validation moved in service

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java

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