SmartDukaan – /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 9301 – One assist changes for website.

kshitij.sood — Mon, 06 Jan 2014 15:49:45 +0530

kshitij.sood – 10 file(s) modified
One assist changes for website.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/images/insurance.jpg
+ /trunk/Website/src/main/webapp/images/oneassist.jpg
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/widgets.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/accessory-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 7791 – Display date in the form of date not business days.

rajveer — Mon, 22 Jul 2013 15:13:51 +0530

rajveer – 7 file(s) modified
Display date in the form of date not business days.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7458 – reverted to anupam's version

amit.gupta — Tue, 11 Jun 2013 15:48:08 +0530

amit.gupta – 1 file(s) modified
reverted to anupam's version

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 7456 – reverted back.

amit.gupta — Tue, 11 Jun 2013 14:44:01 +0530

amit.gupta – 3 file(s) modified
reverted back.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 7377 – marking hotspot bold.

amit.gupta — Mon, 03 Jun 2013 12:36:00 +0530

amit.gupta – 1 file(s) modified
marking hotspot bold.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 7376 – Used radio button instead of tags for pickup type

amit.gupta — Fri, 31 May 2013 12:53:09 +0530

amit.gupta – 3 file(s) modified
Used radio button instead of tags for pickup type

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 6971 – Removed alerts and added error message div for insurance details. ...

anupam.singh — Thu, 07 Mar 2013 14:28:27 +0530

anupam.singh – 2 file(s) modified
Removed alerts and added error message div for insurance details. Now tracking the number of time we show alert when user doesn't agree to Insurance T&C and tries to go to shipping page.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6936 – Fixed alignment issues in cartFlowHeader and PickupStore Tab

anupam.singh — Tue, 05 Mar 2013 11:29:17 +0530

anupam.singh – 2 file(s) modified
Fixed alignment issues in cartFlowHeader and PickupStore Tab

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css

Rev 6903 – Insurance feature for our website

anupam.singh — Thu, 28 Feb 2013 01:15:01 +0530

anupam.singh – 59 file(s) modified
Insurance feature for our website

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /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/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.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/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/resources/templates/thinheader.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/shipping.css
+ /trunk/Website/src/main/webapp/images/insurance.png
+ /trunk/Website/src/main/webapp/images/insuredStamp.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.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/insurance-result.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /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 6251 – Added Whats this in pickup-in-store tab under shipping page

kshitij.sood — Tue, 23 Oct 2012 12:38:08 +0530

kshitij.sood – 1 file(s) modified
Added Whats this in pickup-in-store tab under shipping page

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 5920 – Added a message on shipping page informing the user that ...

anupam.singh — Mon, 03 Sep 2012 12:49:59 +0530

anupam.singh – 4 file(s) modified
Added a message on shipping page informing the user that In-store pickup is available only in Delhi/NCR. This message is visible only when "pickup in store" tab is selected.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5831 – trac # 1570 When a customer adds an address ...

anupam.singh — Fri, 17 Aug 2012 15:59:40 +0530

anupam.singh – 3 file(s) modified
trac # 1570

When a customer adds an address when he is on shipping page and he has selected pickup in store page, we take him back to deliver to my address tab on page load.

Clearing the add address form causes both shipping and billing address div to show.

If there is no addresses added and a user has selected pickup in store tab, then clicking on proceed to pay button alerts with a message "Add a new address" which can be confusing. It should mention that we need a billing address for her to proceed.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5810 – Instead of other terms used throughout the UI we will ...

anupam.singh — Thu, 16 Aug 2012 18:44:52 +0530

anupam.singh – 6 file(s) modified
Instead of other terms used throughout the UI we will now be using the following two terms "Pickup In Store" and "Pay in store".

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/images/mob_icon.png
~ /trunk/Website/src/main/webapp/images/payment-page.png
~ /trunk/Website/src/main/webapp/images/shipping-page.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/buy-online-and-pickup-in-store.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5803 – The message on empty address list was "Enter and address ...

anupam.singh — Thu, 16 Aug 2012 13:56:20 +0530

anupam.singh – 1 file(s) modified
The message on empty address list was "Enter and address where items would be delivered" irrespective of the tab selected. Fixed this.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 5765 – Added a "NEW" icon on pickup from store tab at ...

anupam.singh — Fri, 10 Aug 2012 14:00:01 +0530

anupam.singh – 4 file(s) modified
Added a "NEW" icon on pickup from store tab at shipping page and pay at store tab at payment page.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
+ /trunk/Website/src/main/webapp/images/new_red.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5751 – Changing All to Select Zone

anupam.singh — Wed, 08 Aug 2012 17:43:08 +0530

anupam.singh – 1 file(s) modified
Changing All to Select Zone

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 5746 – Trac #1541 Option to choose zone of the pickup store

anupam.singh — Wed, 08 Aug 2012 04:57:03 +0530

anupam.singh – 4 file(s) modified
Trac #1541
Option to choose zone of the pickup store

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5716 – InStore Pickup UI

anupam.singh — Fri, 03 Aug 2012 11:52:31 +0530

anupam.singh – 11 file(s) modified
InStore Pickup UI

~ /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/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
+ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5614 – Reverting the UI changes for pickup from store.

rajveer — Tue, 17 Jul 2012 13:39:53 +0530

rajveer – 11 file(s) modified
Reverting the UI changes for pickup from store.

~ /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/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
x /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5607 – Trac # 1491 Removed the delete-address button from shipping page ...

anupam.singh — Mon, 16 Jul 2012 14:19:30 +0530

anupam.singh – 2 file(s) modified
Trac # 1491
Removed the delete-address button from shipping page
Reviewer : Mandeep Dhir

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 5598 – added null check

anupam.singh — Fri, 13 Jul 2012 18:18:51 +0530

anupam.singh – 1 file(s) modified
added null check

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 5594 – Improved UI and bug fixes for store pickup

anupam.singh — Fri, 13 Jul 2012 12:49:05 +0530

anupam.singh – 8 file(s) modified
Improved UI and bug fixes for store pickup

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5574 – Deleted an image tag which was added inadvertently

anupam.singh — Wed, 11 Jul 2012 11:19:36 +0530

anupam.singh – 1 file(s) modified
Deleted an image tag which was added inadvertently

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 5572 – Trac # 1472 InStore pickUp UI.

anupam.singh — Tue, 10 Jul 2012 19:21:41 +0530

anupam.singh – 55 file(s) modified
Trac # 1472
InStore pickUp UI.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /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/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.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/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-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/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.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/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/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.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/my-purchases-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-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/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.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/test-index.vm

Rev 5040 – Ticket #1146 - Tracking the event of user trying to ...

varun.gupta — Fri, 20 Apr 2012 12:46:28 +0530

varun.gupta – 2 file(s) modified
Ticket #1146 - Tracking the event of user trying to proceed for payment mode selection without entering a valid pincode.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 4923 – Ticket #854 - Fixed the alignment for discount

varun.gupta — Mon, 09 Apr 2012 04:38:36 +0530

varun.gupta – 2 file(s) modified
Ticket #854 - Fixed the alignment for discount

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css

Rev 4453 – Trac #852 and #869 - Full name field removed from ...

varun.gupta — Tue, 07 Feb 2012 20:09:00 +0530

varun.gupta – 18 file(s) modified
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/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /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

Rev 4225 – Not storing best deal text for an item in a ...

varun.gupta — Tue, 20 Dec 2011 18:06:42 +0530

varun.gupta – 1 file(s) modified
Not storing best deal text for an item in a variable

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 4217 – Trac #734 - Deal text included in Cart flow

varun.gupta — Sat, 17 Dec 2011 14:58:06 +0530

varun.gupta – 7 file(s) modified
Trac #734 - Deal text included in Cart flow

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4136 – Improved error messages and styling.

rajveer — Fri, 25 Nov 2011 15:01:32 +0530

rajveer – 6 file(s) modified
Improved error messages and styling.

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3903 – Modified the appearance of badge on Best Deals link in ...

varun.gupta — Tue, 25 Oct 2011 18:14:14 +0530

varun.gupta – 12 file(s) modified
Modified the appearance of badge on Best Deals link in header menu

~ /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/PaySuccessController.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/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3863 – Added link to Android BDay offers

varun.gupta — Mon, 24 Oct 2011 13:57:24 +0530

varun.gupta – 6 file(s) modified
Added link to Android BDay offers

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/images/droid.gif

Rev 3831 – Fixed some issues: header link, footer links, shipping page variables.

rajveer — Fri, 21 Oct 2011 07:32:44 +0530

rajveer – 3 file(s) modified
Fixed some issues: header link, footer links, shipping page variables.

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 3830 – Merged the Website1 code back into the website

chandranshu — Thu, 20 Oct 2011 19:44:52 +0530

chandranshu – 140 file(s) modified
Merged the Website1 code back into the website

~ /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/cartwidget.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
x /trunk/Website/src/main/resources/templates/searchbar.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cart.css
+ /trunk/Website/src/main/webapp/css/cartflow.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/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/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/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/button-glass-bg.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/Icons_CreditCardsPayment.png
+ /trunk/Website/src/main/webapp/images/Icons_Security.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/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/number_selected.png
+ /trunk/Website/src/main/webapp/images/number_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/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/sprite.png
+ /trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/cart-details.js
+ /trunk/Website/src/main/webapp/js/common.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
~ /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/careers.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

Rev 3312 – Just added a javascript check when people leave captcha empty. ...

chandranshu — Thu, 15 Sep 2011 12:06:35 +0530

chandranshu – 4 file(s) modified
Just added a javascript check when people leave captcha empty. Added a friendlier message on the shipping page when the location is not serviceable. Deleted the long obsolete HdfcPayController

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /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 2012 – font-weight of Total Amount now bold in case no coupon ...

varun.gupta — Wed, 01 Jun 2011 06:49:32 +0530

varun.gupta – 2 file(s) modified
font-weight of Total Amount now bold in case no coupon is applied

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 1985 – Discounted Amount added to Shipping Details page

varun.gupta — Tue, 31 May 2011 15:05:58 +0530

varun.gupta – 1 file(s) modified
Discounted Amount added to Shipping Details page

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

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 1796 – Click tracking added to Proceed to Pay button

varun.gupta — Tue, 10 May 2011 18:15:55 +0530

varun.gupta – 2 file(s) modified
Click tracking added to Proceed to Pay button

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/custom-jquery.js