SmartDukaan – /trunk/Website/

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 6981 – Press section modification

kshitij.sood — Tue, 12 Mar 2013 17:07:52 +0530

kshitij.sood – 4 file(s) modified
Press section modification

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/images/press-logos-sprite.jpg
~ /trunk/Website/src/main/webapp/js/common.js

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 6971 – Removed alerts and added error message div for insurance details. ...

anupam.singh — Thu, 07 Mar 2013 14:28:27 +0530

anupam.singh – 2 file(s) modified
Removed alerts and added error message div for insurance details. Now tracking the number of time we show alert when user doesn't agree to Insurance T&C and tries to go to shipping page.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6970 – Insurance widget and minor changes in emi widget.

kshitij.sood — Thu, 07 Mar 2013 14:00:57 +0530

kshitij.sood – 2 file(s) modified
Insurance widget and minor changes in emi widget.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6968 – Typo mistake

kshitij.sood — Thu, 07 Mar 2013 00:50:01 +0530

kshitij.sood – 1 file(s) modified
Typo mistake

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6967 – Emi widget new banks added.

kshitij.sood — Thu, 07 Mar 2013 00:34:40 +0530

kshitij.sood – 2 file(s) modified
Emi widget new banks added.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6959 – Emi widget

kshitij.sood — Wed, 06 Mar 2013 14:38:39 +0530

kshitij.sood – 2 file(s) modified
Emi widget

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6958 – Mark payments as captured in case of innoviti PG.

rajveer — Wed, 06 Mar 2013 12:39:08 +0530

rajveer – 1 file(s) modified
Mark payments as captured in case of innoviti PG.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.java

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 6953 – added comma

amit.gupta — Tue, 05 Mar 2013 18:32:50 +0530

amit.gupta – 1 file(s) modified
added comma

~ /trunk/Website/src/main/webapp/css/style.css

Rev 6951 – added high resolution icons for banks

amit.gupta — Tue, 05 Mar 2013 18:17:35 +0530

amit.gupta – 2 file(s) modified
added high resolution icons for banks

~ /trunk/Website/src/main/webapp/images/icici-icon.png
~ /trunk/Website/src/main/webapp/images/std-chartered-icon.png

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 6946 – Removed coming soon variable.

amit.gupta — Tue, 05 Mar 2013 15:11:37 +0530

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

~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js

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 6944 – added images with better resolution.

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

amit.gupta – 3 file(s) modified
added images with better resolution.

~ /trunk/Website/src/main/webapp/images/axis-icon.png
~ /trunk/Website/src/main/webapp/images/hsbc-icon.png
+ /trunk/Website/src/main/webapp/images/indusind-icon.png

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 6936 – Fixed alignment issues in cartFlowHeader and PickupStore Tab

anupam.singh — Tue, 05 Mar 2013 11:29:17 +0530

anupam.singh – 2 file(s) modified
Fixed alignment issues in cartFlowHeader and PickupStore Tab

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css

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 6925 – Added one more widget related to award.

kshitij.sood — Mon, 04 Mar 2013 14:21:17 +0530

kshitij.sood – 2 file(s) modified
Added one more widget related to award.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
+ /trunk/Website/src/main/webapp/images/saholic-award.jpg

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 6923 – used query instead of uri.

amit.gupta — Sat, 02 Mar 2013 08:04:21 +0530

amit.gupta – 1 file(s) modified
used query instead of uri.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java

Rev 6921 – Validate cart now applies insurance. Rule for emi coupon updated ...

anupam.singh — Fri, 01 Mar 2013 19:37:33 +0530

anupam.singh – 11 file(s) modified
Validate cart now applies insurance.
Rule for emi coupon updated to handle insurance amount
Signature for get insuranceAmount changed
JS validation for insuranceDetails updated
In case of discounts (not GV's) we reduce the price of insurance also
Added new Terms & conditions to policy doc

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/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/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6917 – Removed #

amit.gupta — Fri, 01 Mar 2013 11:18:46 +0530

amit.gupta – 1 file(s) modified
Removed #

~ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js

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 6912 – Added insurance to invoice Handling recieve return and clone order ...

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

anupam.singh – 7 file(s) modified
Added insurance to invoice
Handling recieve return and clone order for insurance
Added theft insurance to header
validations for dob and guardianName fields
Added insurance expiry date on CRM

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6910 – Changes in header suggested by Vrinda/Rajveer/Khushal

amit.gupta — Thu, 28 Feb 2013 14:42:19 +0530

amit.gupta – 1 file(s) modified
Changes in header suggested by Vrinda/Rajveer/Khushal

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 6907 – removed qoute

amit.gupta — Thu, 28 Feb 2013 13:55:07 +0530

amit.gupta – 1 file(s) modified
removed qoute

~ /trunk/Website/src/main/webapp/css/shipping.css

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 6902 – Cache the banners in the home page and clear cache ...

rajveer — Wed, 27 Feb 2013 19:07:24 +0530

rajveer – 1 file(s) modified
Cache the banners in the home page and clear cache when required.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java

Rev 6898 – Reduced tab css by 1px.

kshitij.sood — Wed, 27 Feb 2013 16:40:10 +0530

kshitij.sood – 1 file(s) modified
Reduced tab css by 1px.

~ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js

Rev 6896 – Added screen size for mobiles.

amit.gupta — Wed, 27 Feb 2013 14:54:51 +0530

amit.gupta – 8 file(s) modified
Added screen size for mobiles.

~ /trunk/ContentStore/src/jython/irdatarules/os.py
+ /trunk/ContentStore/src/jython/irdatarules/screensize.py
~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.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