SmartDukaan – /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 12089 –

amit.gupta — Wed, 16 Jul 2014 08:38:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 12088 –

amit.gupta — Wed, 16 Jul 2014 01:44:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 12087 –

amit.gupta — Wed, 16 Jul 2014 01:35:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 12086 –

amit.gupta — Wed, 16 Jul 2014 01:19:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 11973 –

amit.gupta — Tue, 08 Jul 2014 19:18:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 11972 –

amit.gupta — Tue, 08 Jul 2014 19:17:14 +0530

amit.gupta – 1 file(s) modified

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

Rev 11970 –

amit.gupta — Tue, 08 Jul 2014 17:19:35 +0530

amit.gupta – 3 file(s) modified

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 11964 – Added json object

amit.gupta — Tue, 08 Jul 2014 08:37:00 +0530

amit.gupta – 13 file(s) modified
Added json object

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/gosf-terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/tag-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm

Rev 11676 – changed get to set

amit.gupta — Mon, 16 Jun 2014 16:08:23 +0530

amit.gupta – 1 file(s) modified
changed get to set

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

Rev 11672 – generating the delivery estimate on controller itself to reduce the ...

anikendra — Fri, 13 Jun 2014 18:26:53 +0530

anikendra – 4 file(s) modified
generating the delivery estimate on controller itself to reduce the time of display of the same

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 10195 – Added null check

amit.gupta — Thu, 13 Mar 2014 18:55:02 +0530

amit.gupta – 1 file(s) modified
Added null check

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

Rev 10190 – Changes in Website minor bug fixing

amit.gupta — Thu, 13 Mar 2014 14:43:34 +0530

amit.gupta – 4 file(s) modified
Changes in Website minor bug fixing

Rev 9840 – Added logistics with display text

amit.gupta — Tue, 11 Feb 2014 16:32:09 +0530

amit.gupta – 11 file(s) modified
Added logistics with display text

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ItemText.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /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/services/SolrSearchService.java

Rev 8315 – updated header with androidland.

amit.gupta — Mon, 07 Oct 2013 16:25:16 +0530

amit.gupta – 4 file(s) modified
updated header with androidland.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 7853 – EMI will now be displayed at product page as well.

amit.gupta — Tue, 30 Jul 2013 12:33:56 +0530

amit.gupta – 9 file(s) modified
EMI will now be displayed at product page as well.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CMPJythonWrapper.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 6593 – MP3 category is now live.

amit.gupta — Thu, 03 Jan 2013 01:23:59 +0530

amit.gupta – 2 file(s) modified
MP3 category is now live.

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

Rev 6084 – Removed promotion client reference.

rajveer — Thu, 04 Oct 2012 16:22:10 +0530

rajveer – 1 file(s) modified
Removed promotion client reference.

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

Rev 6025 – removed prices from coming soon items.

amit.gupta — Mon, 17 Sep 2012 19:17:34 +0530

amit.gupta – 9 file(s) modified
removed prices from coming soon items.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.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/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5930 – All entities are comparable irrespective of their scores.

amit.gupta — Tue, 04 Sep 2012 17:04:08 +0530

amit.gupta – 15 file(s) modified
All entities are comparable irrespective of their scores.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/MostComparedSnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5873 – Added filters for cameras. related changes and website header ...

amit.gupta — Thu, 23 Aug 2012 16:49:53 +0530

amit.gupta – 13 file(s) modified
Added filters for cameras. related changes and
website header changes + filter related changes in website.

+ /trunk/ContentStore/src/jython/irdatarules/cameras
+ /trunk/ContentStore/src/jython/irdatarules/cameras/display.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/optical-zoom.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/resolution.py
~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /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/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5760 – #1537 Page title and meta description has to be automatically ...

amit.gupta — Thu, 09 Aug 2012 19:44:36 +0530

amit.gupta – 7 file(s) modified
#1537
Page title and meta description has to be automatically created and updated
Reviewer: amar

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5493 – Avoid adding queryString in case of null.

rajveer — Tue, 26 Jun 2012 16:54:56 +0530

rajveer – 1 file(s) modified
Avoid adding queryString in case of null.

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

Rev 5491 – Keep the url parameters on redirect.

rajveer — Tue, 26 Jun 2012 13:54:06 +0530

rajveer – 1 file(s) modified
Keep the url parameters on redirect.

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

Rev 5347 – Made product comparison generic on website. Reviewed by : rajveer

amit.gupta — Fri, 01 Jun 2012 14:54:01 +0530

amit.gupta – 7 file(s) modified
Made product comparison generic on website.
Reviewed by : rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5266 – Make 301 redirects instead of default 302 redirects in case ...

rajveer — Thu, 24 May 2012 18:43:54 +0530

rajveer – 1 file(s) modified
Make 301 redirects instead of default 302 redirects in case of url changed of product or product has been phased out. This is for SEO purpose.
Trac ticket #1287

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

Rev 5188 – Create user client if required, otherwise not.

rajveer — Wed, 16 May 2012 13:12:41 +0530

rajveer – 1 file(s) modified
Create user client if required, otherwise not.

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

Rev 5182 – Ticket #959 - Added 'External Hard Disk' to header menu ...

varun.gupta — Tue, 15 May 2012 14:21:43 +0530

varun.gupta – 3 file(s) modified
Ticket #959 - Added 'External Hard Disk' to header menu and added relevant actions to CategoryController and EntityController

Rev 5094 – Ticket #880 Add JS Code for Product Specific Retargetting reviewer: ...

phani.kumar — Wed, 02 May 2012 12:43:59 +0530

phani.kumar – 3 file(s) modified
Ticket #880 Add JS Code for Product Specific Retargetting
reviewer: Varun Gupta

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
+ /trunk/Website/src/main/resources/templates/retargetingjs.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5037 – While getting color ordering we should get based on default ...

rajveer — Thu, 19 Apr 2012 19:29:06 +0530

rajveer – 1 file(s) modified
While getting color ordering we should get based on default pincode.

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

Rev 5026 – FIX - using org.apache.commons.lang.StringUtilsto trim the URL

varun.gupta — Thu, 19 Apr 2012 11:14:51 +0530

varun.gupta – 1 file(s) modified
FIX - using org.apache.commons.lang.StringUtilsto trim the URL

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

Rev 5008 – While getting color ordering we should get based on default ...

rajveer — Tue, 17 Apr 2012 09:50:49 +0530

rajveer – 1 file(s) modified
While getting color ordering we should get based on default pincode.

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

Rev 5001 – Ticket Id : #1101 Reviewed By : Anupam Singh

amar.kumar — Mon, 16 Apr 2012 15:13:03 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1101
Reviewed By : Anupam Singh

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

Rev 4965 – Raise the warning if the files are not found for ...

rajveer — Thu, 12 Apr 2012 13:13:43 +0530

rajveer – 1 file(s) modified
Raise the warning if the files are not found for Product properties.

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

Rev 4934 – Added changes for Loading items with least delivery date on ...

amit.gupta — Mon, 09 Apr 2012 15:02:59 +0530

amit.gupta – 15 file(s) modified
Added changes for Loading items with least delivery date on top...

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4882 – Removed some of the unused parameters. Corrected some include statements ...

rajveer — Mon, 02 Apr 2012 17:50:36 +0530

rajveer – 8 file(s) modified
Removed some of the unused parameters. Corrected some include statements to remove unused warnings.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShareProducts.java
x /trunk/Website/src/main/resources/in/shop2020/serving/controllers/OrderController.properties
~ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties
x /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ShippingController.properties

Rev 4831 – Optimised setting the id and productId

varun.gupta — Wed, 28 Mar 2012 18:36:53 +0530

varun.gupta – 1 file(s) modified
Optimised setting the id and productId

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

Rev 4632 – Ticket Id: 954 Added the Referer URL in JsonData ...

amar.kumar — Tue, 06 Mar 2012 14:31:30 +0530

amar.kumar – 2 file(s) modified
Ticket Id: 954

Added the Referer URL in JsonData while logging the Product View event in Google App Engine

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductView.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 4494 – Ticket #867 - Coupon code and relevant discount applicable on ...

varun.gupta — Mon, 13 Feb 2012 17:22:06 +0530

varun.gupta – 8 file(s) modified
Ticket #867 - Coupon code and relevant discount applicable on a product will be exposed to it's product page

~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3830 – Merged the Website1 code back into the website

chandranshu — Thu, 20 Oct 2011 19:44:52 +0530

chandranshu – 140 file(s) modified
Merged the Website1 code back into the website

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
~ /trunk/Website/src/main/resources/templates/accessories.vm
~ /trunk/Website/src/main/resources/templates/browsehistory.vm
+ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/mainbanner.vm
~ /trunk/Website/src/main/resources/templates/mostcompared.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
x /trunk/Website/src/main/resources/templates/searchbar.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cart.css
+ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/css/contactus.css
+ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/css/home.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widget.css
+ /trunk/Website/src/main/webapp/css/widgets.css
+ /trunk/Website/src/main/webapp/images/Arrow_OrangeButton_AllScreens.png
+ /trunk/Website/src/main/webapp/images/BG_NavBar.png
+ /trunk/Website/src/main/webapp/images/button-glass-bg.png
+ /trunk/Website/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/ButtonWhite_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_AddNewAddress_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_Apply_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_EnterShippingInfo_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_MakePayment_ALLSTATES-copy.png
+ /trunk/Website/src/main/webapp/images/Button_ProceedToPayment_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_UpdateDeliveryTime_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_ViewAllOrders_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_DEF.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_DWN.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_OVR.png
+ /trunk/Website/src/main/webapp/images/FooterBG.png
+ /trunk/Website/src/main/webapp/images/FooterFootBG.png
+ /trunk/Website/src/main/webapp/images/IconAddtoCompare_ProdArea.png
+ /trunk/Website/src/main/webapp/images/IconBestDeals_NavBar.png
+ /trunk/Website/src/main/webapp/images/IconCompareWith_ProdArea.png
+ /trunk/Website/src/main/webapp/images/IconCross_Lists_DEF.png
+ /trunk/Website/src/main/webapp/images/IconCross_Lists_OVR.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_SelectedTab.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_UnselectedTab.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_WhiteButton.png
+ /trunk/Website/src/main/webapp/images/IconEmptyCart_CartSummary.png
+ /trunk/Website/src/main/webapp/images/IconFreeDelivery_TopBar.png
+ /trunk/Website/src/main/webapp/images/IconOfferPack_ProdList.png
+ /trunk/Website/src/main/webapp/images/IconOfferPack_ProdPage.png
+ /trunk/Website/src/main/webapp/images/IconSearchButton_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/IconSupport_TopBar.png
+ /trunk/Website/src/main/webapp/images/Icons_CreditCardsPayment.png
+ /trunk/Website/src/main/webapp/images/Icons_Security.png
+ /trunk/Website/src/main/webapp/images/Icon_AddNewAddress_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Icon_DeliveryTime.png
+ /trunk/Website/src/main/webapp/images/Icon_ShareOnFacebook.png
+ /trunk/Website/src/main/webapp/images/LeftTab_Selected.png
+ /trunk/Website/src/main/webapp/images/LeftTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/ListIcon_Cart_Default.png
+ /trunk/Website/src/main/webapp/images/ListIcon_Cart_Mouseover.png
+ /trunk/Website/src/main/webapp/images/MidTab_Selected.png
+ /trunk/Website/src/main/webapp/images/MidTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/number_selected.png
+ /trunk/Website/src/main/webapp/images/number_Unselected.png
+ /trunk/Website/src/main/webapp/images/RadioButton_Selected.png
+ /trunk/Website/src/main/webapp/images/RadioButton_Unselected.png
+ /trunk/Website/src/main/webapp/images/RightTab_Selected.png
+ /trunk/Website/src/main/webapp/images/RightTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/sprite.png
+ /trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/cart-details.js
+ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/js/my-notes.js
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/estimate-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/most-compared-products-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/updates-psuccess.vm