SmartDukaan – /trunk/Website/src/main/java/in/

Rev 1934 – Show loding image in my research and browse history widgets ...

vikas — Tue, 24 May 2011 12:59:36 +0530

vikas – 24 file(s) modified
Show loding image in my research and browse history widgets while it loads the items.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/browsehistory.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.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/brand-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-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/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.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/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/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.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/search-index.vm

Rev 1930 – Fix for LG and HTC brands

rajveer — Mon, 23 May 2011 22:56:46 +0530

rajveer – 1 file(s) modified
Fix for LG and HTC brands

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

Rev 1928 – Added support of brand in best deals

rajveer — Mon, 23 May 2011 22:14:02 +0530

rajveer – 1 file(s) modified
Added support of brand in best deals

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

Rev 1923 – Added brand pages. Added some new categories on website. Added ...

rajveer — Mon, 23 May 2011 21:43:29 +0530

rajveer – 7 file(s) modified
Added brand pages. Added some new categories on website. Added support of brand wise best sellers, latest arrivals and best deals. Added absolute path for ajax calls.

~ /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/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm

Rev 1921 – Fix priceSlider problem.

vikas — Mon, 23 May 2011 19:38:32 +0530

vikas – 3 file(s) modified
Fix priceSlider problem.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 1907 – Removed an unused import

chandranshu — Fri, 20 May 2011 18:36:17 +0530

chandranshu – 1 file(s) modified
Removed an unused import

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

Rev 1905 – EBS Payment service integration

chandranshu — Fri, 20 May 2011 18:30:36 +0530

chandranshu – 20 file(s) modified
EBS Payment service integration

+ /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/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.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/utils/ebs
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/Base64.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/RC4.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/images/maestro-logo.gif
+ /trunk/Website/src/main/webapp/images/visa-master-logo.jpg
+ /trunk/Website/src/main/webapp/js/paymode-selection.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 1904 – Added redirection from RegisterController

varun.gupta — Fri, 20 May 2011 18:01:10 +0530

varun.gupta – 2 file(s) modified
Added redirection from RegisterController

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm

Rev 1877 – One bug in payement tracking. enclose url in quotes.

vikas — Wed, 18 May 2011 13:02:43 +0530

vikas – 2 file(s) modified
One bug in payement tracking. enclose url in quotes.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 1876 – Links added to load Contact Form with a particular query ...

varun.gupta — Wed, 18 May 2011 11:33:21 +0530

varun.gupta – 3 file(s) modified
Links added to load Contact Form with a particular query type.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 1868 – log user registerations from affiliates.

vikas — Tue, 17 May 2011 12:53:56 +0530

vikas – 3 file(s) modified
log user registerations from affiliates.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
~ /trunk/Website/src/main/webapp/js/all.js

Rev 1866 – Capability to add tracking logs.

vikas — Mon, 16 May 2011 19:26:30 +0530

vikas – 3 file(s) modified
Capability to add tracking logs.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/webapp/js/all.js

Rev 1862 – Interceptor to track affiliates.

vikas — Mon, 16 May 2011 15:18:22 +0530

vikas – 2 file(s) modified
Interceptor to track affiliates.

+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 1853 – Remove some log statements.

vikas — Mon, 16 May 2011 11:48:16 +0530

vikas – 1 file(s) modified
Remove some log statements.

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

Rev 1852 – Remove some log statements.

vikas — Mon, 16 May 2011 11:47:40 +0530

vikas – 1 file(s) modified
Remove some log statements.

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

Rev 1849 – Fix some urls.

vikas — Fri, 13 May 2011 19:51:04 +0530

vikas – 3 file(s) modified
Fix some urls.

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

Rev 1821 – change comparison url

rajveer — Wed, 11 May 2011 22:27:52 +0530

rajveer – 2 file(s) modified
change comparison url

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/webapp/js/custom-jquery.js

Rev 1778 – Added basic comparison feature

rajveer — Mon, 09 May 2011 13:33:48 +0530

rajveer – 26 file(s) modified
Added basic comparison feature

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
+ /trunk/Website/src/main/webapp/css/comparision.css
+ /trunk/Website/src/main/webapp/css/scroller.css
+ /trunk/Website/src/main/webapp/images/blackbullet.jpg
+ /trunk/Website/src/main/webapp/images/column-right-border.jpg
+ /trunk/Website/src/main/webapp/images/comp-header-bg.png
+ /trunk/Website/src/main/webapp/images/scroll-450.png
+ /trunk/Website/src/main/webapp/images/scroll-462.png
+ /trunk/Website/src/main/webapp/images/scroll-560.png
+ /trunk/Website/src/main/webapp/images/scroll-565.png
+ /trunk/Website/src/main/webapp/images/scroll-568.png
+ /trunk/Website/src/main/webapp/images/scroll-577.png
+ /trunk/Website/src/main/webapp/images/scroll.png
+ /trunk/Website/src/main/webapp/images/scroller-bg.jpg
+ /trunk/Website/src/main/webapp/images/scroller-left.png
+ /trunk/Website/src/main/webapp/images/scroller-mid.png
+ /trunk/Website/src/main/webapp/images/scroller-right.png
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.jscrollpane.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 1776 – Added redirection to source URL

varun.gupta — Mon, 09 May 2011 13:14:15 +0530

varun.gupta – 3 file(s) modified
Added redirection to source URL

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm

Rev 1774 – Trac #361 - 'Specify a New Address' will now have ...

varun.gupta — Mon, 09 May 2011 04:17:27 +0530

varun.gupta – 2 file(s) modified
Trac #361 - 'Specify a New Address' will now have pre-filled Name and Phone number fields.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 1770 – deleted User controller

varun.gupta — Fri, 06 May 2011 19:26:01 +0530

varun.gupta – 1 file(s) modified
deleted User controller

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserController.java

Rev 1768 – Removed method to display Signin-Register Page header

varun.gupta — Fri, 06 May 2011 19:22:15 +0530

varun.gupta – 1 file(s) modified
Removed method to display Signin-Register Page header

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 1761 – Change to store only the list of history and research ...

vikas — Fri, 06 May 2011 18:25:50 +0530

vikas – 8 file(s) modified
Change to store only the list of history and research items in browser cache.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm

Rev 1747 – Common User-Login/Register page

varun.gupta — Fri, 06 May 2011 15:26:56 +0530

varun.gupta – 4 file(s) modified
Common User-Login/Register page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/signinsignup.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm

Rev 1722 – Use .local.shop2020.in as cookie domain in dev.

vikas — Thu, 05 May 2011 11:20:32 +0530

vikas – 2 file(s) modified
Use .local.shop2020.in as cookie domain in dev.

~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1713 – put domain name also in cookie while removing it in ...

vikas — Wed, 04 May 2011 17:55:48 +0530

vikas – 4 file(s) modified
put domain name also in cookie while removing it in logout controller.

~ /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/UserAware.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1703 – Removed unwanted code form myresearch and cart controller

rajveer — Wed, 04 May 2011 15:54:31 +0530

rajveer – 2 file(s) modified
Removed unwanted code form myresearch and cart controller

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

Rev 1698 – Started reading solr search service URL from the config file

chandranshu — Wed, 04 May 2011 14:20:27 +0530

chandranshu – 1 file(s) modified
Started reading solr search service URL from the config file

~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java

Rev 1689 – modified to make urls as canonical which are accessed by ...

rajveer — Wed, 04 May 2011 12:43:13 +0530

rajveer – 1 file(s) modified
modified to make urls as canonical which are accessed by facebook

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

Rev 1658 – Changes to create cookie with domain name as ".saholic.com"

vikas — Tue, 03 May 2011 13:40:55 +0530

vikas – 12 file(s) modified
Changes to create cookie with domain name as ".saholic.com"

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
+ /trunk/Website/src/main/filters
+ /trunk/Website/src/main/filters/dev
+ /trunk/Website/src/main/filters/dev/filters.properties
+ /trunk/Website/src/main/filters/prod
+ /trunk/Website/src/main/filters/prod/filters.properties
+ /trunk/Website/src/main/filters/staging
+ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 1643 – Removed bug in myresearch page. When add again it was ...

rajveer — Mon, 02 May 2011 17:51:28 +0530

rajveer – 2 file(s) modified
Removed bug in myresearch page. When add again it was giving wrong message.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/webapp/js/all.js

Rev 1634 – date of birth input box not loading and date of ...

vikas — Mon, 02 May 2011 12:12:38 +0530

vikas – 2 file(s) modified
date of birth input box not loading and date of birth not getting updated on submit.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 1625 – Update browse history and myresearch once user login

rajveer — Sun, 01 May 2011 17:14:07 +0530

rajveer – 2 file(s) modified
Update browse history and myresearch once user login

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

Rev 1623 – Fixed some bug introduced while making anonymous user creation for ...

rajveer — Sun, 01 May 2011 15:52:50 +0530

rajveer – 7 file(s) modified
Fixed some bug introduced while making anonymous user creation for only valid users not for bots etc

Rev 1614 – Anonymous user will not be created until a user add ...

rajveer — Fri, 29 Apr 2011 16:13:38 +0530

rajveer – 14 file(s) modified
Anonymous user will not be created until a user add to cart or add to research. User will be able to add to research wothout logging in.

~ /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/MyresearchController.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/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/struts.xml
~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/js/entity.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-success.vm

Rev 1600 – Added handling of the case where Order ID is not ...

varun.gupta — Fri, 29 Apr 2011 12:30:30 +0530

varun.gupta – 1 file(s) modified
Added handling of the case where Order ID is not supplied

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

Rev 1555 – Error, in adding transaction info email to dispatch queue, will ...

varun.gupta — Wed, 27 Apr 2011 13:57:47 +0530

varun.gupta – 1 file(s) modified
Error, in adding transaction info email to dispatch queue, will be logged now.

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

Rev 1554 – Call to code, to enqueue Transaction Info email, added

varun.gupta — Wed, 27 Apr 2011 13:53:26 +0530

varun.gupta – 1 file(s) modified
Call to code, to enqueue Transaction Info email, added

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

Rev 1553 – removed bitwalker code for user agent detection

rajveer — Wed, 27 Apr 2011 13:44:04 +0530

rajveer – 1 file(s) modified
removed bitwalker code for user agent detection

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1549 – Updated the index for best deals

rajveer — Wed, 27 Apr 2011 08:17:57 +0530

rajveer – 1 file(s) modified
Updated the index for best deals

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java