Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
9301 4510 d 7 h kshitij.sood /trunk/Website/src/main/ One assist changes for website.  
/trunk/Website/src/main/webapp/WEB-INF/content/accessory-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm
/trunk/Website/src/main/webapp/images/oneassist.jpg
/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/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/images/insurance.jpg
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/widgets.js
7791 4678 d 8 h rajveer /trunk/Website/src/main/ 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/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/entity.js
7458 4719 d 7 h amit.gupta /trunk/Website/src/main/resources/templates/ reverted to anupam's version  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
7456 4719 d 8 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
7377 4727 d 11 h amit.gupta /trunk/Website/src/main/resources/templates/ marking hotspot bold.  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
7376 4730 d 10 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
6971 4815 d 9 h anupam.singh /trunk/Website/src/main/ 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
6936 4817 d 12 h anupam.singh /trunk/Website/src/main/ Fixed alignment issues in cartFlowHeader and PickupStore Tab  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/css/cartflow.css
6903 4822 d 22 h anupam.singh /trunk/ Insurance feature for our website  
/trunk/Website/src/main/resources/templates/thinheader.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/images/insurance.png
/trunk/Website/src/main/webapp/images/insuredStamp.png
/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/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.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/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/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
/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/js/cart-details.js
/trunk/Website/src/main/webapp/js/recharge.js
6251 4950 d 11 h kshitij.sood /trunk/Website/src/main/resources/templates/ Added Whats this in pickup-in-store tab under shipping page  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
5920 5000 d 10 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
5831 5017 d 7 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
5810 5018 d 4 h anupam.singh /trunk/Website/src/main/ 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/WEB-INF/content/buy-online-and-pickup-in-store.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.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
5803 5018 d 9 h anupam.singh /trunk/Website/src/main/resources/templates/ 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
5765 5024 d 9 h anupam.singh /trunk/Website/src/main/ Added a "NEW" icon on pickup from store tab at shipping page and pay at store tab at payment page.  
/trunk/Website/src/main/webapp/images/new_red.png
/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/shipping.css
5751 5026 d 5 h anupam.singh /trunk/Website/src/main/resources/templates/ Changing All to Select Zone  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
5746 5026 d 18 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 5031 d 11 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 5048 d 10 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
5607 5049 d 9 h anupam.singh /trunk/Website/src/main/ 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

←Prev12Next→

Show All