Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
6936 4698 d 20 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
6930 4699 d 14 h anupam.singh /trunk/Website/src/main/webapp/ More robust DOB validations
Fixed alignment issue of shipping button on cart page		  
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/js/cart-details.js
6903 4704 d 6 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
5920 4881 d 18 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
5716 4912 d 19 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 4929 d 18 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 4933 d 18 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
5032 5018 d 15 h varun.gupta /trunk/Website/src/main/webapp/css/ Reduced the width of product name container div, by 1px, inside the cart  
/trunk/Website/src/main/webapp/css/cartflow.css
4923 5029 d 3 h varun.gupta /trunk/Website/src/main/ Ticket #854 - Fixed the alignment for discount  
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/css/cartflow.css
4232 5137 d 12 h varun.gupta /trunk/ Trac #778 - Message added on Pay Success page and Order confirmation email for delay due to fog  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
4231 5137 d 16 h varun.gupta /trunk/Website/src/main/webapp/ Trac #772 - Cart footer fixed for A/B test variation. 'Checkout' button now appearing correctly when coupon is applied.  
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
4217 5142 d 16 h varun.gupta /trunk/Website/src/main/ 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/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
4136 5164 d 16 h rajveer /trunk/Website/src/main/ 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/WEB-INF/content/shipping-index.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
4046 5175 d 14 h varun.gupta /trunk/Website/src/main/ Code added to manage AB Test variations on Cart page  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
4017 5180 d 14 h rajveer /trunk/Website/src/main/webapp/css/ Increased page width from 960px to 980px  
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/common.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/product.css
/trunk/Website/src/main/webapp/css/style.css
/trunk/Website/src/main/webapp/css/widgets.css
3863 5196 d 17 h varun.gupta /trunk/Website/src/main/ 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
3856 5199 d 13 h varun.gupta /trunk/Website/src/main/webapp/ Fixed Long name issue on the cart page  
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
3830 5200 d 12 h chandranshu /trunk/Website/ Merged the Website1 code back into the website  
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
/trunk/Website/src/main/webapp/css/cartflow.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/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/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/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/Icons_CreditCardsPayment.png
/trunk/Website/src/main/webapp/images/Icons_Security.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/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/VerticalSeparator_NavBar.png
/trunk/Website/src/main/webapp/images/button-glass-bg.png
/trunk/Website/src/main/webapp/images/number_Unselected.png
/trunk/Website/src/main/webapp/images/number_selected.png
/trunk/Website/src/main/webapp/images/saholic-logo.jpg
/trunk/Website/src/main/webapp/images/sprite.png
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/main/resources/templates/searchbar.vm
/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/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
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/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/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
/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/contactus.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/js/all.js
/trunk/Website/src/main/webapp/js/cart-details.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