SmartDukaan – /trunk/Website/

Rev 7502 – Added two more tncs as suggested by Rajneesh.

amit.gupta — Thu, 13 Jun 2013 20:11:30 +0530

amit.gupta – 1 file(s) modified
Added two more tncs as suggested by Rajneesh.

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

Rev 7501 – Added two more tncs as suggested by Rajneesh.

amit.gupta — Thu, 13 Jun 2013 20:10:38 +0530

amit.gupta – 1 file(s) modified
Added two more tncs as suggested by Rajneesh.

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

Rev 7500 – removed openx zone.

amit.gupta — Thu, 13 Jun 2013 18:56:20 +0530

amit.gupta – 1 file(s) modified
removed openx zone.

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

Rev 7498 – Added offer page for note 2.

amit.gupta — Thu, 13 Jun 2013 18:28:37 +0530

amit.gupta – 1 file(s) modified
Added offer page for note 2.

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

Rev 7497 – Added offer page for note 2.

amit.gupta — Thu, 13 Jun 2013 18:14:02 +0530

amit.gupta – 1 file(s) modified
Added offer page for note 2.

+ /trunk/Website/src/main/webapp/WEB-INF/content/note2-exchange-offer.vm

Rev 7458 – reverted to anupam's version

amit.gupta — Tue, 11 Jun 2013 15:48:08 +0530

amit.gupta – 1 file(s) modified
reverted to anupam's version

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

Rev 7456 – reverted back.

amit.gupta — Tue, 11 Jun 2013 14:44:01 +0530

amit.gupta – 3 file(s) modified
reverted back.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 7437 – Url change requested by pramit

kshitij.sood — Mon, 10 Jun 2013 14:11:22 +0530

kshitij.sood – 1 file(s) modified
Url change requested by pramit

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

Rev 7418 – Added Power bank in accessory section.

amit.gupta — Fri, 07 Jun 2013 13:51:30 +0530

amit.gupta – 2 file(s) modified
Added Power bank in accessory section.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7377 – marking hotspot bold.

amit.gupta — Mon, 03 Jun 2013 12:36:00 +0530

amit.gupta – 1 file(s) modified
marking hotspot bold.

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

Rev 7376 – Used radio button instead of tags for pickup type

amit.gupta — Fri, 31 May 2013 12:53:09 +0530

amit.gupta – 3 file(s) modified
Used radio button instead of tags for pickup type

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 7361 – Change in Terms and Conditions page regarding Cancellation and Refunds ...

amar.kumar — Mon, 27 May 2013 15:34:53 +0530

amar.kumar – 1 file(s) modified
Change in Terms and Conditions page regarding Cancellation and Refunds as per instructions by Crm Team

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

Rev 7309 – Display cancellation in case of website only.

rajveer — Tue, 21 May 2013 17:36:18 +0530

rajveer – 1 file(s) modified
Display cancellation in case of website only.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 7293 – - Changes related to StoreWebsite - Added source to ...

anupam.singh — Fri, 17 May 2013 13:30:57 +0530

anupam.singh – 23 file(s) modified
- Changes related to StoreWebsite
- Added source to "change_transaction_status" method

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
x /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm@7272)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.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/services/CommonPaymentService.java

Rev 7259 – Added blue color highliting.

amit.gupta — Fri, 10 May 2013 11:55:17 +0530

amit.gupta – 1 file(s) modified
Added blue color highliting.

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

Rev 7258 – Removed clearance sale Controller and template.

amit.gupta — Thu, 09 May 2013 18:46:50 +0530

amit.gupta – 2 file(s) modified
Removed clearance sale Controller and template.

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
x /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 7241 – Added alcatel as brand.

amit.gupta — Wed, 08 May 2013 15:58:54 +0530

amit.gupta – 1 file(s) modified
Added alcatel as brand.

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

Rev 7223 – Added spice as brand for tablet.

amit.gupta — Fri, 03 May 2013 18:40:29 +0530

amit.gupta – 1 file(s) modified
Added spice as brand for tablet.

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

Rev 7184 – Deleted omg contest page and its tnc.

amit.gupta — Mon, 22 Apr 2013 15:19:48 +0530

amit.gupta – 2 file(s) modified
Deleted omg contest page and its tnc.

x /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god.vm

Rev 7173 – Commented to category waiting for full run.

amit.gupta — Wed, 17 Apr 2013 17:11:57 +0530

amit.gupta – 1 file(s) modified
Commented to category waiting for full run.

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

Rev 7168 – Added tabs for tablets.

amit.gupta — Wed, 17 Apr 2013 14:51:31 +0530

amit.gupta – 4 file(s) modified
Added tabs for tablets.

+ /trunk/ContentStore/src/jython/irdatarules/tablets/callingfacility.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7146 – Added sbi card logo (which is used for emi).

amit.gupta — Fri, 12 Apr 2013 15:05:48 +0530

amit.gupta – 1 file(s) modified
Added sbi card logo (which is used for emi).

~ /trunk/Website/src/main/webapp/images/sbi-icon.png

Rev 7132 – updated definitions

amit.gupta — Tue, 09 Apr 2013 16:06:40 +0530

amit.gupta – 7 file(s) modified
updated definitions

+ /trunk/ContentStore/src/jython/irdatarules/tablets/resolution.py
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.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

Rev 7124 –

kshitij.sood — Mon, 08 Apr 2013 14:37:10 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7119 – Changing terms and condition text for refund policy for Prepaid ...

amar.kumar — Fri, 05 Apr 2013 18:31:40 +0530

amar.kumar – 1 file(s) modified
Changing terms and condition text for refund policy for Prepaid orders

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

Rev 7081 – Updated support to handle invoice numbers.

rajveer — Wed, 03 Apr 2013 14:38:06 +0530

rajveer – 2 file(s) modified
Updated support to handle invoice numbers.

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

Rev 7078 – Trim the customer name.

rajveer — Wed, 03 Apr 2013 13:18:26 +0530

rajveer – 1 file(s) modified
Trim the customer name.

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

Rev 7077 – Added user id as part of fetching invoice

rajveer — Tue, 02 Apr 2013 19:05:37 +0530

rajveer – 1 file(s) modified
Added user id as part of fetching invoice

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

Rev 7063 – Typo mistake

kshitij.sood — Fri, 29 Mar 2013 13:48:01 +0530

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

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

Rev 7062 – Adding inline style.

kshitij.sood — Fri, 29 Mar 2013 13:33:01 +0530

kshitij.sood – 1 file(s) modified
Adding inline style.

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

Rev 7061 – Side banner.

kshitij.sood — Fri, 29 Mar 2013 12:52:15 +0530

kshitij.sood – 5 file(s) modified
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

Rev 7051 – Updated

kshitij.sood — Tue, 26 Mar 2013 18:32:12 +0530

kshitij.sood – 1 file(s) modified
Updated

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

Rev 7050 – Reverted changes.

kshitij.sood — Tue, 26 Mar 2013 18:23:27 +0530

kshitij.sood – 1 file(s) modified
Reverted changes.

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

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 7047 –

kshitij.sood — Tue, 26 Mar 2013 15:48:02 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Website/src/main/webapp/images/banner-side.jpg

Rev 7046 –

kshitij.sood — Tue, 26 Mar 2013 14:36:23 +0530

kshitij.sood – 1 file(s) modified

x /trunk/Website/src/main/webapp/images/banner-side.jpg

Rev 7041 – Side banner.

kshitij.sood — Mon, 25 Mar 2013 14:07:59 +0530

kshitij.sood – 2 file(s) modified
Side banner.

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

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 7030 – Seprated service and controller.

rajveer — Fri, 22 Mar 2013 16:37:30 +0530

rajveer – 2 file(s) modified
Seprated service and controller.

+ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RedexpressUpdatesController.java

Rev 7029 – Add some spaces in the red express updates controller

rajveer — Fri, 22 Mar 2013 16:30:00 +0530

rajveer – 1 file(s) modified
Add some spaces in the red express updates controller

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