Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
7456 4601 d 7 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 4612 d 9 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
6907 4704 d 8 h amit.gupta /trunk/Website/src/main/webapp/css/ removed qoute  
/trunk/Website/src/main/webapp/css/shipping.css
6903 4704 d 21 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
6252 4832 d 9 h kshitij.sood /trunk/Website/src/main/webapp/css/ Changes in css (shipping.css) related to whats this popup  
/trunk/Website/src/main/webapp/css/shipping.css
5920 4882 d 9 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
5794 4901 d 13 h anupam.singh /trunk/Website/src/main/webapp/css/ Reducing the padding of "Deliver to my address" tab on shipping page to 19px from 25px. It was causing issues on chrome on windows.  
/trunk/Website/src/main/webapp/css/shipping.css
5765 4906 d 8 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
5746 4908 d 17 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 4913 d 10 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