Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
13483 4033 d 19 h amit.gupta /trunk/Website/src/main/webapp/css/  
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
13460 4037 d 21 h amit.gupta /trunk/ Added Changes regarding netbanking ui  
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-options-index.vm
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
/trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
6737 4737 d 10 h amit.gupta /trunk/Website/src/main/webapp/css/ Added width to success message of width 500  
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
6736 4737 d 16 h amit.gupta /trunk/ Added emi discount logic.  
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.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/user/Cart.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/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/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
6435 4789 d 9 h amit.gupta /trunk/Website/src/main/webapp/ Added coming soon section for emis  
/trunk/Website/src/main/webapp/images/axis-icon.png
/trunk/Website/src/main/webapp/images/citi-icon.png
/trunk/Website/src/main/webapp/images/hdfc-icon.png
/trunk/Website/src/main/webapp/images/hsbc-icon.png
/trunk/Website/src/main/webapp/images/icici-icon.png
/trunk/Website/src/main/webapp/images/kotak-icon.png
/trunk/Website/src/main/webapp/images/sbi-icon.png
/trunk/Website/src/main/webapp/images/std-chartered-icon.png
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
6421 4790 d 8 h amit.gupta /trunk/Website/src/main/webapp/ minor changes related to look n feel  
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
6413 4790 d 14 h amit.gupta /trunk/Website/src/main/webapp/ minor changes  
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
6407 4790 d 15 h amit.gupta /trunk/Website/src/main/ Added emi options in proceed to pay.  
/trunk/Website/src/main/webapp/images/rupee-icon.png
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
6211 4837 d 17 h kshitij.sood /trunk/Website/src/main/webapp/css/ Changes related to new banks under netbanking  
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
5145 4998 d 18 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
4656 5061 d 13 h phani.kumar /trunk/Website/src/main/webapp/ Ticket #917 input text box enhanced
reviewer: Rajveer
 
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
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
3617 5207 d 19 h chandranshu /trunk/Website/src/main/ Corrected a class casting and increased the min-height  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
3182 5245 d 17 h chandranshu /trunk/Website/src/main/webapp/ Added logos for banks, cash cards and Visa electron debit cards. Also corrected the labels for GA.  
/trunk/Website/src/main/webapp/images/banks-sprite.gif
/trunk/Website/src/main/webapp/images/cash-cards.gif
/trunk/Website/src/main/webapp/images/cc-logos-1.gif
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
3163 5248 d 21 h chandranshu /trunk/Website/src/main/webapp/ Added logos of credit and debit cards  
/trunk/Website/src/main/webapp/images/cc_logos.gif
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
3108 5250 d 17 h chandranshu /trunk/Website/src/main/webapp/ Added some space after radio buttons  
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
3101 5251 d 12 h chandranshu /trunk/Website/ New payment page with lots of GA tracking  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.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/shipping-index.vm
/trunk/Website/src/main/webapp/js/paymode-selection.js