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

Rev 1044 – Removed dependency on tomcat juli

chandranshu — Thu, 17 Mar 2011 19:17:44 +0530

chandranshu – 32 file(s) modified
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

Rev 1034 – Moved java sources to src/main/java

chandranshu — Thu, 17 Mar 2011 17:23:55 +0530

chandranshu – 7 file(s) modified
Moved java sources to src/main/java

~ /trunk/Website/build.properties
x /trunk/Website/src/in
+ /trunk/Website/src/main
+ /trunk/Website/src/main/java
+ /trunk/Website/src/main/java/in (copied from /trunk/Website/src/in@1033)
+ /trunk/Website/src/main/reesources
+ /trunk/Website/src/main/webapp

Rev 843 – Trac#182 fixed. Also fixed many minor issues with the order ...

chandranshu — Wed, 23 Feb 2011 11:49:30 +0530

chandranshu – 8 file(s) modified
Trac#182 fixed. Also fixed many minor issues with the order details page.

~ /trunk/Website/conf/templates/myaccount.vm
~ /trunk/Website/conf/templates/orderdetails.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/WebContent/js/myaccount.js
~ /trunk/Website/WebContent/WEB-INF/content/estimate-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/order-show.vm

Rev 832 – Added log4j logging framework

rajveer — Mon, 21 Feb 2011 19:55:04 +0530

rajveer – 39 file(s) modified
Added log4j logging framework

~ /trunk/Website/.classpath
~ /trunk/Website/build.xml
+ /trunk/Website/conf/log4j.properties
~ /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
x /trunk/Website/src/in/shop2020/serving/rest
~ /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

Rev 786 – For pin code handling and some other bug fixing

rajveer — Mon, 14 Feb 2011 18:40:43 +0530

rajveer – 17 file(s) modified
For pin code handling and some other bug fixing

~ /trunk/Website/conf/templates/cartdetails.vm
~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm
~ /trunk/Website/conf/templates/stateslist.vm
~ /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/MyresearchController.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/SearchController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/utils/FileUtils.java
~ /trunk/Website/WebContent/css/cart.css
~ /trunk/Website/WebContent/WEB-INF/content/estimate-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/shipping-index.vm

Rev 762 – Website changes including colorbox. Removing static functions and adding closeconnection ...

rajveer — Wed, 09 Feb 2011 17:06:38 +0530

rajveer – 26 file(s) modified
Website changes including colorbox. Removing static functions and adding closeconnection in some of the code.

~ /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
+ /trunk/Website/WebContent/css/colorbox.css
~ /trunk/Website/WebContent/css/common.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/all.js
+ /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

Rev 649 – Changed logistics estimate from hours to days. Corrected the tracking ...

chandranshu — Tue, 25 Jan 2011 19:02:43 +0530

chandranshu – 6 file(s) modified
Changed logistics estimate from hours to days. Corrected the tracking URL.

~ /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/PayResponseController.java
x /trunk/Website/src/in/shop2020/serving/controllers/ShipmentController.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/WebContent/js/myaccount.js

Rev 507 – Velocity files for html generation in backend and page rendering ...

rajveer — Mon, 06 Dec 2010 12:06:14 +0530

rajveer – 100 file(s) modified
Velocity files for html generation in backend and page rendering with controllers.
Controllers to handle page requests.
Other supporting utilities.

+ /trunk/Website/conf/templates/accessories.vm
+ /trunk/Website/conf/templates/bestdeals.vm
+ /trunk/Website/conf/templates/bestsellers.vm
+ /trunk/Website/conf/templates/browsehistory.vm
+ /trunk/Website/conf/templates/cartdetails.vm
+ /trunk/Website/conf/templates/cartheader.vm
+ /trunk/Website/conf/templates/completedorders.vm
+ /trunk/Website/conf/templates/customerservice.vm
~ /trunk/Website/conf/templates/footer.vm
~ /trunk/Website/conf/templates/header.vm
+ /trunk/Website/conf/templates/latestarrivals.vm
+ /trunk/Website/conf/templates/locator.vm
+ /trunk/Website/conf/templates/logindetails.vm
+ /trunk/Website/conf/templates/mainbanner.vm
+ /trunk/Website/conf/templates/mainmenu.vm
+ /trunk/Website/conf/templates/myaccount.vm
+ /trunk/Website/conf/templates/myaccountheader.vm
+ /trunk/Website/conf/templates/myorders.vm
+ /trunk/Website/conf/templates/myresearch.vm
+ /trunk/Website/conf/templates/orderdetails.vm
+ /trunk/Website/conf/templates/personaldetails.vm
+ /trunk/Website/conf/templates/pricediv.vm
+ /trunk/Website/conf/templates/productsummary.vm
+ /trunk/Website/conf/templates/recommendations.vm
+ /trunk/Website/conf/templates/registrationform.vm
+ /trunk/Website/conf/templates/registrationheader.vm
+ /trunk/Website/conf/templates/reviews.vm
+ /trunk/Website/conf/templates/searchbar.vm
+ /trunk/Website/conf/templates/shippingaddressdetails.vm
+ /trunk/Website/conf/templates/shippingdetails.vm
+ /trunk/Website/conf/templates/shippingheader.vm
+ /trunk/Website/conf/templates/shoppingcart.vm
+ /trunk/Website/conf/templates/similaritems.vm
+ /trunk/Website/conf/templates/slideguide-17Sep.vm
+ /trunk/Website/conf/templates/slideguide.vm
+ /trunk/Website/conf/templates/slideguide_backup.vm
+ /trunk/Website/conf/templates/socialutils.vm
+ /trunk/Website/conf/templates/velocity.properties
+ /trunk/Website/conf/templates/widgetdiv.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/CartController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/CompletedordersController.java
/trunk/Website/src/in/shop2020/serving/controllers/EntityController.java (copied from /trunk/Website/src/in/shop2020/serving/controllers/EntityController.java@462)
~ /trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/InventoryUpdate.java
+ /trunk/Website/src/in/shop2020/serving/controllers/LogindetailsController.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/ShipmentController.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/controllers/Update.java
+ /trunk/Website/src/in/shop2020/serving/controllers/UpdatesController.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/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/RegisterPageFetcher.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/pages/PageContentKeys.java
~ /trunk/Website/src/in/shop2020/serving/pages/PageEnum.java
~ /trunk/Website/src/in/shop2020/serving/pages/PageFetcherFactory.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/FileUtils.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/WebContent/js/gallery.js
+ /trunk/Website/WebContent/WEB-INF/content/address-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/cart-delfailure.vm
+ /trunk/Website/WebContent/WEB-INF/content/cart-delsuccess.vm
~ /trunk/Website/WebContent/WEB-INF/content/cart-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/completedorders-index.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/logindetails-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/logindetails-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/order-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/order-show.vm
+ /trunk/Website/WebContent/WEB-INF/content/personaldetails-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/personaldetails-success.vm
+ /trunk/Website/WebContent/WEB-INF/content/register-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/register-success.vm
+ /trunk/Website/WebContent/WEB-INF/content/shipment-show.vm
+ /trunk/Website/WebContent/WEB-INF/content/shipping-failure.vm
+ /trunk/Website/WebContent/WEB-INF/content/shipping-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/shipping-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/test-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/updates-lsuccess.vm
+ /trunk/Website/WebContent/WEB-INF/content/updates-psuccess.vm

Rev 462 – Simple file path modifications.

rajveer — Wed, 06 Oct 2010 21:07:28 +0530

rajveer – 13 file(s) modified
Simple file path modifications.

~ /trunk/Website/src/in/shop2020/serving/controllers/AddtocartController.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/EntityController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/EstimateController.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/WebContent/css/style.css
~ /trunk/Website/WebContent/js/widget_cart.js
~ /trunk/Website/WebContent/WEB-INF/content/entity-show.vm

Rev 458 – website updates for demo.

rajveer — Tue, 05 Oct 2010 12:07:20 +0530

rajveer – 24 file(s) modified
website updates for demo.

~ /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/EntityController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/in/shop2020/serving/pages/fetcher/MyResearchPageFetcher.java
~ /trunk/Website/src/in/shop2020/serving/pages/fetcher/ProductPageFetcher.java
~ /trunk/Website/src/in/shop2020/serving/pages/PageContentKeys.java
~ /trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/WebContent/css/demoStyles.css
~ /trunk/Website/WebContent/css/style.css
+ /trunk/Website/WebContent/css/style.css_1
+ /trunk/Website/WebContent/images/but_bg_tile19.jpg
+ /trunk/Website/WebContent/images/but_bg_tile28.jpg
+ /trunk/Website/WebContent/images/loader_l.gif
+ /trunk/Website/WebContent/images/skin.jpg
+ /trunk/Website/WebContent/js/all.js
~ /trunk/Website/WebContent/js/gallery.js
~ /trunk/Website/WebContent/js/loginpop.js
+ /trunk/Website/WebContent/js/scrolltab.js
~ /trunk/Website/WebContent/WEB-INF/content/entity-show.vm
+ /trunk/Website/WebContent/WEB-INF/content/estimate-index.vm