Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20222 3569 d 14 h aman.kumar /trunk/Website/src/main/ code update  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/loginregister.js
10536 4402 d 19 h amit.gupta /trunk/Website/src/main/webapp/WEB-INF/content/ Fixed the analytics for pay now.  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
10095 4441 d 17 h kshitij.sood /trunk/Website/src/main/ Added target  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/resources/templates/cartwidget.vm
/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/webapp/WEB-INF/content/accessory-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.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/oneassist-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/WEB-INF/content/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/spiceaircel-offer.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
10015 4448 d 18 h kshitij.sood /trunk/Website/src/main/webapp/WEB-INF/content/ Viral Mint test  
/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/entity-show.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
8936 4535 d 15 h kshitij.sood /trunk/Website/src/main/ Added track event with analytics code and side banner change.  
/trunk/Website/src/main/webapp/images/Why-Saholic-New.png
/trunk/Website/src/main/resources/templates/cartwidget.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/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/js/common.js
8917 4539 d 18 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 4554 d 12 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 4582 d 18 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 4583 d 12 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 4583 d 12 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 4783 d 19 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
6496 4889 d 14 h anupam.singh /trunk/Website/src/main/webapp/WEB-INF/content/ Added id attribute for discount coupon field  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
6495 4889 d 17 h anupam.singh /trunk/Website/src/main/ Added backend validations on all fields. Added a hash of userId. RechargeAmount was becoming zero for logged in user when wallet was being used.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
6445 4897 d 18 h anupam.singh /trunk/Website/src/main/webapp/WEB-INF/content/ Changed color from red to blue for successful coupon application  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
6443 4897 d 19 h anupam.singh /trunk/ Bug Fixes.
1) Even After applying Coupon full amount is being charged at the gateway
2) In case of applying incorrect coupon there is no way to retry appying a coupon.
3) Limit of 2 coupon applications per user is not there, can apply more than 2 times.
 
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
6433 4898 d 9 h anupam.singh /trunk/ Added support for recharge coupons  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.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/order/ttypes.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.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.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/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
6400 4899 d 17 h anupam.singh /trunk/Website/src/main/webapp/ Clicking the "recharge now" button, hides it to avoid double clicks  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
6336 4918 d 16 h anupam.singh /trunk/ Added tweet and post on facebook button on success page. Changed text depending upon denomination Type.  
/trunk/Website/src/main/webapp/images/tweet-about-us.png
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/DeviceNumberInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-denomination.vm
/trunk/Website/src/main/webapp/js/recharge.js
6307 4926 d 10 h anupam.singh /trunk/ Added support for service availability. Login now message is visible only when customer has some money in his wallet. Disclaimer link abandoned in favour of inline disclaimer.  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/ServiceAvailability.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
6260 4938 d 12 h anupam.singh /trunk/Website/src/main/webapp/ Changed the dom structure for recharge index page.  
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/css/recharge.css
/trunk/Website/src/main/webapp/js/recharge.js

Show All