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

Rev 9945 – Flipkart Inventory feed changes.

vikram.raghav — Thu, 20 Feb 2014 17:24:48 +0530

vikram.raghav – 17 file(s) modified
Flipkart Inventory feed changes.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/FlipkartItem.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 9882 – Committed by Manish Sharma for Snapdeal Order Status Reconciliation on ...

manish.sharma — Thu, 13 Feb 2014 17:08:34 +0530

manish.sharma – 5 file(s) modified
Committed by Manish Sharma for Snapdeal Order Status Reconciliation on Feb-13-2014

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

Rev 9801 – Committed by Manish Sharma for XML Implementation for Amazon FBA ...

manish.sharma — Thu, 06 Feb 2014 18:17:36 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for XML Implementation for Amazon FBA Sales Snapshot on Feb-06-2014

~ /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 9651 – Committed by Manish Sharma for User Creation for other sources ...

manish.sharma — Mon, 27 Jan 2014 18:45:17 +0530

manish.sharma – 9 file(s) modified
Committed by Manish Sharma for User Creation for other sources and Tracking Reconciliation on Jan-27-2014

~ /trunk/Common/src/main/java/in/shop2020/serving/model/Order.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartOrderStatusReconciliation.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/model/v1/order/script/ChangeUserEmailOtherSourcesOrders.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/SnapdealOrderStatusReconciliation.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9630 – Changed data type of suborderid in snapdeal

vikram.raghav — Sat, 25 Jan 2014 13:32:24 +0530

vikram.raghav – 5 file(s) modified
Changed data type of suborderid in snapdeal

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9627 – Changed data type of suborderid in snapdeal

vikram.raghav — Sat, 25 Jan 2014 13:12:27 +0530

vikram.raghav – 5 file(s) modified
Changed data type of suborderid in snapdeal

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SnapdealOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9571 – Snapdeal inventory feed creation changes for pending orders

vikram.raghav — Wed, 22 Jan 2014 14:19:30 +0530

vikram.raghav – 7 file(s) modified
Snapdeal inventory feed creation changes for pending orders

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

Rev 9404 – Changes to create snapdeal inventory feed

vikram.raghav — Tue, 14 Jan 2014 11:09:36 +0530

vikram.raghav – 29 file(s) modified
Changes to create snapdeal inventory feed

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/SnapDealFeeds/pom.xml
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/Inventory.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/InventoryItems.java
x /trunk/SnapDealFeeds/src/main/java/inventory/ObjectFactory.java
x /trunk/SnapDealFeeds/src/main/java/inventory/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/SnapdealItemForInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SnapdealItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/SnapdealInventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9339 – Changes done for Shipping from Mumbai Warehouse

manish.sharma — Thu, 09 Jan 2014 17:26:20 +0530

manish.sharma – 1 file(s) modified
Changes done for Shipping from Mumbai Warehouse

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

Rev 9159 – Change for Searching Flipkart/Snapdeal/Ebay Ordersin OM-Dashboard

amar.kumar — Wed, 18 Dec 2013 04:14:08 +0530

amar.kumar – 27 file(s) modified
Change for Searching Flipkart/Snapdeal/Ebay Ordersin OM-Dashboard

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchEbayOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchEbayOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchFlipkartOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchFlipkartOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchSnapdealOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchSnapdealOrderEventHandler.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/SearchEbayOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchFlipkartOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchSnapdealOrderBox.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/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchEbayOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchFlipkartOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchSnapdealOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchEbayOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchFlipkartOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchSnapdealOrderRequest.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TaxType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9107 – Changes to update awb and shipbydate for a confirmed flipkartorder

vikram.raghav — Thu, 12 Dec 2013 12:32:07 +0530

vikram.raghav – 6 file(s) modified
Changes to update awb and shipbydate for a confirmed flipkartorder

~ /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 8990 – Created method getflipkartorder to be used in om dashboard

vikram.raghav — Fri, 06 Dec 2013 10:43:59 +0530

vikram.raghav – 7 file(s) modified
Created method getflipkartorder to be used in om dashboard

Rev 8982 – Added Flipkart Order Source in Order Sevice thrift

vikram.raghav — Thu, 05 Dec 2013 13:48:14 +0530

vikram.raghav – 4 file(s) modified
Added Flipkart Order Source in Order Sevice thrift

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8961 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:03:46 +0530

vikram.raghav – 14 file(s) modified
Changes to create Flipkart Order.

~ /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/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8942 – Made changes as per new EMI guidelines of RBI.

rajveer — Tue, 03 Dec 2013 12:09:40 +0530

rajveer – 15 file(s) modified
Made changes as per new EMI guidelines of RBI.

~ /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/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.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/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 8802 – Changes in Snapdeal Order flow for checking duplicacy of order ...

amar.kumar — Thu, 14 Nov 2013 15:17:40 +0530

amar.kumar – 8 file(s) modified
Changes in Snapdeal Order flow for checking duplicacy of order using both referenceCode and subOrderId

~ /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/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8717 – Changes for billing of bad Inventory

amar.kumar — Wed, 06 Nov 2013 19:17:21 +0530

amar.kumar – 16 file(s) modified
Changes for billing of bad Inventory

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ProductCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8616 – Snapdeal Integration for Pricing Inventory and Orders

vikram.raghav — Wed, 30 Oct 2013 16:50:11 +0530

vikram.raghav – 31 file(s) modified
Snapdeal Integration for Pricing Inventory and Orders

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/SnapDealFeeds/.classpath
+ /trunk/SnapDealFeeds/.project
+ /trunk/SnapDealFeeds/pom.xml
+ /trunk/SnapDealFeeds/src
+ /trunk/SnapDealFeeds/src/main
+ /trunk/SnapDealFeeds/src/main/java
+ /trunk/SnapDealFeeds/src/main/java/in
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealPricingFeed.java
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
+ /trunk/SnapDealFeeds/src/main/java/inventory
+ /trunk/SnapDealFeeds/src/main/java/inventory/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/order
+ /trunk/SnapDealFeeds/src/main/java/order/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/order/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/pricing
+ /trunk/SnapDealFeeds/src/main/java/pricing/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/pricing/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/utilities
+ /trunk/SnapDealFeeds/src/main/java/utilities/ScpService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8532 – Added snapshot dates to Estimation reports.

vikram.raghav — Mon, 21 Oct 2013 20:04:12 +0530

vikram.raghav – 16 file(s) modified
Added snapshot dates to Estimation reports.

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBASalesReportExceptForMobilesTablets.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonInventory.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FileParser.java
+ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/ItemSale.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FbaItemPrices.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 8488 – Changes for creating/invoicing/accepting Snapdeal orders

amar.kumar — Thu, 17 Oct 2013 14:23:21 +0530

amar.kumar – 19 file(s) modified
Changes for creating/invoicing/accepting Snapdeal orders

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreStatisticsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealDashboardController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-dashboard-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-order-creator-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SnapdealOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8303 – Additional Changes related to Ebay

amar.kumar — Mon, 07 Oct 2013 03:57:13 +0530

amar.kumar – 32 file(s) modified
Additional Changes related to Ebay

~ /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/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderCountsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderCountsRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderRequest.java
~ /trunk/PyProj/src/shop2020/helpers/impl/model/DashboardUser.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryStockReportGenerator.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayAwbUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayBluedartPaisapayUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-awb-uploader-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8282 – Changes to Estimate Amazon FBA Stock.

kshitij.sood — Fri, 04 Oct 2013 12:01:30 +0530

kshitij.sood – 21 file(s) modified
Changes to Estimate Amazon FBA Stock.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/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/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/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/inventory/AmazonFbaInventorySnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.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/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8241 – Additional Changes for Ebay 1) to add extra digits ...

amar.kumar — Mon, 30 Sep 2013 12:05:18 +0530

amar.kumar – 15 file(s) modified
Additional Changes for Ebay
1) to add extra digits in order form to paisapayId for Bluedart
2) Use overridden billingPrice
3) Set proper total weight

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayBluedartPaisapayUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-bluedart-paisapay-uploader-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8182 – Changes related to EBAY and minor changes related to use ...

amar.kumar — Tue, 24 Sep 2013 19:33:26 +0530

amar.kumar – 80 file(s) modified
Changes related to EBAY and minor changes related to use of rto orders for PO creation

Reviewed By: Rajveer Singh

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayAramexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayBluedartInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayDTDCInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayFedexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayHeaderFooterProvider.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.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/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderResponse.java
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo-grey-bg.jpg
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/paisapay-logo.jpg
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/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/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /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/purchase/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayColorChangeController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayDashboardController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbaySubsidyUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
+ /trunk/Support/src/main/webapp/css/ebay.css
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-color-change-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-listing-uploader-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-normal-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-update-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-subsidy-uploader-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EbayItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 7967 – Send emails to all stores where no recharge happened on ...

anupam.singh — Mon, 12 Aug 2013 18:40:59 +0530

anupam.singh – 12 file(s) modified
Send emails to all stores where no recharge happened on a given day.

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

Rev 7936 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:36:25 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Integration - Tracking and Shipment Creation on 06-Aug-2013

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

Rev 7822 – Adding option to change freebie Item for order and updating ...

amar.kumar — Thu, 25 Jul 2013 13:37:56 +0530

amar.kumar – 14 file(s) modified
Adding option to change freebie Item for order and updating alert thresholds for monitoring

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeFreebieItemEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeFreebieItemEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChangeFreebieItemBox.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/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/ChangeFreebieItemHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeFreebieItemRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeFreebieItemResponse.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7792 – - Changes to logistics provider details - Added support for ...

anupam.singh — Mon, 22 Jul 2013 15:31:31 +0530

anupam.singh – 18 file(s) modified
- Changes to logistics provider details
- Added support for uploading awb list in file as well as downloading reports in excel

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7762 – Updated DS

kshitij.sood — Thu, 18 Jul 2013 11:34:27 +0530

kshitij.sood – 5 file(s) modified
Updated DS

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7742 –

kshitij.sood — Thu, 11 Jul 2013 16:44:37 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7730 – Added option to convert "pickup-in-store" orders to "normal" orders

anupam.singh — Wed, 10 Jul 2013 19:43:27 +0530

anupam.singh – 11 file(s) modified
Added option to convert "pickup-in-store" orders to "normal" orders

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7685 –

vikram.raghav — Thu, 04 Jul 2013 16:54:21 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7672 – Changes made to add nlc.

rajveer — Tue, 02 Jul 2013 12:26:47 +0530

rajveer – 28 file(s) modified
Changes made to add nlc.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.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/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.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/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /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/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7645 – RTO, Return and DOA flow for Store orders.

anupam.singh — Thu, 27 Jun 2013 18:13:10 +0530

anupam.singh – 10 file(s) modified
RTO, Return and DOA flow for Store orders.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /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 7572 – Added option to search by amazon order id. Also modified ...

anupam.singh — Wed, 19 Jun 2013 01:40:15 +0530

anupam.singh – 11 file(s) modified
Added option to search by amazon order id. Also modified "search by mobile number" to fetch orders with given mobile number and not the orders by user associated with that mobile number .

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7560 – Added method to change courier provider.

rajveer — Tue, 18 Jun 2013 14:19:18 +0530

rajveer – 6 file(s) modified
Added method to change courier provider.

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

vikram.raghav — Sat, 15 Jun 2013 17:40:25 +0530

vikram.raghav – 7 file(s) modified

Rev 7530 – Added lastUpdatedon field in sourcedetail

kshitij.sood — Fri, 14 Jun 2013 21:44:12 +0530

kshitij.sood – 9 file(s) modified
Added lastUpdatedon field in sourcedetail

Rev 7461 – Amazon file processor and changes to update hold and default ...

kshitij.sood — Tue, 11 Jun 2013 17:05:25 +0530

kshitij.sood – 4 file(s) modified
Amazon file processor and changes to update hold and default inventory.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 7442 – Amazon Acknowledgement Feed Changes

vikram.raghav — Mon, 10 Jun 2013 22:56:09 +0530

vikram.raghav – 8 file(s) modified
Amazon Acknowledgement Feed Changes

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrdersToAcknowledge.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift