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

Rev 9416 – Changes for 1) Allow Billing of Orders on CForm 2) ...

amar.kumar — Tue, 14 Jan 2014 16:22:52 +0530

amar.kumar – 23 file(s) modified
Changes for
1) Allow Billing of Orders on CForm
2) Store and Show Mrp of items purchased in Purchase-order page
3) Add Support for C-Form in purchase-orders

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.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/BulkOrderController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 9404 – Changes to create snapdeal inventory feed

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

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

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

Rev 9339 – Changes done for Shipping from Mumbai Warehouse

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

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

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

Rev 9299 – Service changes for one assist

kshitij.sood — Mon, 06 Jan 2014 15:47:54 +0530

kshitij.sood – 24 file(s) modified
Service changes for one assist

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/order/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/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InsurerType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInsurerMapping.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 9287 – Committed by Manish Sharma for Displaying Pay Method for Citi ...

manish.sharma — Mon, 06 Jan 2014 11:45:16 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Pay Method for Citi Bank 12 Months EMI on Jan-06-2014

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java

Rev 9253 – Pass isAndroid field to the catalog service from content for ...

rajveer — Mon, 30 Dec 2013 14:09:33 +0530

rajveer – 7 file(s) modified
Pass isAndroid field to the catalog service from content for android mobile phones.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 9242 – Changes related to snapdeal .

kshitij.sood — Fri, 27 Dec 2013 17:08:07 +0530

kshitij.sood – 18 file(s) modified
Changes related to snapdeal .

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealListController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/item-details-json.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-add-item.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-item-table.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-list-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SnapdealItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SnapdealItemDetails.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 9233 – Committed by Manish Sharma for Google Adwords Service on Dec-24-2013

manish.sharma — Tue, 24 Dec 2013 17:48:03 +0530

manish.sharma – 4 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Dec-24-2013

~ /trunk/PyProj/src/shop2020/thriftpy/googleadwords/GoogleAdwordsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/googleadwords/GoogleAdwordsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/GoogleAdwordsService.java
~ /trunk/ThriftGen/thriftsrc/GoogleAdwordsService/GoogleAdwordsService.thrift

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

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

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

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchEbayOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchEbayOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchFlipkartOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchFlipkartOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchSnapdealOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchSnapdealOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchEbayOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchFlipkartOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchSnapdealOrderBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchEbayOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchFlipkartOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchSnapdealOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchEbayOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchFlipkartOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchSnapdealOrderRequest.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TaxType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9155 – Added bannetr type and banners for mobile site (addition and ...

kshitij.sood — Tue, 17 Dec 2013 16:09:02 +0530

kshitij.sood – 23 file(s) modified
Added bannetr type and banners for mobile site (addition and retrieval logic)

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerCongregate.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm

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

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

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

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

Rev 9057 – Committed by Manish Sharma for Google Adwords Service on Dec-10-2013

manish.sharma — Tue, 10 Dec 2013 11:09:29 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Dec-10-2013

~ /trunk/PyProj/src/shop2020/thriftpy/googleadwords/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsAdGroup.java
~ /trunk/ThriftGen/thriftsrc/GoogleAdwordsService/GoogleAdwordsService.thrift

Rev 9048 – Committed by Manish Sharma for Google Adwords Service on Dec-09-2013

manish.sharma — Mon, 09 Dec 2013 11:01:09 +0530

manish.sharma – 11 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Dec-09-2013

+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsAdGroup.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsAdGroupAd.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsAdGroupStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsAdKeyword.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsCampaign.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/AdwordsCampaignStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/GoogleAdwordsService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/GoogleAdwordsServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/KeywordMatchType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/googleadwords/NetworkSettingType.java

Rev 8990 – Created method getflipkartorder to be used in om dashboard

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

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

Rev 8982 – Added Flipkart Order Source in Order Sevice thrift

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

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

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

Rev 8961 – Changes to create Flipkart Order.

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

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8958 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:40:55 +0530

vikram.raghav – 1 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java

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

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

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 8915 – Service changes for replacing openx.

kshitij.sood — Thu, 28 Nov 2013 14:04:44 +0530

kshitij.sood – 4 file(s) modified
Service changes for replacing openx.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8914 – Changed method to return gateway status for a payment.

rajveer — Thu, 28 Nov 2013 12:06:38 +0530

rajveer – 6 file(s) modified
Changed method to return gateway status for a payment.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 8910 – Change to add a new UserType "Warehouse-Observer" for OM-Dashboard and ...

amar.kumar — Wed, 27 Nov 2013 20:17:33 +0530

amar.kumar – 6 file(s) modified
Change to add a new UserType "Warehouse-Observer" for OM-Dashboard
and granting additional privileges to "Warehouse-Monitor"

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UserType.java
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Role.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 8907 – Made the changed in payment service to handle hdfc payment ...

rajveer — Wed, 27 Nov 2013 17:45:11 +0530

rajveer – 4 file(s) modified
Made the changed in payment service to handle hdfc payment validation.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

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 8739 – Snapdeal order controller to process orders automatically

vikram.raghav — Sun, 10 Nov 2013 20:06:34 +0530

vikram.raghav – 14 file(s) modified
Snapdeal order controller to process orders automatically

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 8707 – Changes commited by Manish Sharma for User Coupon Generation on ...

manish.sharma — Tue, 05 Nov 2013 16:13:57 +0530

manish.sharma – 13 file(s) modified
Changes commited by Manish Sharma for User Coupon Generation on Nov-05-2013

~ /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/PromotionDataAccessors.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/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CouponCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 8626 – Change for Inventory Aging report to ignore in transit inventory ...

amar.kumar — Thu, 31 Oct 2013 12:24:55 +0530

amar.kumar – 4 file(s) modified
Change for Inventory Aging report to ignore in transit inventory and to include non serialized inventory

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 8619 – Service changes for amazon.

kshitij.sood — Wed, 30 Oct 2013 18:04:27 +0530

kshitij.sood – 9 file(s) modified
Service changes for amazon.

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 8616 – Snapdeal Integration for Pricing Inventory and Orders

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

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

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

Rev 8590 – Minor updates.

kshitij.sood — Mon, 28 Oct 2013 11:40:51 +0530

kshitij.sood – 11 file(s) modified
Minor updates.

Rev 8580 – Option to add vat in Purchase Report

amar.kumar — Fri, 25 Oct 2013 16:27:16 +0530

amar.kumar – 5 file(s) modified
Option to add vat in Purchase Report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 8579 – Banner Implementation uri based.

kshitij.sood — Fri, 25 Oct 2013 16:20:09 +0530

kshitij.sood – 11 file(s) modified
Banner Implementation uri based.

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

vikram.raghav — Mon, 21 Oct 2013 20:22:18 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8532 – Added snapshot dates to Estimation reports.

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

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

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBASalesReportExceptForMobilesTablets.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonInventory.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FileParser.java
+ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/ItemSale.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FbaItemPrices.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8488 – Changes for creating/invoicing/accepting Snapdeal orders

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

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

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

Rev 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 8379 – Amazon Listing Changes

vikram.raghav — Fri, 11 Oct 2013 16:30:52 +0530

vikram.raghav – 7 file(s) modified
Amazon Listing Changes

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAListingFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAListingFeed.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8370 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Fri, 11 Oct 2013 11:29:58 +0530

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

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java