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

Rev 6464 – Google Shopping T&C page.

kshitij.sood — Fri, 07 Dec 2012 12:36:36 +0530

kshitij.sood – 1 file(s) modified
Google Shopping T&C page.

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

Rev 6445 – Changed color from red to blue for successful coupon application

anupam.singh — Wed, 05 Dec 2012 13:57:28 +0530

anupam.singh – 1 file(s) modified
Changed color from red to blue for successful coupon application

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

Rev 6443 – Bug Fixes. 1) Even After applying Coupon full amount is ...

anupam.singh — Wed, 05 Dec 2012 12:52:24 +0530

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

Rev 6442 – Integration of EMI scheme for the innoviti payment gateway.

rajveer — Wed, 05 Dec 2012 12:44:04 +0530

rajveer – 3 file(s) modified
Integration of EMI scheme for the innoviti payment gateway.

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

Rev 6440 – Added fixes related to trackevents and coming soon icon on ...

amit.gupta — Wed, 05 Dec 2012 12:22:05 +0530

amit.gupta – 2 file(s) modified
Added fixes related to trackevents and coming soon icon on EMI mode.

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

Rev 6437 – made images of bank icons versionable.

amit.gupta — Wed, 05 Dec 2012 11:16:26 +0530

amit.gupta – 2 file(s) modified
made images of bank icons versionable.

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

Rev 6436 – Changed informative markup.

amit.gupta — Wed, 05 Dec 2012 08:53:13 +0530

amit.gupta – 1 file(s) modified
Changed informative markup.

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

Rev 6435 – Added coming soon section for emis

amit.gupta — Tue, 04 Dec 2012 23:01:21 +0530

amit.gupta – 11 file(s) modified
Added coming soon section for emis

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/axis-icon.png
+ /trunk/Website/src/main/webapp/images/citi-icon.png
+ /trunk/Website/src/main/webapp/images/hdfc-icon.png
+ /trunk/Website/src/main/webapp/images/hsbc-icon.png
+ /trunk/Website/src/main/webapp/images/icici-icon.png
+ /trunk/Website/src/main/webapp/images/kotak-icon.png
+ /trunk/Website/src/main/webapp/images/sbi-icon.png
+ /trunk/Website/src/main/webapp/images/std-chartered-icon.png
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6433 – Added support for recharge coupons

anupam.singh — Tue, 04 Dec 2012 22:41:24 +0530

anupam.singh – 18 file(s) modified
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/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm

Rev 6432 – Basic integration of the innoviti PG.

rajveer — Tue, 04 Dec 2012 19:09:06 +0530

rajveer – 5 file(s) modified
Basic integration of the innoviti PG.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6427 – Changed rupee icon to black. Added roundoff to 2 digits ...

amit.gupta — Tue, 04 Dec 2012 11:07:32 +0530

amit.gupta – 2 file(s) modified
Changed rupee icon to black.
Added roundoff to 2 digits after decimal point.

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

Rev 6425 – Changed monthly installment rounded off to two decimal.

amit.gupta — Tue, 04 Dec 2012 10:38:03 +0530

amit.gupta – 1 file(s) modified
Changed monthly installment rounded off to two decimal.

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

Rev 6421 – minor changes related to look n feel

amit.gupta — Mon, 03 Dec 2012 23:36:53 +0530

amit.gupta – 2 file(s) modified
minor changes related to look n feel

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

Rev 6413 – minor changes

amit.gupta — Mon, 03 Dec 2012 18:01:03 +0530

amit.gupta – 2 file(s) modified
minor changes

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

Rev 6407 – Added emi options in proceed to pay.

amit.gupta — Mon, 03 Dec 2012 16:53:23 +0530

amit.gupta – 5 file(s) modified
Added emi options in proceed to pay.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/rupee-icon.png
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6400 – Clicking the "recharge now" button, hides it to avoid double ...

anupam.singh — Mon, 03 Dec 2012 14:54:18 +0530

anupam.singh – 2 file(s) modified
Clicking the "recharge now" button, hides it to avoid double clicks

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

Rev 6397 – When changing operators plan dropdown was not getting removed. Also ...

anupam.singh — Sun, 02 Dec 2012 20:07:03 +0530

anupam.singh – 2 file(s) modified
When changing operators plan dropdown was not getting removed. Also handled the operator plan mismatch in backend

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

Rev 6384 – make the title dynamic.

rajveer — Wed, 28 Nov 2012 08:57:42 +0530

rajveer – 1 file(s) modified
make the title dynamic.

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

Rev 6379 – Removed Nokia models from recharge offer page.

rajveer — Tue, 27 Nov 2012 12:22:31 +0530

rajveer – 1 file(s) modified
Removed Nokia models from recharge offer page.

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

Rev 6369 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 16:03:15 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

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

Rev 6368 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 11:48:38 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

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

Rev 6354 – Ammended careers page.

rajveer — Thu, 15 Nov 2012 11:46:23 +0530

rajveer – 1 file(s) modified
Ammended careers page.

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

Rev 6352 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:03:54 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6351 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:00:28 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6350 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 19:23:47 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6347 – Added another openx zone on recharge home page.

anupam.singh — Wed, 14 Nov 2012 19:09:27 +0530

anupam.singh – 2 file(s) modified
Added another openx zone on recharge home page.

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

Rev 6343 – Corrected allignment of the banner.

rajveer — Wed, 14 Nov 2012 17:33:30 +0530

rajveer – 1 file(s) modified
Corrected allignment of the banner.

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

Rev 6339 – Added events on tweet and share buttons on recharge-result page.

anupam.singh — Wed, 14 Nov 2012 16:50:44 +0530

anupam.singh – 2 file(s) modified
Added events on tweet and share buttons on recharge-result page.

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

Rev 6336 – Added tweet and post on facebook button on success page. ...

anupam.singh — Wed, 14 Nov 2012 15:49:52 +0530

anupam.singh – 16 file(s) modified
Added tweet and post on facebook button on success page. Changed text depending upon denomination Type.

~ /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/images/tweet-about-us.png
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /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

Rev 6334 – Added link to recharge page on T&C page

rajveer — Wed, 14 Nov 2012 14:11:41 +0530

rajveer – 1 file(s) modified
Added link to recharge page on T&C page

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

Rev 6333 – Added tnc Maximum 2 Coupon Codes will be issued per ...

amit.gupta — Mon, 12 Nov 2012 17:46:42 +0530

amit.gupta – 1 file(s) modified
Added tnc
Maximum 2 Coupon Codes will be issued per user.

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

Rev 6329 –

amit.gupta — Mon, 12 Nov 2012 15:47:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 6328 – Added gift voucher

amit.gupta — Mon, 12 Nov 2012 15:45:18 +0530

amit.gupta – 2 file(s) modified
Added gift voucher

~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm

Rev 6312 – Added new recharge offers for nokia

amit.gupta — Thu, 08 Nov 2012 00:24:35 +0530

amit.gupta – 1 file(s) modified
Added new recharge offers for nokia

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

Rev 6311 – When user selects operator from recharge submenu we should not ...

anupam.singh — Wed, 07 Nov 2012 18:50:14 +0530

anupam.singh – 1 file(s) modified
When user selects operator from recharge submenu we should not show him option to view plans until we get the circle.

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

Rev 6310 – Improved sub menu for recharge. Added service availability message. Fixed ...

anupam.singh — Wed, 07 Nov 2012 15:21:15 +0530

anupam.singh – 6 file(s) modified
Improved sub menu for recharge. Added service availability message. Fixed bugs related to operator specific recharge pages.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/DeviceNumberInfo.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6307 – Added support for service availability. Login now message is visible ...

anupam.singh — Tue, 06 Nov 2012 21:42:36 +0530

anupam.singh – 12 file(s) modified
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/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ServiceAvailability.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/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6293 – Added validity field in popular recharge div.

anupam.singh — Thu, 01 Nov 2012 15:39:19 +0530

anupam.singh – 1 file(s) modified
Added validity field in popular recharge div.

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

Rev 6292 – Added T&C link on popular plans popup

anupam.singh — Thu, 01 Nov 2012 15:03:33 +0530

anupam.singh – 3 file(s) modified
Added T&C link on popular plans popup

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

Rev 6291 – Corrected Spelling of Refresh

amar.kumar — Thu, 01 Nov 2012 12:19:50 +0530

amar.kumar – 1 file(s) modified
Corrected Spelling of Refresh

~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-processing-index.vm