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

Rev 8895 – Change to update statusDescription while cancelling order for Ebay and ...

amar.kumar — Thu, 21 Nov 2013 16:44:39 +0530

amar.kumar – 1 file(s) modified
Change to update statusDescription while cancelling order for Ebay and Snapdeal Source

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

Rev 8885 – Moving orders to accepted state when snapdealorder is created

amar.kumar — Wed, 20 Nov 2013 15:47:08 +0530

amar.kumar – 1 file(s) modified
Moving orders to accepted state when snapdealorder is created

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

Rev 8881 – Changed the method snapdeal order exists condition from and to ...

vikram.raghav — Wed, 20 Nov 2013 12:49:19 +0530

vikram.raghav – 1 file(s) modified
Changed the method snapdeal order exists condition from and to or

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

Rev 8813 – Correcting filter() to filter_by() in snapdeal_order_exists method

amar.kumar — Fri, 15 Nov 2013 11:22:54 +0530

amar.kumar – 1 file(s) modified
Correcting filter() to filter_by() in snapdeal_order_exists method

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

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 8787 – Committed by Manish Sharma for Logistics Reconciliation Issue on Nov-13-2013

manish.sharma — Wed, 13 Nov 2013 15:30:52 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Reconciliation Issue on Nov-13-2013

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

Rev 8786 – Committed by Manish Sharma for Logistics Reconciliation Issue on Nov-13-2013

manish.sharma — Wed, 13 Nov 2013 15:23:34 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Reconciliation Issue on Nov-13-2013

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

Rev 8778 – changed response time to correct variable.

rajveer — Tue, 12 Nov 2013 15:49:41 +0530

rajveer – 1 file(s) modified
changed response time to correct variable.

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

Rev 8760 – Changed create snapdeal order to mark order status as submitted ...

vikram.raghav — Mon, 11 Nov 2013 18:50:27 +0530

vikram.raghav – 1 file(s) modified
Changed create snapdeal order to mark order status as submitted for processing only after a snapdeal order is created

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

Rev 8757 – If there is less amount in wallet, lets remove amount ...

rajveer — Mon, 11 Nov 2013 17:42:11 +0530

rajveer – 1 file(s) modified
If there is less amount in wallet, lets remove amount from wallet.

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

Rev 8735 – Removing recharge restriction

anupam.singh — Fri, 08 Nov 2013 20:25:05 +0530

anupam.singh – 1 file(s) modified
Removing recharge restriction

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

Rev 8734 – Not checking for successful payment

anupam.singh — Fri, 08 Nov 2013 18:32:01 +0530

anupam.singh – 1 file(s) modified
Not checking for successful payment

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

Rev 8733 – Patch for recharge issue where multiple payment was being created ...

anupam.singh — Fri, 08 Nov 2013 13:48:59 +0530

anupam.singh – 3 file(s) modified
Patch for recharge issue where multiple payment was being created for a single transaction

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

Rev 8729 – Patch for vulnerability in recharge where an attacker can increase ...

anupam.singh — Fri, 08 Nov 2013 04:02:00 +0530

anupam.singh – 4 file(s) modified
Patch for vulnerability in recharge where an attacker can increase his wallet balance without any payment

~ /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/SpicedeckRechargeVoucherService.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/WalletOnlyPaymentController.java

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

vikram.raghav — Sat, 02 Nov 2013 00:43:20 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8629 – Made the changes.

rajveer — Thu, 31 Oct 2013 12:40:18 +0530

rajveer – 1 file(s) modified
Made the changes.

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

Rev 8618 – Added isDigital field while capturing payment for ebs

rajveer — Wed, 30 Oct 2013 17:37:36 +0530

rajveer – 8 file(s) modified
Added isDigital field while capturing payment for ebs

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentCapturer.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java

Rev 8565 – Changes related to billing of Non Serialized Inventory and bad_sale

amar.kumar — Thu, 24 Oct 2013 15:20:39 +0530

amar.kumar – 10 file(s) modified
Changes related to billing of Non Serialized Inventory and bad_sale

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

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