SmartDukaan – /

Rev 6153 – Cosmetic fixes for CRM

anupam.singh — Wed, 10 Oct 2012 18:19:43 +0530

anupam.singh – 6 file(s) modified
Cosmetic fixes for CRM

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm

Rev 6152 – improved cart related changes.

amit.gupta — Wed, 10 Oct 2012 18:02:10 +0530

amit.gupta – 15 file(s) modified
improved cart related changes.

~ /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/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.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/RechargeResultController.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/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/widgets.css
+ /trunk/Website/src/main/webapp/images/Cart-Button.png

Rev 6151 – Changed method to return exact balance.

rajveer — Wed, 10 Oct 2012 17:34:16 +0530

rajveer – 1 file(s) modified
Changed method to return exact balance.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

Rev 6150 – Add to ecommerce if recharge is successful.

rajveer — Wed, 10 Oct 2012 17:14:22 +0530

rajveer – 1 file(s) modified
Add to ecommerce if recharge is successful.

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

Rev 6149 – Added link to recharge on my-wallet page

anupam.singh — Wed, 10 Oct 2012 17:06:33 +0530

anupam.singh – 1 file(s) modified
Added link to recharge on my-wallet page

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

Rev 6148 – Showing recharge id on my-recharges page

anupam.singh — Wed, 10 Oct 2012 16:57:47 +0530

anupam.singh – 1 file(s) modified
Showing recharge id on my-recharges page

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

Rev 6147 – Fixed small bugs.

rajveer — Wed, 10 Oct 2012 16:53:05 +0530

rajveer – 4 file(s) modified
Fixed small bugs.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalTransaction.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 6146 – Cosmetic fixes

anupam.singh — Wed, 10 Oct 2012 16:34:48 +0530

anupam.singh – 2 file(s) modified
Cosmetic fixes

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

Rev 6145 – Changed messages on the recharge result page

anupam.singh — Wed, 10 Oct 2012 16:30:12 +0530

anupam.singh – 1 file(s) modified
Changed messages on the recharge result page

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

Rev 6144 – Made all the clients as singleton.

rajveer — Wed, 10 Oct 2012 16:28:29 +0530

rajveer – 1 file(s) modified
Made all the clients as singleton.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

Rev 6143 – Removed Test gateway. Decreased font size in some places.

anupam.singh — Wed, 10 Oct 2012 15:10:01 +0530

anupam.singh – 3 file(s) modified
Removed Test gateway. Decreased font size in some places.

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

Rev 6142 – Displaying rechargeOrder Id on recharge result page

anupam.singh — Wed, 10 Oct 2012 14:51:25 +0530

anupam.singh – 1 file(s) modified
Displaying rechargeOrder Id on recharge result page

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

Rev 6141 – Displaying MNP message in case of Mobile phones only

anupam.singh — Wed, 10 Oct 2012 14:35:58 +0530

anupam.singh – 1 file(s) modified
Displaying MNP message in case of Mobile phones only

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

Rev 6140 – Recharge amount changed to 200-10000 for DTH

amit.gupta — Wed, 10 Oct 2012 14:26:05 +0530

amit.gupta – 1 file(s) modified
Recharge amount changed to 200-10000 for DTH

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

Rev 6139 – Removing recharge.js from footer

anupam.singh — Wed, 10 Oct 2012 14:00:07 +0530

anupam.singh – 1 file(s) modified
Removing recharge.js from footer

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

Rev 6138 – Mark payment as captured once success is received.

rajveer — Wed, 10 Oct 2012 12:48:59 +0530

rajveer – 1 file(s) modified
Mark payment as captured once success is received.

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

Rev 6137 – In case of wallet payment, the payment was being marked ...

anupam.singh — Wed, 10 Oct 2012 12:29:17 +0530

anupam.singh – 1 file(s) modified
In case of wallet payment, the payment was being marked authorized, changed it to success

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

Rev 6136 – Corrected the email while recharging.

rajveer — Wed, 10 Oct 2012 12:00:21 +0530

rajveer – 1 file(s) modified
Corrected the email while recharging.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 6135 – Put recharge client initialization in try-catch block. Added validations for ...

anupam.singh — Tue, 09 Oct 2012 23:44:13 +0530

anupam.singh – 5 file(s) modified
Put recharge client initialization in try-catch block. Added validations for billing address. Wrote a static map of operator Id to operator Name.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /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/WEB-INF/content/my-recharges.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6134 – Adding validations for address form in recharge-pay-options page Reviewed by: ...

amar.kumar — Tue, 09 Oct 2012 23:01:26 +0530

amar.kumar – 1 file(s) modified
Adding validations for address form in recharge-pay-options page
Reviewed by: Anupam

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

Rev 6133 – Link to forgot password page on faq

anupam.singh — Tue, 09 Oct 2012 22:13:32 +0530

anupam.singh – 1 file(s) modified
Link to forgot password page on faq

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

Rev 6132 – Hiding recharge option for now

anupam.singh — Tue, 09 Oct 2012 21:45:37 +0530

anupam.singh – 2 file(s) modified
Hiding recharge option for now

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 6131 – Changed subject of mail

anupam.singh — Tue, 09 Oct 2012 20:54:36 +0530

anupam.singh – 1 file(s) modified
Changed subject of mail

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

Rev 6130 – Adding images for FAQ page. Updating FAQs

anupam.singh — Tue, 09 Oct 2012 20:52:59 +0530

anupam.singh – 3 file(s) modified
Adding images for FAQ page. Updating FAQs

+ /trunk/Website/src/main/webapp/images/rechargeFaq1.jpeg
+ /trunk/Website/src/main/webapp/images/rechargeFaq2.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm

Rev 6129 – Fixed a bug where correct tab was not being highlighted ...

anupam.singh — Tue, 09 Oct 2012 20:43:29 +0530

anupam.singh – 6 file(s) modified
Fixed a bug where correct tab was not being highlighted on myAccount pages

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm

Rev 6128 – Changed category of the physical and digital orders.

rajveer — Tue, 09 Oct 2012 19:24:00 +0530

rajveer – 2 file(s) modified
Changed category of the physical and digital orders.

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

Rev 6127 – Corrected email formats.

rajveer — Tue, 09 Oct 2012 19:19:32 +0530

rajveer – 1 file(s) modified
Corrected email formats.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 6126 – Corrected GAE code.

rajveer — Tue, 09 Oct 2012 17:52:55 +0530

rajveer – 1 file(s) modified
Corrected GAE code.

~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 6125 – Added some more fields to email.

rajveer — Tue, 09 Oct 2012 17:47:13 +0530

rajveer – 1 file(s) modified
Added some more fields to email.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 6124 – Creating user and mailing passwords.

anupam.singh — Tue, 09 Oct 2012 17:45:08 +0530

anupam.singh – 2 file(s) modified
Creating user and mailing passwords.

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

Rev 6123 – Handled empty paymentId on result page

anupam.singh — Tue, 09 Oct 2012 17:19:59 +0530

anupam.singh – 2 file(s) modified
Handled empty paymentId on 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 6122 – Added responceurl for hdfc in test.

rajveer — Tue, 09 Oct 2012 16:40:26 +0530

rajveer – 1 file(s) modified
Added responceurl for hdfc in test.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6121 – reverted

amit.gupta — Tue, 09 Oct 2012 16:19:17 +0530

amit.gupta – 1 file(s) modified
reverted

~ /trunk/ContentStore/src/xml/model/irdatarules.xml

Rev 6120 – Corrected Google Ecommerce code.

rajveer — Tue, 09 Oct 2012 16:16:52 +0530

rajveer – 1 file(s) modified
Corrected Google Ecommerce code.

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

Rev 6119 – reverted

amit.gupta — Tue, 09 Oct 2012 16:15:07 +0530

amit.gupta – 1 file(s) modified
reverted

~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml

Rev 6118 – cms related changes

amit.gupta — Tue, 09 Oct 2012 16:08:33 +0530

amit.gupta – 4 file(s) modified
cms related changes

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml

Rev 6117 – Minor bug fixes for recharge

anupam.singh — Tue, 09 Oct 2012 15:34:46 +0530

anupam.singh – 3 file(s) modified
Minor bug fixes for recharge

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

Rev 6116 – Adding recharge FAQ page

anupam.singh — Tue, 09 Oct 2012 15:31:19 +0530

anupam.singh – 1 file(s) modified
Adding recharge FAQ page

+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm

Rev 6115 – Changed event id for confirm page submit button

anupam.singh — Tue, 09 Oct 2012 15:12:26 +0530

anupam.singh – 1 file(s) modified
Changed event id for confirm page submit button

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

Rev 6114 – Corrected some of the informations.

rajveer — Tue, 09 Oct 2012 14:43:51 +0530

rajveer – 1 file(s) modified
Corrected some of the informations.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py