SmartDukaan – /

Rev 9356 – small change

kshitij.sood — Fri, 10 Jan 2014 17:45:47 +0530

kshitij.sood – 1 file(s) modified
small change

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java

Rev 9355 – Cosmetic changes

kshitij.sood — Fri, 10 Jan 2014 15:51:03 +0530

kshitij.sood – 3 file(s) modified
Cosmetic changes

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 9354 – Reverted to old.Getting redirection url from div again.

kshitij.sood — Fri, 10 Jan 2014 13:47:07 +0530

kshitij.sood – 1 file(s) modified
Reverted to old.Getting redirection url from div again.

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

Rev 9353 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:19:08 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

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

Rev 9352 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:18:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

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

Rev 9351 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:18:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

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

Rev 9350 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:06:06 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/feedshandler/ContentFeedsHandler.java

Rev 9349 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:05:46 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 9348 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 12:58:31 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/feedshandler/ContentFeedsHandler.java

Rev 9347 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 12:57:09 +0530

manish.sharma – 29 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

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

Rev 9346 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 12:54:45 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

~ /trunk/AdwordsServices/pom.xml

Rev 9345 – Changed continue to pass in exception catch block

anupam.singh — Fri, 10 Jan 2014 11:53:45 +0530

anupam.singh – 1 file(s) modified
Changed continue to pass in exception catch block

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

Rev 9344 – Removed "/" from all uris.

amit.gupta — Thu, 09 Jan 2014 18:11:32 +0530

amit.gupta – 1 file(s) modified
Removed "/" from all uris.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/PojoPopulator.java

Rev 9343 – Fixed issue on flipkart order creation

vikram.raghav — Thu, 09 Jan 2014 17:56:16 +0530

vikram.raghav – 1 file(s) modified
Fixed issue on flipkart order creation

~ /trunk/Common/src/main/java/in/shop2020/serving/model/Order.java

Rev 9342 – Corrected status for reconciliation for store recharge.

rajveer — Thu, 09 Jan 2014 17:55:19 +0530

rajveer – 1 file(s) modified
Corrected status for reconciliation for store recharge.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 9341 – Getting data for 2 months instead of one

anupam.singh — Thu, 09 Jan 2014 17:55:15 +0530

anupam.singh – 1 file(s) modified
Getting data for 2 months instead of one

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 9340 – Correcting logic for previous month

anupam.singh — Thu, 09 Jan 2014 17:32:45 +0530

anupam.singh – 1 file(s) modified
Correcting logic for previous month

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

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 9338 – Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse ...

manish.sharma — Thu, 09 Jan 2014 16:14:25 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse on Jan-09-2014

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java
~ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.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/ReshipOrderHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 9337 – Simple changes .

kshitij.sood — Thu, 09 Jan 2014 15:51:05 +0530

kshitij.sood – 1 file(s) modified
Simple changes .

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

Rev 9336 – Added sorting.

amit.gupta — Thu, 09 Jan 2014 15:47:39 +0530

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

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CategoryController.java

Rev 9335 – Added sorting.

amit.gupta — Thu, 09 Jan 2014 15:00:31 +0530

amit.gupta – 2 file(s) modified
Added sorting.

Rev 9334 – Snapdeal scraper

kshitij.sood — Thu, 09 Jan 2014 12:04:30 +0530

kshitij.sood – 1 file(s) modified
Snapdeal scraper

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

Rev 9333 – Added itemId in message.

rajveer — Thu, 09 Jan 2014 11:28:50 +0530

rajveer – 1 file(s) modified
Added itemId in message.

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

Rev 9332 – Keep updating until we reach the bottom.

rajveer — Thu, 09 Jan 2014 11:21:48 +0530

rajveer – 1 file(s) modified
Keep updating until we reach the bottom.

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

Rev 9331 – Round the pricing.

rajveer — Thu, 09 Jan 2014 11:00:34 +0530

rajveer – 1 file(s) modified
Round the pricing.

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

Rev 9330 –

vikram.raghav — Wed, 08 Jan 2014 12:25:30 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonSalesSnapshot.java

Rev 9329 – Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

manish.sharma — Tue, 07 Jan 2014 19:31:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

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

Rev 9328 – Proper error handling

rajveer — Tue, 07 Jan 2014 18:56:12 +0530

rajveer – 2 file(s) modified
Proper error handling

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorPriceController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-price-authsuccess.vm

Rev 9327 – Added logistics

amit.gupta — Tue, 07 Jan 2014 18:22:51 +0530

amit.gupta – 4 file(s) modified
Added logistics

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CategoryController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EstimateController.java
+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/LogisticsService.java

Rev 9326 – Corredted bug

rajveer — Tue, 07 Jan 2014 18:21:12 +0530

rajveer – 1 file(s) modified
Corredted bug

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

Rev 9325 – Corredted bug

rajveer — Tue, 07 Jan 2014 18:15:22 +0530

rajveer – 1 file(s) modified
Corredted bug

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

Rev 9324 – Added logistics

amit.gupta — Tue, 07 Jan 2014 17:55:44 +0530

amit.gupta – 2 file(s) modified
Added logistics

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ContentPojo.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/LogisticsInfoPojo.java

Rev 9323 –

amit.gupta — Tue, 07 Jan 2014 17:54:58 +0530

amit.gupta – 3 file(s) modified

x /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/CatalogPojo.java
x /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/ItemPojo.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/SolrResultPojo.java

Rev 9322 – Panel to Update pricing for a vendor

rajveer — Tue, 07 Jan 2014 17:53:33 +0530

rajveer – 2 file(s) modified
Panel to Update pricing for a vendor

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorPriceController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-price-authsuccess.vm

Rev 9321 – Adding reconciliation with mobisoc

anupam.singh — Tue, 07 Jan 2014 15:24:01 +0530

anupam.singh – 2 file(s) modified
Adding reconciliation with mobisoc

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 9320 – Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

manish.sharma — Tue, 07 Jan 2014 14:56:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

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

Rev 9319 – Change for showing proper tax type while billing from Bombay ...

amar.kumar — Tue, 07 Jan 2014 11:56:34 +0530

amar.kumar – 1 file(s) modified
Change for showing proper tax type while billing from Bombay warehouse

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

Rev 9318 – Cosmetic changes

kshitij.sood — Tue, 07 Jan 2014 11:46:25 +0530

kshitij.sood – 1 file(s) modified
Cosmetic changes

~ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 9317 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 18:21:33 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

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