Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
5945 4878 d 18 h mandeep.dhir /trunk/ Separating catalog and inventory services Trac#1594 Reviewer: Rajveer  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
/trunk/Support/Converted-2-2012-08-06-16:29:31.xls
/trunk/Support/Converted-2-2012-08-11-14:58:00.xls
/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/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/InventoryService
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/runutils/.project
/trunk/runutils/.pydevproject
/trunk/runutils/init.d/inventory-server
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.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/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/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/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
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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
5529 4945 d 17 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/ #1206
20models to be shown in Best Deal, Best Selling and Latest arrivals..
Reviewed by Mandeep		  
/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/LatestArrivalsController.java
3561 5211 d 18 h rajveer /trunk/Website/src/main/ Support to display different prices for different sources.  
/trunk/Website/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceAware.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
/trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.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/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.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/HdfcPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.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/struts.xml
3268 5239 d 20 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/ Removed some warnings from the Ehcache usages  
/trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.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/HdfcPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
3242 5243 d 17 h vikas /trunk/Website/src/main/ Enable caching for category snippets  
/trunk/Website/src/main/java/in/shop2020/serving/cache
/trunk/Website/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
/trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.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/BrandController.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/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/resources/ehcache.xml
3126 5251 d 14 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/ Side effect of name changing of clients.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.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/BrowseHistoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompletedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EmailAvailabilityController.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/FailedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ForgotPasswordController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.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/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.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/controllers/TrackingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.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/HdfcPaymentService.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/java/in/shop2020/serving/utils/Utils.java
3112 5251 d 19 h vikas /trunk/Website/src/main/ Add caching of best deals, best sellers and latest arrivals pages.  
/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/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
/trunk/Website/src/main/resources/ehcache.xml
/trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
2950 5266 d 19 h chandranshu /trunk/Website/src/main/ Corrected the calculation of page numbers for latest arrivals, best deals and best sellers.  
/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/LatestArrivalsController.java
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-index.vm
2943 5266 d 22 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Changed windowSize to a static variable  
/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/LatestArrivalsController.java
2453 5307 d 18 h chandranshu /trunk/Website/ Removed some redundant code in best-deals view. Put in some log statements in place of printing stack traces. Corrected indentation in pom.xml.  
/trunk/Website/pom.xml
/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/utils/FileUtils.java
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
1928 5351 d 12 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Added support of brand in best deals  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
1044 5418 d 15 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/ Removed dependency on tomcat juli  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AramexUpdatesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/BluedartUpdatesController.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/CompletedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EmailAvailabilityController.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/ExceptionController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.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/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/StaticController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/TestController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/AramexTrackingService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CategoryManager.java
/trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
1034 5418 d 17 h chandranshu /trunk/Website/ Moved java sources to src/main/java  
/trunk/Website/src/main
/trunk/Website/src/main/java
/trunk/Website/src/main/java/in
/trunk/Website/src/main/reesources
/trunk/Website/src/main/webapp
/trunk/Website/src/in
/trunk/Website/build.properties
832 5442 d 15 h rajveer /trunk/Website/ Added log4j logging framework  
/trunk/Website/conf/log4j.properties
/trunk/Website/src/in/shop2020/serving/rest
/trunk/Website/.classpath
/trunk/Website/build.xml
/trunk/Website/conf/velocity.properties
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/in/shop2020/serving/controllers/AramexUpdatesController.java
/trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/in/shop2020/serving/controllers/BluedartUpdatesController.java
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/in/shop2020/serving/controllers/CompletedOrdersController.java
/trunk/Website/src/in/shop2020/serving/controllers/EmailAvailabilityController.java
/trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/in/shop2020/serving/controllers/ExceptionController.java
/trunk/Website/src/in/shop2020/serving/controllers/ForgotPasswordController.java
/trunk/Website/src/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/in/shop2020/serving/controllers/LoginDetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/controllers/SendMailController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/in/shop2020/serving/controllers/StaticController.java
/trunk/Website/src/in/shop2020/serving/controllers/TestController.java
/trunk/Website/src/in/shop2020/serving/interceptors/LoginInterceptor.java
/trunk/Website/src/in/shop2020/serving/services/AramexTrackingService.java
/trunk/Website/src/in/shop2020/serving/services/BlueDartTrackingService.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/SolrSearchService.java
741 5461 d 20 h rajveer /trunk/Website/ Payment gateway integration. Javascript code clean up. deleted unused files.  
/trunk/Website/WebContent/WEB-INF/content/compare-show.vm
/trunk/Website/WebContent/WEB-INF/content/footer.vm
/trunk/Website/WebContent/WEB-INF/content/header.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-success.vm
/trunk/Website/WebContent/WEB-INF/content/myaccount-login.vm
/trunk/Website/WebContent/WEB-INF/content/myaccount-show.vm
/trunk/Website/WebContent/WEB-INF/content/order-index.vm
/trunk/Website/WebContent/WEB-INF/content/order-success.vm
/trunk/Website/WebContent/WEB-INF/content/pay-response-success.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-success.vm
/trunk/Website/WebContent/WEB-INF/content/ratings-show.vm
/trunk/Website/WebContent/WEB-INF/content/register-success.vm
/trunk/Website/WebContent/WEB-INF/content/search-index_old.vm
/trunk/Website/WebContent/WEB-INF/content/widgetdiv.vm
/trunk/Website/src/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/WebContent/WEB-INF/content/address-index.vm
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/WEB-INF/content/best-sellers-index.vm
/trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
/trunk/Website/WebContent/WEB-INF/content/cart-index.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/completed-orders-index.vm
/trunk/Website/WebContent/WEB-INF/content/entity-show.vm
/trunk/Website/WebContent/WEB-INF/content/forgot-password-index.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-index.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/login-index.vm
/trunk/Website/WebContent/WEB-INF/content/myaccount-index.vm
/trunk/Website/WebContent/WEB-INF/content/order-show.vm
/trunk/Website/WebContent/WEB-INF/content/pay-error-index.vm
/trunk/Website/WebContent/WEB-INF/content/pay-success-index.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/register-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm
/trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm
/trunk/Website/conf/templates/commonjsfiles.vm
/trunk/Website/conf/templates/loginform.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/shippingaddressdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java
/trunk/Website/src/in/shop2020/serving/controllers/HdfcPayResponseController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/in/shop2020/serving/controllers/TestController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java
637 5470 d 15 h rajveer /trunk/Website/ changes in website for itemid  
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-index.vm
/trunk/Website/WebContent/WEB-INF/content/login-index.vm
/trunk/Website/conf/templates/loginform.vm
/trunk/Website/conf/templates/loginheader.vm
/trunk/Website/conf/templates/stateslist.vm
/trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/in/shop2020/serving/utils/Category.java
/trunk/Website/.classpath
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/entity-show.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/WebContent/WEB-INF/content/register-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/css/cart.css
/trunk/Website/WebContent/css/product.css
/trunk/Website/WebContent/css/style.css
/trunk/Website/WebContent/js/all.js
/trunk/Website/WebContent/js/gallery.js
/trunk/Website/WebContent/js/productCategory.js
/trunk/Website/build.xml
/trunk/Website/conf/templates/bestdeals.vm
/trunk/Website/conf/templates/bestsellers.vm
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/latestarrivals.vm
/trunk/Website/conf/templates/shippingaddressdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/in/shop2020/serving/services/AramexTrackingService.java
/trunk/Website/src/in/shop2020/serving/services/CategoryManager.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java
624 5475 d 14 h chandranshu /trunk/Website/src/in/shop2020/serving/ Started using the category argument for Latest Arrivals, Best Deals and Best Sellers  
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
590 5480 d 20 h chandranshu /trunk/Website/src/in/shop2020/serving/ Updated some names in method usages  
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
545 5491 d 19 h rajveer /trunk/Website/ 1) Menu added.
2) Best Deals, best sellers and latest arrival pages.
3) Pagination in search, category pages.
4) Proper working of price slider.		  
/trunk/Website/WebContent/WEB-INF/content/aramex-updates-show.vm
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/WebContent/css/nav.css
/trunk/Website/WebContent/images/down-arrow-menu.png
/trunk/Website/WebContent/images/menu-active.jpg
/trunk/Website/WebContent/images/menu-bottom.png
/trunk/Website/WebContent/images/menu-ver-bar.png
/trunk/Website/src/in/shop2020/serving/controllers/AramexUpdatesController.java
/trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/in/shop2020/serving/services/AramexTrackingService.java
/trunk/Website/WebContent/WEB-INF/content/aramax-updates-show.vm
/trunk/Website/WebContent/images/Thumbs.db
/trunk/Website/src/in/shop2020/serving/controllers/AramaxUpdatesController.java
/trunk/Website/src/in/shop2020/serving/controllers/InventoryUpdate.java
/trunk/Website/src/in/shop2020/serving/controllers/Update.java
/trunk/Website/src/in/shop2020/serving/controllers/UpdatesController.java
/trunk/Website/src/in/shop2020/serving/services/AramaxTrackingService.java
/trunk/Website/WebContent/WEB-INF/content/best-sellers-index.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/entity-show.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/css/jquery-ui-1.8.6.custom.css
/trunk/Website/WebContent/css/style.css
/trunk/Website/WebContent/css/style_2.css
/trunk/Website/WebContent/js/priceSlider.js
/trunk/Website/WebContent/js/productCategory.js
/trunk/Website/conf/templates/bestdeals.vm
/trunk/Website/conf/templates/bestsellers.vm
/trunk/Website/conf/templates/latestarrivals.vm
/trunk/Website/conf/templates/mainmenu.vm
/trunk/Website/conf/templates/searchbar.vm
/trunk/Website/src/in/shop2020/serving/controllers/AuthController.java
/trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/SolrSearchService.java