Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
11990 4207 d 14 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/  
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
11808 4220 d 14 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/ Added PrivateDeal User to userinfo  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PrivateDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
4453 5091 d 10 h varun.gupta /trunk/Website/src/main/ Trac #852 and #869 - Full name field removed from Registration procedure. A/B test variants added for Login/Register popup vs redirect added.  
/trunk/Website/src/main/filters/staging/filters.properties
/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/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/ProceedToPayController.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/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/loginregister.js
3830 5201 d 10 h chandranshu /trunk/Website/ Merged the Website1 code back into the website  
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
/trunk/Website/src/main/webapp/css/cartflow.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/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/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/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/Icons_CreditCardsPayment.png
/trunk/Website/src/main/webapp/images/Icons_Security.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/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/VerticalSeparator_NavBar.png
/trunk/Website/src/main/webapp/images/button-glass-bg.png
/trunk/Website/src/main/webapp/images/number_Unselected.png
/trunk/Website/src/main/webapp/images/number_selected.png
/trunk/Website/src/main/webapp/images/saholic-logo.jpg
/trunk/Website/src/main/webapp/images/sprite.png
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/main/resources/templates/searchbar.vm
/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/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
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/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/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
/trunk/Website/src/main/webapp/css/cart.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/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/js/all.js
/trunk/Website/src/main/webapp/js/cart-details.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
3126 5251 d 10 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
2998 5262 d 23 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/ Made static DesEncryptor to class variable to make it thread safe.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
2973 5264 d 18 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/ Ensured that the userinfo is correctly set and that the corrupt cookie is expired in cases of cookie corruption.  
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
2955 5266 d 13 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/services/ Started logging the exception while parsing a JSON string  
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
2935 5270 d 13 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/ Ensured that an anonymous user is not created in case we encounter a uid for which there is no user in the db  
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
2907 5272 d 11 h rajveer /trunk/Website/ Moved UserSessionInfo from session to cookie. A new cookie called uic will be created.  
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/LoginInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserAware.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/main/resources/struts.xml
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
2867 5273 d 17 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/ Removed dependency from pageloader. Added most compared products controller.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MostComparedProductsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RelatedProductsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/services/PageLoaderHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
2146 5333 d 12 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/ Removed unused imports and some unused variables  
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/LoginInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/pages/DummyPageFetcher.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/DesEncrypter.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/FileUtils.java
1034 5418 d 13 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
801 5447 d 11 h rajveer /trunk/Website/ Bug fixing for beta  
/trunk/Website/WebContent/js/cart-details.js
/trunk/Website/conf/templates/cartheader.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/orderdetails.vm
/trunk/Website/conf/templates/shippingheader.vm
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
793 5448 d 10 h rajveer /trunk/Website/ Fevicon added. Logo added. Name changed. Setting default pincode  
/trunk/Website/WebContent/images/favicon.ico
/trunk/Website/WebContent/images/saholic-main.jpg
/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/index.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/shipping-index.vm
/trunk/Website/WebContent/WEB-INF/content/test-index.vm
/trunk/Website/WebContent/css/common.css
/trunk/Website/WebContent/js/gallery.js
/trunk/Website/conf/templates/commoncssfiles.vm
/trunk/Website/conf/templates/footer.vm
/trunk/Website/conf/templates/header.vm
/trunk/Website/conf/templates/logindetails.vm
/trunk/Website/conf/templates/personaldetails.vm
/trunk/Website/conf/templates/pricediv.vm
/trunk/Website/conf/templates/productsummary.vm
/trunk/Website/conf/templates/registrationform.vm
/trunk/Website/conf/templates/socialutils.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/LoginController.java
/trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
762 5454 d 13 h rajveer /trunk/Website/ Website changes including colorbox. Removing static functions and adding closeconnection in some of the code.  
/trunk/Website/WebContent/css/colorbox.css
/trunk/Website/WebContent/css/lightbox_inline.css
/trunk/Website/WebContent/images/border.png
/trunk/Website/WebContent/images/controls.png
/trunk/Website/WebContent/images/loading.gif
/trunk/Website/WebContent/images/loading_background.png
/trunk/Website/WebContent/js/jquery.colorbox-min.js
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/css/common.css
/trunk/Website/WebContent/js/all.js
/trunk/Website/src/in/shop2020/serving/controllers/AuthController.java
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.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/MyresearchController.java
/trunk/Website/src/in/shop2020/serving/controllers/PaySuccessController.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/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java
572 5482 d 18 h chandranshu /trunk/Website/ Added cart validation to view cart and shipping page  
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/shippingdetails.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/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/in/shop2020/serving/pages/PageContentKeys.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShippingPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShoppingCartPageFetcher.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
555 5484 d 16 h chandranshu /trunk/Website/src/in/shop2020/serving/ Combined user, cart and widget service  
/trunk/Website/src/in/shop2020/serving/utils/DesEncrypter.java
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/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/BrowsehistoryController.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/EntityController.java
/trunk/Website/src/in/shop2020/serving/controllers/HomeController.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/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.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/ShippingController.java
/trunk/Website/src/in/shop2020/serving/controllers/TestController.java
/trunk/Website/src/in/shop2020/serving/pages/PageContentKeys.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/BrowseHistoryPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/CompletedOrdersPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/HomePageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/LoginDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/MyAccountPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/MyResearchPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/OrderDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/PersonalDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ProductPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/RatingsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShippingAddressPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShippingPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShoppingCartPageFetcher.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java
545 5491 d 14 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