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

Rev 12872 – Added gurgaon for Amazon Warehouse FC Location.

amit.gupta — Thu, 09 Oct 2014 13:19:23 +0530

amit.gupta – 6 file(s) modified
Added gurgaon for Amazon Warehouse FC Location.

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

Rev 12800 – Committed by Manish Sharma for New Inventory Age Report Logic ...

manish.sharma — Mon, 29 Sep 2014 18:39:09 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for New Inventory Age Report Logic on 29-Sep-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /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/warehouse/DetailedPurchaseScan.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InvAgeConsiderItems.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/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 12783 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 20:39:39 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 12776 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 16:42:01 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

Rev 12772 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 13:09:26 +0530

manish.sharma – 11 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartAdvantageOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12722 – Added user search api

amit.gupta — Tue, 23 Sep 2014 19:18:23 +0530

amit.gupta – 13 file(s) modified
Added user search api

+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 12696 – Added Counter Registration logic

amit.gupta — Mon, 22 Sep 2014 10:36:26 +0530

amit.gupta – 26 file(s) modified
Added Counter Registration logic

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ForgotPasswordController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/NotificationPojo.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuth.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuthRole.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Location.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 12691 – Committed by Manish Sharma for Sms Integration on 18-Sep-2014

manish.sharma — Thu, 18 Sep 2014 16:58:06 +0530

manish.sharma – 15 file(s) modified
Committed by Manish Sharma for Sms Integration on 18-Sep-2014

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
+ /trunk/PyProj/src/shop2020/helpers/impl/SmsSender.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsDeliveryStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSms.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSmsInfo.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 12663 – Service changes for amazon promo, feed and dashboard

kshitij.sood — Wed, 17 Sep 2014 13:00:48 +0530

kshitij.sood – 6 file(s) modified
Service changes for amazon promo, feed and dashboard

Rev 12653 –

manish.sharma — Tue, 16 Sep 2014 18:23:01 +0530

manish.sharma – 13 file(s) modified

~ /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/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/js/bulk-order-billing.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12620 – Added changes related to exclusive affiliate program

amit.gupta — Fri, 12 Sep 2014 16:10:17 +0530

amit.gupta – 20 file(s) modified
Added changes related to exclusive affiliate program

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveAffiliateItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/OutbuoundAffiliate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 12619 – Reverted asin change

kshitij.sood — Fri, 12 Sep 2014 11:13:28 +0530

kshitij.sood – 9 file(s) modified
Reverted asin change

~ /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/FetchAmazonXMLSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/XMLFileParser.java
~ /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 12617 – Changes done to accomodate asin in report

kshitij.sood — Thu, 11 Sep 2014 17:51:53 +0530

kshitij.sood – 4 file(s) modified
Changes done to accomodate asin in report

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FbaSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonXMLSalesSnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12615 – Added FAO

amit.gupta — Wed, 10 Sep 2014 08:17:31 +0530

amit.gupta – 1 file(s) modified
Added FAO

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartAdvantageOrder.java

Rev 12614 – Added Junglee specific changes.

amit.gupta — Tue, 09 Sep 2014 23:12:54 +0530

amit.gupta – 13 file(s) modified
Added Junglee specific changes.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/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 12589 – Committed by Manish Sharma for Flipkart FA Changes and also ...

manish.sharma — Wed, 03 Sep 2014 18:34:14 +0530

manish.sharma – 10 file(s) modified
Committed by Manish Sharma for Flipkart FA Changes and also related to Hold Orders on 03-Sep-2014

+ /trunk/Common/src/main/java/in/shop2020/serving/model/FreebieItem.java
~ /trunk/Common/src/main/java/in/shop2020/serving/model/Order.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12580 – Added new Source.

amit.gupta — Tue, 02 Sep 2014 17:36:01 +0530

amit.gupta – 5 file(s) modified
Added new Source.

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

Rev 12531 – Committed by Manish Sharma for Check Imei Status Before GRN ...

manish.sharma — Fri, 22 Aug 2014 15:40:13 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for Check Imei Status Before GRN on 22-Aug-2014

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CheckGrnImeiController.java
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/check-grn-imei.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 12523 – Added feature to mark products partially active and update vat ...

amit.gupta — Thu, 21 Aug 2014 16:43:10 +0530

amit.gupta – 11 file(s) modified
Added feature to mark products partially active and update vat rates accordingly.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/PartiallyActiveDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/StateVat.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemActions.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/PartiallyActiveDialog.ui.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 12449 – amazon dashboard changes

kshitij.sood — Thu, 14 Aug 2014 19:02:50 +0530

kshitij.sood – 78 file(s) modified
amazon dashboard changes

~ /trunk/AmazonFeeds/.project
~ /trunk/AmazonFeeds/pom.xml
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/AmazonItem.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateNonFBAInventoryAndPricingFlatFile.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ProcessFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitAdjustmentFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAInventoryFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBBListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeedAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBBPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalNonFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsSample.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/PromotionFeed.java
+ /trunk/Support/src/main/webapp/css/jquery.datepick.css
+ /trunk/Support/src/main/webapp/js/jquery.datepick.js
+ /trunk/Support/src/main/webapp/js/jquery.plugin.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion-result.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion-upload.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-shipping-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java

Rev 12397 – Amazon auto pricing - Initial commit

kshitij.sood — Tue, 12 Aug 2014 22:08:21 +0530

kshitij.sood – 1 file(s) modified
Amazon auto pricing - Initial commit

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

Rev 12396 – Amazon auto pricing - Initial commit

kshitij.sood — Tue, 12 Aug 2014 21:56:21 +0530

kshitij.sood – 11 file(s) modified
Amazon auto pricing - Initial commit

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/AmazonAsyncScraper.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/AmazonHistoryPopulator.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12363 – Amazon auto pricing - Initial commit

kshitij.sood — Tue, 12 Aug 2014 05:44:05 +0530

kshitij.sood – 22 file(s) modified
Amazon auto pricing - Initial commit

~ /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/catalog/script/AmazonAsyncScraper.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/AmazonHistoryPopulator.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/SellerCentralInventoryReport.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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AmazonPromotion.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AmazonPromotionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CompetitionCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 12357 – Committed by Manish Sharma for Weighted Nlc Avg Calculation on ...

manish.sharma — Fri, 08 Aug 2014 20:13:33 +0530

manish.sharma – 20 file(s) modified
Committed by Manish Sharma for Weighted Nlc Avg Calculation on 08-Aug-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/AmazonStockWeightedNlcInfoUpdater.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/NlcPlusUpdater.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StockWeightedNlcInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/AmazonTransferredSkuDetail.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/AmazonTransferredSkuDetail.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 12280 – Introducted vat type for states.

amit.gupta — Fri, 01 Aug 2014 15:06:36 +0530

amit.gupta – 16 file(s) modified
Introducted vat type for states.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /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/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VatType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12256 – Changes related to bulk scrape

kshitij.sood — Fri, 01 Aug 2014 04:28:02 +0530

kshitij.sood – 27 file(s) modified
Changes related to bulk scrape

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.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/catalog/script/AmazonScraper.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompetitorScraping.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/FlipkartScraper.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/SellerCentralScraper.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/utils/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CompetitionScrapingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java
+ /trunk/Support/src/main/webapp/images/galary_loading.gif
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-scraping-addItem.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-scraping-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-scraping-previous.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-scraping-show.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-scraping-upload.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CompetitorPricing.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/ReportUser.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 12244 –

kshitij.sood — Wed, 30 Jul 2014 13:14:16 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CompetitorPricing.java

Rev 12243 – Chnaes in pvt deals comparison

kshitij.sood — Wed, 30 Jul 2014 13:12:25 +0530

kshitij.sood – 11 file(s) modified
Chnaes in pvt deals comparison

Rev 12169 – Added las processed timestamp

kshitij.sood — Wed, 23 Jul 2014 18:10:48 +0530

kshitij.sood – 6 file(s) modified
Added las processed timestamp

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PrivateDealsComparisonController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/private-deals-comparison-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/PdPriceComp.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 12133 – Changes regarding return provision & insurance for snapdeal

kshitij.sood — Sat, 19 Jul 2014 13:48:10 +0530

kshitij.sood – 15 file(s) modified
Changes regarding return provision & insurance for snapdeal

Rev 12109 – Reverted by Manish Sharma on 16-Jul-2014

manish.sharma — Thu, 17 Jul 2014 16:38:55 +0530

manish.sharma – 1 file(s) modified
Reverted by Manish Sharma on 16-Jul-2014

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

Rev 12103 – Committed by Manish Sharma for Amazon FBA Sale Return Report ...

manish.sharma — Wed, 16 Jul 2014 20:15:10 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Amazon FBA Sale Return Report on 16-Jul-2014

+ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonOrderReturnsData.java
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaOrderReturns.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FbaSkuSaleReturnDetail.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 11982 –

amit.gupta — Thu, 10 Jul 2014 12:45:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 11980 – Added coupon infra for auto application.

amit.gupta — Thu, 10 Jul 2014 12:16:56 +0530

amit.gupta – 10 file(s) modified
Added coupon infra for auto application.

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

Rev 11905 – Changes related private deal price comparison

kshitij.sood — Thu, 03 Jul 2014 20:21:09 +0530

kshitij.sood – 9 file(s) modified
Changes related private deal price comparison

Rev 11896 – Added logic of store affiliate.

amit.gupta — Thu, 03 Jul 2014 18:20:53 +0530

amit.gupta – 11 file(s) modified
Added logic of store affiliate.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java
~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /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-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
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 11890 – Crm changes related to bulk order enquiry & private deals.

kshitij.sood — Thu, 03 Jul 2014 17:23:48 +0530

kshitij.sood – 25 file(s) modified
Crm changes related to bulk order enquiry & private deals.

~ /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/UserInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/util/BulkOrderEmailReader.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/DesEncrypter.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/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 11819 – Sending cart instead of just coupon

amit.gupta — Sat, 28 Jun 2014 13:10:00 +0530

amit.gupta – 6 file(s) modified
Sending cart instead of just coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 11801 – Committed by Manish Sharma for Direct Scan to Amazon Warehouses ...

manish.sharma — Thu, 26 Jun 2014 21:55:50 +0530

manish.sharma – 16 file(s) modified
Committed by Manish Sharma for Direct Scan to Amazon Warehouses on 26-Jun-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BulkPurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/bulk-purchase-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Purchase.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 11751 – Committed by Manish Sharma for Change in Details required for ...

manish.sharma — Tue, 24 Jun 2014 19:42:03 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Change in Details required for Purchase Return Items on 24-Jun-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /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