Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
12570 4289 d 2 h amit.gupta /trunk/Website/src/main/webapp/js/ Added changes related to callback function.  
/trunk/Website/src/main/webapp/js/shippingAddress.js
7456 4736 d 23 h amit.gupta /trunk/Website/src/main/ 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
7376 4748 d 0 h amit.gupta /trunk/Website/src/main/ 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
5920 5018 d 1 h anupam.singh /trunk/Website/src/main/ 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
5902 5023 d 23 h amit.gupta /trunk/Website/src/main/webapp/js/ Added event tracking for in-store pickup and region selection change for in-store pickup.  
/trunk/Website/src/main/webapp/js/shippingAddress.js
5831 5034 d 21 h anupam.singh /trunk/Website/src/main/ 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
5796 5037 d 3 h anupam.singh /trunk/Website/src/main/webapp/js/ Changing text to "Select a pickup point" from "Select a pickup point nearest to you". The longer string was causing misalignment on shipping page when "Pick from store" tab was selected on mozilla firefox.  
/trunk/Website/src/main/webapp/js/shippingAddress.js
5747 5044 d 1 h anupam.singh /trunk/Website/src/main/webapp/js/ Added alert if no store is selected in the current selected zone.  
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
5746 5044 d 8 h anupam.singh /trunk/Website/src/main/ 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
5716 5049 d 2 h anupam.singh /trunk/Website/ InStore Pickup UI  
/trunk/Website/src/main/webapp/css/shipping.css
/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/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
5614 5066 d 0 h rajveer /trunk/Website/ Reverting the UI changes for pickup from store.  
/trunk/Website/src/main/webapp/css/shipping.css
/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/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
5594 5070 d 1 h anupam.singh /trunk/ 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/WEB-INF/content/proceed-to-pay-index.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
5572 5072 d 18 h anupam.singh /trunk/ Trac # 1472
InStore pickUp UI.
 
/trunk/Website/src/main/webapp/css/shipping.css
/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/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
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
5145 5135 d 0 h phani.kumar /trunk/Website/src/main/ Ticket #1202 script to delete unused images
reviewer: Rajveer
 
/trunk/Website/src/main/resources/templates/locator.vm
/trunk/Website/src/main/resources/templates/accessories.vm
/trunk/Website/src/main/resources/templates/browsehistory.vm
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/header.vm
/trunk/Website/src/main/resources/templates/logindetails.vm
/trunk/Website/src/main/resources/templates/mainmenu.vm
/trunk/Website/src/main/resources/templates/mostcompared.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/browse-history-show.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/forgot-password-index.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/pay-error-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.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/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm
/trunk/Website/src/main/webapp/css/cart.css
/trunk/Website/src/main/webapp/css/common.css
/trunk/Website/src/main/webapp/css/comparision.css
/trunk/Website/src/main/webapp/css/demoStyles.css
/trunk/Website/src/main/webapp/css/entity.css
/trunk/Website/src/main/webapp/css/gc_safari.css
/trunk/Website/src/main/webapp/css/home.css
/trunk/Website/src/main/webapp/css/ie7.css
/trunk/Website/src/main/webapp/css/ie8.css
/trunk/Website/src/main/webapp/css/jquery-ui-1.8.6.custom.css
/trunk/Website/src/main/webapp/css/lightbox_inline.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/nav.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/signinsignup.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/js/all.js
/trunk/Website/src/main/webapp/js/comparison.js
/trunk/Website/src/main/webapp/js/contact-us.js
/trunk/Website/src/main/webapp/js/custom-jquery.js
/trunk/Website/src/main/webapp/js/entity.js
/trunk/Website/src/main/webapp/js/gallery.js
/trunk/Website/src/main/webapp/js/jquery.jscrollpane.js
/trunk/Website/src/main/webapp/js/myaccount.js
/trunk/Website/src/main/webapp/js/priceSlider.js
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
/trunk/Website/src/main/webapp/js/productCategory.js
/trunk/Website/src/main/webapp/js/scrolltab.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
/trunk/Website/src/main/webapp/js/widgets.js
4148 5297 d 22 h rajveer /trunk/Website/src/main/webapp/js/ Adding the address validation at myaccount page.  
/trunk/Website/src/main/webapp/js/shippingAddress.js
1919 5486 d 18 h rajveer /trunk/Website/src/main/webapp/js/ moved relative paths to absolute paths in Ajax calls  
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/entity.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
1048 5553 d 17 h chandranshu /trunk/Website/ Removed jslint warnings  
/trunk/Website/pom.xml
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/charLimit.js
/trunk/Website/src/main/webapp/js/gallery.js
/trunk/Website/src/main/webapp/js/loginpop.js
/trunk/Website/src/main/webapp/js/myaccount.js
/trunk/Website/src/main/webapp/js/priceSlider.js
/trunk/Website/src/main/webapp/js/productCategory.js
/trunk/Website/src/main/webapp/js/scrolltab.js
/trunk/Website/src/main/webapp/js/shippingAddress.js
/trunk/Website/src/main/webapp/js/widget_accordion.js
/trunk/Website/src/main/webapp/js/widget_slidetab.js
1035 5553 d 20 h chandranshu /trunk/Website/ moved web content to src/main/webapp  
/trunk/Website/src/main/webapp/css
/trunk/Website/src/main/webapp/images
/trunk/Website/src/main/webapp/js
/trunk/Website/WebContent/css
/trunk/Website/WebContent/images
/trunk/Website/WebContent/js
929 5564 d 2 h rajveer /trunk/Website/ Removed remaining alert statements  
/trunk/Website/WebContent/js/myaccount.js
/trunk/Website/WebContent/js/productCategory.js
/trunk/Website/WebContent/js/shippingAddress.js
/trunk/Website/conf/templates/shippingdetails.vm
858 5575 d 1 h vikas /trunk/Website/WebContent/js/ Fix makePrimary Bugs.  
/trunk/Website/WebContent/js/shippingAddress.js

Show All