SmartDukaan – /trunk/Website/src/main/webapp/WEB-INF/

Rev 3163 – Added logos of credit and debit cards

chandranshu — Fri, 02 Sep 2011 10:50:57 +0530

chandranshu – 3 file(s) modified
Added logos of credit and debit cards

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/cc_logos.gif
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3149 – Do not send the amount of transaction to adohana.

vikas — Thu, 01 Sep 2011 15:00:33 +0530

vikas – 1 file(s) modified
Do not send the amount of transaction to adohana.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 3119 – Changed text of after sales and removed highlight of open ...

rajveer — Wed, 31 Aug 2011 18:24:29 +0530

rajveer – 2 file(s) modified
Changed text of after sales and removed highlight of open orders in order details page

~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm

Rev 3118 – Latest arrivals and best sellers snippets were not set. because ...

vikas — Wed, 31 Aug 2011 18:13:21 +0530

vikas – 4 file(s) modified
Latest arrivals and best sellers snippets were not set. because of which the best sellers and latest arrivals tabs were coming blank.

~ /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-sellers-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-index.vm

Rev 3113 – Fix href to home page.

vikas — Wed, 31 Aug 2011 16:17:27 +0530

vikas – 2 file(s) modified
Fix href to home page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm

Rev 3112 – Add caching of best deals, best sellers and latest arrivals ...

vikas — Wed, 31 Aug 2011 16:01:25 +0530

vikas – 8 file(s) modified
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

Rev 3111 – Added remarketing code for google ad and ohana. Add conversion ...

vikas — Wed, 31 Aug 2011 15:54:51 +0530

vikas – 5 file(s) modified
Added remarketing code for google ad and ohana. Add conversion tracking for ohana.

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/js/remarketing.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 3108 – Added some space after radio buttons

chandranshu — Wed, 31 Aug 2011 14:10:58 +0530

chandranshu – 2 file(s) modified
Added some space after radio buttons

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3101 – New payment page with lots of GA tracking

chandranshu — Tue, 30 Aug 2011 19:26:13 +0530

chandranshu – 12 file(s) modified
New payment page with lots of GA tracking

~ /trunk/Website/pom.xml
~ /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/ShippingController.java
+ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/paymode-selection.js
+ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3080 – Added support to give user an option to register for ...

rajveer — Mon, 29 Aug 2011 15:54:23 +0530

rajveer – 4 file(s) modified
Added support to give user an option to register for notification for out of stock item. Once item will be in stock notifications will be sent.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-success.vm

Rev 3075 – Added a note for COD orders informing the customers about ...

chandranshu — Mon, 29 Aug 2011 12:34:09 +0530

chandranshu – 1 file(s) modified
Added a note for COD orders informing the customers about the verification call

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 3068 – Corrected reference to an image and removed reference to an ...

chandranshu — Mon, 29 Aug 2011 11:39:49 +0530

chandranshu – 3 file(s) modified
Corrected reference to an image and removed reference to an invalid javascript file in production environment

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 3066 – Minor usability changes

chandranshu — Mon, 29 Aug 2011 07:26:07 +0530

chandranshu – 1 file(s) modified
Minor usability changes

~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3063 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:35:51 +0530

chandranshu – 12 file(s) modified
Changes for COD

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.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/resources/in/shop2020/serving/controllers/OrderController.properties
~ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ShippingController.properties
~ /trunk/Website/src/main/webapp/js/paymode-selection.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3037 – Changed name of section from my purchases to purchase. Allowed ...

rajveer — Thu, 25 Aug 2011 12:25:51 +0530

rajveer – 12 file(s) modified
Changed name of section from my purchases to purchase. Allowed to get related accessories widget.

~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.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/personal-details-index.vm

Rev 3033 – google adwords conversion tracking script was not loading. Use separate ...

vikas — Thu, 25 Aug 2011 11:40:47 +0530

vikas – 1 file(s) modified
google adwords conversion tracking script was not loading. Use separate closing tag for script node.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 3019 – Added support of my purchase and after sales.

rajveer — Wed, 24 Aug 2011 19:47:24 +0530

rajveer – 12 file(s) modified
Added support of my purchase and after sales.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AfterSalesController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.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/personal-details-index.vm

Rev 2952 – Add conversion_value(total amount) to AdwordsPurchase conversion tracking.

vikas — Tue, 16 Aug 2011 16:12:31 +0530

vikas – 1 file(s) modified
Add conversion_value(total amount) to AdwordsPurchase conversion tracking.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 2951 – Add AdwordsPurchase conversion tracking.

vikas — Tue, 16 Aug 2011 15:59:43 +0530

vikas – 1 file(s) modified
Add AdwordsPurchase conversion tracking.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 2950 – Corrected the calculation of page numbers for latest arrivals, best ...

chandranshu — Tue, 16 Aug 2011 15:53:03 +0530

chandranshu – 4 file(s) modified
Corrected the calculation of page numbers for latest arrivals, best deals and best sellers.

Rev 2927 – Added border right.

rajveer — Thu, 11 Aug 2011 18:51:34 +0530

rajveer – 1 file(s) modified
Added border right.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 2922 – Deactivated the failed orders selection on other pages

chandranshu — Thu, 11 Aug 2011 17:22:29 +0530

chandranshu – 4 file(s) modified
Deactivated the failed orders selection on other pages

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.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/personal-details-index.vm

Rev 2907 – Moved UserSessionInfo from session to cookie. A new cookie called ...

rajveer — Wed, 10 Aug 2011 19:08:32 +0530

rajveer – 12 file(s) modified
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

Rev 2896 – Added the failed orders link to all other my account ...

chandranshu — Wed, 10 Aug 2011 13:18:32 +0530

chandranshu – 5 file(s) modified
Added the failed orders link to all other my account pages.

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.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/personal-details-index.vm

Rev 2895 – Added support for the user to look at his failed ...

chandranshu — Wed, 10 Aug 2011 13:11:37 +0530

chandranshu – 3 file(s) modified
Added support for the user to look at his failed orders

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm

Rev 2893 – Removed widgets from exception page.

rajveer — Wed, 10 Aug 2011 12:14:27 +0530

rajveer – 1 file(s) modified
Removed widgets from exception page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm

Rev 2883 – Added customer care widget on pay - error page

rajveer — Tue, 09 Aug 2011 16:19:04 +0530

rajveer – 1 file(s) modified
Added customer care widget on pay - error page

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm

Rev 2881 – Added customer care widget on the pages where we are ...

rajveer — Tue, 09 Aug 2011 16:14:21 +0530

rajveer – 4 file(s) modified
Added customer care widget on the pages where we are not showing widgets

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 2878 – Updated office address.

rajveer — Tue, 09 Aug 2011 13:24:28 +0530

rajveer – 1 file(s) modified
Updated office address.

~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 2877 – Hiding most compared with widget.

rajveer — Tue, 09 Aug 2011 13:16:42 +0530

rajveer – 1 file(s) modified
Hiding most compared with widget.

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2876 – Changed name from Related Accessories to Suggested Accessories.

rajveer — Tue, 09 Aug 2011 13:14:50 +0530

rajveer – 1 file(s) modified
Changed name from Related Accessories to Suggested Accessories.

~ /trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm

Rev 2874 – Moved customer care info in header section.

rajveer — Tue, 09 Aug 2011 13:05:34 +0530

rajveer – 2 file(s) modified
Moved customer care info in header section.

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2873 – Deleting unused file

rajveer — Tue, 09 Aug 2011 12:57:47 +0530

rajveer – 1 file(s) modified
Deleting unused file

x /trunk/Website/src/main/webapp/WEB-INF/content/related-products-show.vm

Rev 2870 – Removed references for pageloader.

rajveer — Tue, 09 Aug 2011 12:52:44 +0530

rajveer – 1 file(s) modified
Removed references for pageloader.

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2868 – Included static files, instead of getting them from pageloader.

rajveer — Tue, 09 Aug 2011 12:43:38 +0530

rajveer – 33 file(s) modified
Included static files, instead of getting them from pageloader.

~ /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/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/browse-history-index.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/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.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/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 (copied from /trunk/Website/src/main/webapp/WEB-INF/content/related-products-show.vm@2830)
~ /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-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/register-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/terms-conditions.vm

Rev 2847 – Trac#485 New velocity template for special pages

mandeep.dhir — Thu, 04 Aug 2011 17:02:24 +0530

mandeep.dhir – 1 file(s) modified
Trac#485 New velocity template for special pages

+ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 2836 – Date range restricted.

rajveer — Thu, 04 Aug 2011 12:10:23 +0530

rajveer – 1 file(s) modified
Date range restricted.

~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 2810 – Changes made to display similar items from database.

rajveer — Wed, 03 Aug 2011 12:45:47 +0530

rajveer – 4 file(s) modified
Changes made to display similar items from database.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-success.vm

Rev 2792 – Changed the option group name to be more specific

chandranshu — Tue, 02 Aug 2011 15:08:56 +0530

chandranshu – 1 file(s) modified
Changed the option group name to be more specific

~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 2790 – Removed commented code.

rajveer — Mon, 01 Aug 2011 17:51:29 +0530

rajveer – 3 file(s) modified
Removed commented code.

~ /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/search-index.vm