SmartDukaan – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 8523 –

vikram.raghav — Mon, 21 Oct 2013 00:03:32 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8506 – Updating logic for auto generation of jacket number for Snapdeal ...

amar.kumar — Fri, 18 Oct 2013 14:41:12 +0530

amar.kumar – 1 file(s) modified
Updating logic for auto generation of jacket number for Snapdeal and Ebay

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8492 – Added max of 1 day for business count.

amit.gupta — Thu, 17 Oct 2013 17:17:20 +0530

amit.gupta – 1 file(s) modified
Added max of 1 day for business count.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 8445 – Added Our Price to Amazon FBA sales snapshot.Separated stock estimation ...

vikram.raghav — Wed, 16 Oct 2013 01:53:52 +0530

vikram.raghav – 9 file(s) modified
Added Our Price to Amazon FBA sales snapshot.Separated stock estimation for Mobile Tablets from Others.Added sorting to sheets

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendExceptMobilesTabletsFBAStockEstimation.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendMobilesTabletsFBAStockEstimation.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonSalesSnapshot.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8363 – FBA Stock Estimate Report changes

vikram.raghav — Thu, 10 Oct 2013 19:16:31 +0530

vikram.raghav – 20 file(s) modified
FBA Stock Estimate Report changes

+ /trunk/AmazonReports/CreateFbaStockReport.sh
+ /trunk/AmazonReports/FetchFbaSalesSnapshot.sh
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBAStockEstimation.java
+ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FbaSalesSnapshot.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/RequestReportSample.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /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/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8355 – Change to assign airwaybill number if airwaybill_no == "null"

amar.kumar — Thu, 10 Oct 2013 11:27:41 +0530

amar.kumar – 1 file(s) modified
Change to assign airwaybill number if airwaybill_no == "null"

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8344 – Adding logging and setting nlc and tp while creating orders

amar.kumar — Wed, 09 Oct 2013 13:46:30 +0530

amar.kumar – 1 file(s) modified
Adding logging and setting nlc and tp while creating orders

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8331 – Changes to set nlc and transfer price while creating Ebay ...

amar.kumar — Tue, 08 Oct 2013 14:51:36 +0530

amar.kumar – 1 file(s) modified
Changes to set nlc and transfer price while creating Ebay Orders

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8312 – Changes related for Search Option for Source Specific login

amar.kumar — Mon, 07 Oct 2013 12:55:16 +0530

amar.kumar – 6 file(s) modified
Changes related for Search Option for Source Specific login

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrderEvent.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/SearchBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrderRequest.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8307 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:33:44 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8306 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:27:10 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8305 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:23:39 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 8281 – Improvements related to dates for Ebay Uploaders

amar.kumar — Fri, 04 Oct 2013 02:16:40 +0530

amar.kumar – 5 file(s) modified
Improvements related to dates for Ebay Uploaders

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /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

Rev 8247 – Change for Ebay to convert Bluedart paisapayReference to String from ...

amar.kumar — Mon, 30 Sep 2013 15:01:52 +0530

amar.kumar – 8 file(s) modified
Change for Ebay to convert Bluedart paisapayReference to String from integer

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.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/Support/src/main/java/in/shop2020/support/controllers/EbayBluedartPaisapayUploaderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
~ /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 8206 – Avoiding warehouse reassignment while accepting the order

amar.kumar — Wed, 25 Sep 2013 16:29:04 +0530

amar.kumar – 1 file(s) modified
Avoiding warehouse reassignment while accepting the order

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 8128 – For COD/NONCOD awb, Declared value should be the original value ...

anupam.singh — Wed, 11 Sep 2013 19:02:27 +0530

anupam.singh – 2 file(s) modified
For COD/NONCOD awb, Declared value should be the original value of the shipment and it’s need to be provided in soft data.
In case of COD shipment, If no collectable amount is involved, then please use prepaid awb series for such shipments.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java

Rev 8125 – Using another variable to store freebie warehouse

anupam.singh — Wed, 11 Sep 2013 14:56:28 +0530

anupam.singh – 1 file(s) modified
Using another variable to store freebie warehouse

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8123 – Committed by Manish Sharma for Order Acception Issue on Sep-11-2013

manish.sharma — Wed, 11 Sep 2013 11:30:31 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Order Acception Issue on Sep-11-2013

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8115 – Committed by Manish Sharma for Airway Bill Generation Issue for ...

manish.sharma — Fri, 06 Sep 2013 18:26:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Airway Bill Generation Issue for Amazon Orders on 06-Sep-2013

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8076 – Separating coupon tracking and viewing of recharge result page

anupam.singh — Wed, 04 Sep 2013 18:13:31 +0530

anupam.singh – 2 file(s) modified
Separating coupon tracking and viewing of recharge result page

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java

Rev 8064 – Commited by Manish Sharma for Reconciliation for Store Physical orders ...

manish.sharma — Tue, 03 Sep 2013 16:26:31 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Reconciliation for Store Physical orders with OCR on 03-Sep-2013

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8020 – Create users based on amazon email id. Stop sending email ...

rajveer — Tue, 27 Aug 2013 15:10:45 +0530

rajveer – 13 file(s) modified
Create users based on amazon email id. Stop sending email to other sources users.

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/SpicedeckRechargeVoucherService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 8006 – Added attributes for clone order also.

rajveer — Thu, 22 Aug 2013 17:35:16 +0530

rajveer – 1 file(s) modified
Added attributes for clone order also.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8001 – Reship order should copy amazon order if require.

rajveer — Thu, 22 Aug 2013 13:19:06 +0530

rajveer – 1 file(s) modified
Reship order should copy amazon order if require.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7980 – Assign awb in case of reship.

rajveer — Fri, 16 Aug 2013 15:37:04 +0530

rajveer – 1 file(s) modified
Assign awb in case of reship.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7968 – Changes for 1) While billing Freebie Order changing order ...

amar.kumar — Tue, 13 Aug 2013 01:24:22 +0530

amar.kumar – 11 file(s) modified
Changes for
1) While billing Freebie Order changing order of scans. Now first checking if freebie is available, then billing main product, then billing freebie
2) Change in Daily Inventory Mismatch between CIS and warehouse db to take care of in transit inventory.
3)

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.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/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

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 7951 – Get a new AWB number in all cases when converting ...

anupam.singh — Wed, 07 Aug 2013 15:38:39 +0530

anupam.singh – 1 file(s) modified
Get a new AWB number in all cases when converting from pickup store order to normal order.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7945 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 18:23:08 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7903 – Removed buyback offer code.

rajveer — Mon, 05 Aug 2013 14:18:14 +0530

rajveer – 1 file(s) modified
Removed buyback offer code.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7861 – Updating Brand and Model on changing itemId for Freebie Order

amar.kumar — Tue, 30 Jul 2013 14:52:32 +0530

amar.kumar – 1 file(s) modified
Updating Brand and Model on changing itemId for Freebie Order

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7855 – Sending Freebie Item Id in call to getLogisticsInfo in SplitFreebieOrder ...

amar.kumar — Tue, 30 Jul 2013 12:59:32 +0530

amar.kumar – 1 file(s) modified
Sending Freebie Item Id in call to getLogisticsInfo in SplitFreebieOrder method

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7835 – Change to allow item change for split freebie order even ...

amar.kumar — Fri, 26 Jul 2013 16:23:36 +0530

amar.kumar – 1 file(s) modified
Change to allow item change for split freebie order even if catalog item id for new and old items are different

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7832 – Correcting EventType for Alert Service in case of Delivered At ...

amar.kumar — Fri, 26 Jul 2013 12:59:14 +0530

amar.kumar – 1 file(s) modified
Correcting EventType for Alert Service in case of Delivered At Store

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py