SmartDukaan – /

Rev 9465 –

vikram.raghav — Thu, 16 Jan 2014 14:36:55 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java

Rev 9464 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 14:06:07 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

~ /trunk/InventoryManager/src/main/webapp/js/product-feeds.js

Rev 9463 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 14:02:24 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9462 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 14:02:12 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/WEB-INF/content/google-adwords-index.vm

Rev 9461 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 14:01:57 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/GoogleAdwordsController.java

Rev 9460 –

vikram.raghav — Thu, 16 Jan 2014 13:39:17 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java

Rev 9459 –

vikram.raghav — Thu, 16 Jan 2014 13:35:09 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java

Rev 9458 – Snapdeal inventory feed and maxnlc to be stored along with ...

vikram.raghav — Thu, 16 Jan 2014 13:25:53 +0530

vikram.raghav – 1 file(s) modified
Snapdeal inventory feed and maxnlc to be stored along with listing and order.

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java

Rev 9457 –

kshitij.sood — Thu, 16 Jan 2014 13:17:10 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py

Rev 9456 – Snapdeal inventory feed and maxnlc to be stored along with ...

vikram.raghav — Thu, 16 Jan 2014 13:05:43 +0530

vikram.raghav – 32 file(s) modified
Snapdeal inventory feed and maxnlc to be stored along with listing and order.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.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/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/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/InventoryHistory.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/InventoryHistoryItems.java
~ /trunk/SnapDealFeeds/src/main/java/order/SaholicAPI.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.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/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SnapdealOrder.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9455 –

kshitij.sood — Thu, 16 Jan 2014 12:47:42 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py

Rev 9454 –

kshitij.sood — Thu, 16 Jan 2014 12:45:37 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py

Rev 9453 –

kshitij.sood — Thu, 16 Jan 2014 12:40:27 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py

Rev 9452 – Showing all DOA_OUT cases in ...

amar.kumar — Thu, 16 Jan 2014 12:36:44 +0530

amar.kumar – 1 file(s) modified
Showing all DOA_OUT cases in "DOA Items Awaiting Replacement" page

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java

Rev 9451 –

kshitij.sood — Thu, 16 Jan 2014 12:34:07 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py

Rev 9450 –

vikram.raghav — Thu, 16 Jan 2014 12:21:48 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeedAndFetchResults.java

Rev 9449 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:31:19 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ProductFeedsController.java

Rev 9448 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:30:38 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

~ /trunk/InventoryManager/src/main/webapp/css/common.css

Rev 9447 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:30:22 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

+ /trunk/InventoryManager/src/main/webapp/js/product-feeds.js

Rev 9446 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:29:35 +0530

manish.sharma – 3 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/product-feeds-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/product-feeds-output.vm

Rev 9445 – Commited by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:29:09 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

~ /trunk/InventoryManager/pom.xml

Rev 9444 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 11:27:03 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/pom.xml

Rev 9443 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 11:22:05 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/AdwordsServices/pom.xml

Rev 9442 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 11:19:53 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicAdKeywordsSync.java

Rev 9441 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 11:16:42 +0530

manish.sharma – 4 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/AddKeywords.java
~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetAdGroups.java
~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetKeywords.java
~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/UpdateKeyword.java

Rev 9440 – Deleted by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:09:28 +0530

manish.sharma – 6 file(s) modified
Deleted by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/model
x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/BatchUtils.java
x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/CheckAuthorization.java
x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/ClientLibraryUtils.java
x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/DebugHelper.java
x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/UserInformation.java

Rev 9439 – Deleted by Manish Sharma for Seperate Implementation of Product Feeds ...

manish.sharma — Thu, 16 Jan 2014 11:05:51 +0530

manish.sharma – 1 file(s) modified
Deleted by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014

x /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/feedshandler

Rev 9438 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 11:00:06 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/WEB-INF/content/google-adwords-output.vm

Rev 9437 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 10:59:42 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/WEB-INF/content/google-adwords-index.vm

Rev 9436 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 10:58:43 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9435 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 10:58:15 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/GoogleAdwordsController.java

Rev 9434 – Added by Manish Sharma for Product Feeds Submission

manish.sharma — Wed, 15 Jan 2014 20:28:10 +0530

manish.sharma – 43 file(s) modified
Added by Manish Sharma for Product Feeds Submission

+ /trunk/SaholicProductFeeds
+ /trunk/SaholicProductFeeds/.classpath
+ /trunk/SaholicProductFeeds/.project
+ /trunk/SaholicProductFeeds/pom.xml
+ /trunk/SaholicProductFeeds/src
+ /trunk/SaholicProductFeeds/src/main
+ /trunk/SaholicProductFeeds/src/main/java
+ /trunk/SaholicProductFeeds/src/main/java/in
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/feedshandler
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/feedshandler/ContentFeedsHandler.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/AppControl.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Attribute.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/AttributeGroup.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/BatchableEntry.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Content.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/DataFeed.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/DataFeedFeed.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Entry.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Feed.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Link.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ManagedAccount.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ManagedAccountFeed.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Price.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Product.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ProductFeed.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ServiceError.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ServiceErrors.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ServiceNotReachableError.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Shipping.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/ShippingWeight.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/model/Tax.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/BatchUtils.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/CheckAuthorization.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/ClientLibraryUtils.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/DebugHelper.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/SampleUtil.java
+ /trunk/SaholicProductFeeds/src/main/java/in/shop2020/googleadwords/util/UserInformation.java
+ /trunk/SaholicProductFeeds/src/main/resources
+ /trunk/SaholicProductFeeds/src/main/resources/log4j.properties

Rev 9433 – Change related to CForm in Order and Purchase Order

amar.kumar — Wed, 15 Jan 2014 19:41:58 +0530

amar.kumar – 6 file(s) modified
Change related to CForm in Order and Purchase Order

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /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 9432 – Change for Showing CForm on Invoice if order is billed ...

amar.kumar — Wed, 15 Jan 2014 19:20:06 +0530

amar.kumar – 1 file(s) modified
Change for Showing CForm on Invoice if order is billed on 2% CST Against CForm

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 9431 – Item loader modified according to new requirement

rajveer — Wed, 15 Jan 2014 19:13:20 +0530

rajveer – 1 file(s) modified
Item loader modified according to new requirement

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py

Rev 9430 – Added vm for estimate.

amit.gupta — Wed, 15 Jan 2014 15:06:16 +0530

amit.gupta – 1 file(s) modified
Added vm for estimate.

+ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/estimate-index.vm

Rev 9429 – Removing DOA_In/DOA_Out entries before 2013 and also all hotspot entries

amar.kumar — Wed, 15 Jan 2014 14:35:38 +0530

amar.kumar – 2 file(s) modified
Removing DOA_In/DOA_Out entries before 2013 and also all hotspot entries

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java

Rev 9428 – Removing DOA_In/DOA_Out entries before 2013 and also all hotspot entries

amar.kumar — Wed, 15 Jan 2014 12:59:04 +0530

amar.kumar – 2 file(s) modified
Removing DOA_In/DOA_Out entries before 2013 and also all hotspot entries

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java

Rev 9427 – Added log if default image not found.

amit.gupta — Tue, 14 Jan 2014 19:46:13 +0530

amit.gupta – 1 file(s) modified
Added log if default image not found.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/PojoCreator.java

Rev 9426 –

kshitij.sood — Tue, 14 Jan 2014 18:59:29 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/Snapdeal.py