SmartDukaan – /trunk/Website/src/main/webapp/WEB-INF/

Rev 7048 – Recharge page side banner

kshitij.sood — Tue, 26 Mar 2013 16:17:17 +0530

kshitij.sood – 1 file(s) modified
Recharge page side banner

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 7039 – Removing all changes related to facebook login because i dont ...

anupam.singh — Sun, 24 Mar 2013 16:35:03 +0530

anupam.singh – 18 file(s) modified
Removing all changes related to facebook login because i dont like them ;)

~ /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/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7027 – Added method for re

rajveer — Fri, 22 Mar 2013 15:42:37 +0530

rajveer – 2 file(s) modified
Added method for re

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm

Rev 7026 – Added code for Redexpress to diaplay on website.

rajveer — Fri, 22 Mar 2013 15:41:04 +0530

rajveer – 7 file(s) modified
Added code for Redexpress to diaplay on website.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RedExpressLogisticsReconciliation.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/RedexpressUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/redexpress-updates-show.vm

Rev 7015 – adding "/" in front of images to allow versioning

amar.kumar — Thu, 21 Mar 2013 14:41:29 +0530

amar.kumar – 2 file(s) modified
adding "/" in front of images to allow versioning

~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7007 – Changes to allow login through facebook and storing user's facebook ...

amar.kumar — Wed, 20 Mar 2013 17:05:22 +0530

amar.kumar – 21 file(s) modified
Changes to allow login through facebook and storing user's facebook credentials to be able to post on user's behalf on facebook

~ /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/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
+ /trunk/Website/src/main/webapp/channel.html
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/images/facebooklogin.png
+ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 6996 – Added RechargeAgain button on my recharges page

anupam.singh — Mon, 18 Mar 2013 14:40:48 +0530

anupam.singh – 5 file(s) modified
Added RechargeAgain button on my recharges page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6992 – Enable invoice download from my purchase.

rajveer — Fri, 15 Mar 2013 12:26:09 +0530

rajveer – 1 file(s) modified
Enable invoice download from my purchase.

~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm

Rev 6988 – Added support to fetch invoice number

rajveer — Thu, 14 Mar 2013 17:12:18 +0530

rajveer – 9 file(s) modified
Added support to fetch invoice number

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/InvoiceController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/invoice-show.vm

Rev 6976 – Added pagination for category pages.

amit.gupta — Mon, 11 Mar 2013 12:37:39 +0530

amit.gupta – 3 file(s) modified
Added pagination for category pages.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6975 – Made special pages sortable, and accessories page wont show classes.

amit.gupta — Thu, 07 Mar 2013 19:03:31 +0530

amit.gupta – 3 file(s) modified
Made special pages sortable, and accessories page wont show classes.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6973 – Made special pages sortable.

amit.gupta — Thu, 07 Mar 2013 16:29:49 +0530

amit.gupta – 4 file(s) modified
Made special pages sortable.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6954 – Fixed missing images when less banks are populated.

amit.gupta — Wed, 06 Mar 2013 11:54:55 +0530

amit.gupta – 1 file(s) modified
Fixed missing images when less banks are populated.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6949 – modified styles and added cached snippets.

amit.gupta — Tue, 05 Mar 2013 18:03:19 +0530

amit.gupta – 3 file(s) modified
modified styles and added cached snippets.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm

Rev 6948 – Removed Bharat Bandh message from contact us page...Was checked in ...

anupam.singh — Tue, 05 Mar 2013 17:56:00 +0530

anupam.singh – 1 file(s) modified
Removed Bharat Bandh message from contact us page...Was checked in by mistake

~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 6945 – Removed coming soon from emi.

amit.gupta — Tue, 05 Mar 2013 14:48:44 +0530

amit.gupta – 1 file(s) modified
Removed coming soon from emi.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6942 – now search results have 20 products in a page.

amit.gupta — Tue, 05 Mar 2013 13:51:29 +0530

amit.gupta – 4 file(s) modified
now search results have 20 products in a page.

Rev 6933 – Changed Title of Insurance T&C page

anupam.singh — Mon, 04 Mar 2013 19:51:15 +0530

anupam.singh – 1 file(s) modified
Changed Title of Insurance T&C page

~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm

Rev 6931 – made price Slider dynamic.

amit.gupta — Mon, 04 Mar 2013 17:45:51 +0530

amit.gupta – 8 file(s) modified
made price Slider dynamic.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/webapp/js/priceSlider.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6930 – More robust DOB validations Fixed alignment issue of shipping button ...

anupam.singh — Mon, 04 Mar 2013 17:18:51 +0530

anupam.singh – 3 file(s) modified
More robust DOB validations
Fixed alignment issue of shipping button on cart page

~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 6929 – Changed itemId attribute to productid due to a "feature" in ...

anupam.singh — Mon, 04 Mar 2013 15:54:09 +0530

anupam.singh – 2 file(s) modified
Changed itemId attribute to productid due to a "feature" in ff16
====== http://stackoverflow.com/questions/12897081/jquery-1-4-1-and-firefox-16-0-1-strange-attribute-issue

Moved "go to shipping" button to better div.

~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 6926 – Added another point to Insurance T&C page.

anupam.singh — Mon, 04 Mar 2013 14:28:40 +0530

anupam.singh – 1 file(s) modified
Added another point to Insurance T&C page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm

Rev 6924 – Minor UI changes for Insurance feature

anupam.singh — Mon, 04 Mar 2013 13:36:12 +0530

anupam.singh – 3 file(s) modified
Minor UI changes for Insurance feature

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 6915 – Option to download policy doc from my purchases Using New ...

anupam.singh — Thu, 28 Feb 2013 20:49:18 +0530

anupam.singh – 7 file(s) modified
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/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/images/insurance.jpg
~ /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

Rev 6903 – Insurance feature for our website

anupam.singh — Thu, 28 Feb 2013 01:15:01 +0530

anupam.singh – 59 file(s) modified
Insurance feature for our website

~ /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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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/resources/templates/thinheader.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/images/insurance.png
+ /trunk/Website/src/main/webapp/images/insuredStamp.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /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/insurance-result.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.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

Rev 6895 – CSS related changes.

kshitij.sood — Wed, 27 Feb 2013 13:00:35 +0530

kshitij.sood – 2 file(s) modified
CSS related changes.

~ /trunk/Website/src/main/webapp/css/slider-style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 6885 – Fixed bug and some css and js changes.

kshitij.sood — Tue, 26 Feb 2013 15:12:03 +0530

kshitij.sood – 11 file(s) modified
Fixed bug and some css and js changes.

~ /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/ScpService.java
~ /trunk/Website/src/main/webapp/css/jquery.slidy.css
+ /trunk/Website/src/main/webapp/css/slider-style.css
+ /trunk/Website/src/main/webapp/css/slider.css
+ /trunk/Website/src/main/webapp/images/left_arrow.png
+ /trunk/Website/src/main/webapp/images/right_arrow.png
+ /trunk/Website/src/main/webapp/js/jquery.easing.1.3.js
+ /trunk/Website/src/main/webapp/js/jquery.slider.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 6883 – Changed text of our refund policy. Customer has to bear ...

anupam.singh — Tue, 26 Feb 2013 15:04:47 +0530

anupam.singh – 1 file(s) modified
Changed text of our refund policy. Customer has to bear EMI conversion charges in case of refunds.

~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 6875 – Added validation and custom image names.

kshitij.sood — Mon, 25 Feb 2013 13:49:19 +0530

kshitij.sood – 3 file(s) modified
Added validation and custom image names.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm

Rev 6866 – implemented Multi-select search.

amit.gupta — Fri, 22 Feb 2013 11:28:46 +0530

amit.gupta – 11 file(s) modified
implemented Multi-select search.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6856 – Reverted home controller and index.vm

kshitij.sood — Tue, 19 Feb 2013 18:34:12 +0530

kshitij.sood – 2 file(s) modified
Reverted home controller and index.vm

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 6848 – Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 12:59:14 +0530

kshitij.sood – 27 file(s) modified
Sliding Banner and its user interface implementation.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/ScpService.java
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/css/imgareaselect-default.css
+ /trunk/Website/src/main/webapp/css/jquery.slidy.css
+ /trunk/Website/src/main/webapp/images/add.png
+ /trunk/Website/src/main/webapp/images/background.gif
+ /trunk/Website/src/main/webapp/images/greendot.gif
+ /trunk/Website/src/main/webapp/images/reddot.gif
+ /trunk/Website/src/main/webapp/images/red_dot.gif
+ /trunk/Website/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /trunk/Website/src/main/webapp/js/jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/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

Rev 6816 – Removed some fields from innoviti pay-show view.

rajveer — Thu, 14 Feb 2013 14:55:02 +0530

rajveer – 1 file(s) modified
Removed some fields from innoviti pay-show view.

~ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6806 – Made two extra parameters configurable for innoviti.

rajveer — Mon, 11 Feb 2013 19:10:12 +0530

rajveer – 2 file(s) modified
Made two extra parameters configurable for innoviti.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6802 – Made changes of recharge offer as discussed by Abhishek.

amit.gupta — Fri, 08 Feb 2013 13:06:01 +0530

amit.gupta – 1 file(s) modified
Made changes of recharge offer as discussed by Abhishek.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 6801 – only validate if there is some text in the DTH ...

amit.gupta — Fri, 08 Feb 2013 00:03:41 +0530

amit.gupta – 1 file(s) modified
only validate if there is some text in the DTH Amount field.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6799 – Added validation for Dish TV.

amit.gupta — Thu, 07 Feb 2013 18:26:03 +0530

amit.gupta – 2 file(s) modified
Added validation for Dish TV.

~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6775 – Remove mynotes controller from the website. Also remove mynotes from ...

rajveer — Thu, 31 Jan 2013 14:47:06 +0530

rajveer – 9 file(s) modified
Remove mynotes controller from the website. Also remove mynotes from content.

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/entity.js
x /trunk/Website/src/main/webapp/js/my-notes.js
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-json.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm

Rev 6770 – Citi bank emi option is live.

amit.gupta — Wed, 30 Jan 2013 18:03:49 +0530

amit.gupta – 1 file(s) modified
Citi bank emi option is live.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6736 – Added emi discount logic.

amit.gupta — Fri, 25 Jan 2013 15:42:43 +0530

amit.gupta – 22 file(s) modified
Added emi discount logic.

~ /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/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm