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

Rev 6648 – otg related enhancements.

amit.gupta — Fri, 11 Jan 2013 13:52:54 +0530

amit.gupta – 2 file(s) modified
otg related enhancements.

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

Rev 6639 – costemtic changes related to otg.

amit.gupta — Thu, 10 Jan 2013 15:10:27 +0530

amit.gupta – 3 file(s) modified
costemtic changes related to otg.

~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6635 – Multiple refund buttons on recharge page now work fine.

anupam.singh — Wed, 09 Jan 2013 20:05:38 +0530

anupam.singh – 2 file(s) modified
Multiple refund buttons on recharge page now work fine.

~ /trunk/Website/src/main/webapp/js/myaccount.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm

Rev 6627 – FirstFlight Tracking service.

kshitij.sood — Wed, 09 Jan 2013 13:15:40 +0530

kshitij.sood – 4 file(s) modified
FirstFlight Tracking service.

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FirstFlightTrackingService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FirstflightUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/firstflight-updates-show.vm

Rev 6603 – Refund option now available on website for recharge order.

anupam.singh — Fri, 04 Jan 2013 17:42:57 +0530

anupam.singh – 4 file(s) modified
Refund option now available on website for recharge order.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/js/myaccount.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm

Rev 6589 – set zone id to 29

amit.gupta — Wed, 02 Jan 2013 16:46:08 +0530

amit.gupta – 1 file(s) modified
set zone id to 29

~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

Rev 6585 – made minor changes related to otg

amit.gupta — Wed, 02 Jan 2013 14:52:28 +0530

amit.gupta – 2 file(s) modified
made minor changes related to otg

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6561 – otg front-end and mail logic implementation.

amit.gupta — Mon, 31 Dec 2012 16:40:20 +0530

amit.gupta – 20 file(s) modified
otg front-end and mail logic implementation.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.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/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/images/quesmark.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6552 – OTG T&C page and pop up

kshitij.sood — Fri, 28 Dec 2012 18:39:13 +0530

kshitij.sood – 2 file(s) modified
OTG T&C page and pop up

~ /trunk/Website/src/main/webapp/js/widgets.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

Rev 6546 – Shoogloo affiliate should pass txn id instead of payment id.

rajveer — Thu, 27 Dec 2012 17:50:32 +0530

rajveer – 2 file(s) modified
Shoogloo affiliate should pass txn id instead of payment id.

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

Rev 6533 – Fog note on the pay success page.

rajveer — Mon, 24 Dec 2012 11:56:21 +0530

rajveer – 1 file(s) modified
Fog note on the pay success page.

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

Rev 6526 – Added banner id 27

amit.gupta — Fri, 21 Dec 2012 12:47:28 +0530

amit.gupta – 1 file(s) modified
Added banner id 27

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

Rev 6520 – Tag functionality implemented.

amit.gupta — Thu, 20 Dec 2012 16:58:51 +0530

amit.gupta – 8 file(s) modified
Tag functionality implemented.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/tag-page-index.vm

Rev 6496 – Added id attribute for discount coupon field

anupam.singh — Thu, 13 Dec 2012 17:47:54 +0530

anupam.singh – 1 file(s) modified
Added id attribute for discount coupon field

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

Rev 6495 – Added backend validations on all fields. Added a hash of ...

anupam.singh — Thu, 13 Dec 2012 15:24:41 +0530

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

Rev 6478 – Post to GA if we have received orders in last ...

rajveer — Tue, 11 Dec 2012 10:32:07 +0530

rajveer – 1 file(s) modified
Post to GA if we have received orders in last 10 minutes.

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

Rev 6475 – Google analytics enable only if order received in last 10 ...

rajveer — Mon, 10 Dec 2012 19:38:55 +0530

rajveer – 2 file(s) modified
Google analytics enable only if order received in last 10 minutes and order status is successful.

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

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