Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
11964 4319 d 1 h amit.gupta /trunk/Website/src/main/ Added json object  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java
/trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/gosf-terms-conditions.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/tag-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm
9998 4452 d 4 h rajveer /trunk/Website/src/main/webapp/WEB-INF/content/ Made the changes in Tnc  
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
8917 4540 d 19 h kshitij.sood /trunk/Website/src/ Changes in controllers and vm's for banner implementation.  
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/production/resources/templates/commoncssfiles.vm
/trunk/Website/src/production/resources/templates/commonjsfiles.vm
8792 4555 d 14 h kshitij.sood /trunk/Website/src/main/ New side banner  
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
/trunk/Website/src/main/webapp/images/Side-Add-blue.jpg
8462 4583 d 20 h kshitij.sood /trunk/Website/src/main/webapp/ New side banner image and adding side banner to recharge pages and some static pages.  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
/trunk/Website/src/main/webapp/images/Side-Add-blue.jpg
8435 4584 d 13 h kshitij.sood /trunk/Website/src/main/webapp/WEB-INF/content/ Restoring previous revision  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
8434 4584 d 14 h kshitij.sood /trunk/Website/src/main/ New side banner.  
/trunk/Website/src/main/webapp/images/Side-Add-blue.jpg
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
/trunk/Website/src/main/webapp/js/widgets.js
7061 4784 d 21 h kshitij.sood /trunk/Website/src/main/webapp/WEB-INF/content/ Side banner.  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
6933 4809 d 14 h anupam.singh /trunk/Website/src/main/webapp/WEB-INF/content/ Changed Title of Insurance T&C page  
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
6926 4809 d 19 h anupam.singh /trunk/Website/src/main/webapp/WEB-INF/content/ Added another point to Insurance T&C page.  
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
6915 4813 d 13 h anupam.singh /trunk/ Option to download policy doc from my purchases
Using New India Assurance icon on cart page
Added new T&c to policy doc
in insurancedetailfor order table isDeclared field is 0 by default		  
/trunk/Website/src/main/webapp/images/insurance.jpg
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
6903 4814 d 8 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