SmartDukaan – /

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

Rev 6113 – Adding new recharge related events

amar.kumar — Tue, 09 Oct 2012 14:28:06 +0530

amar.kumar – 1 file(s) modified
Adding new recharge related events

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 6112 – Added method to check transaction status.

rajveer — Tue, 09 Oct 2012 13:58:08 +0530

rajveer – 1 file(s) modified
Added method to check transaction status.

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

Rev 6111 – Added CRM support for recharge orders. Also added myWallet and ...

anupam.singh — Tue, 09 Oct 2012 13:55:20 +0530

anupam.singh – 23 file(s) modified
Added CRM support for recharge orders. Also added myWallet and myRecharges page.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /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
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyWalletController.java
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /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
+ /trunk/Website/src/main/webapp/WEB-INF/content/my-wallet.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6110 – Removed unused imports.

rajveer — Tue, 09 Oct 2012 13:39:59 +0530

rajveer – 1 file(s) modified
Removed unused imports.

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

Rev 6109 – Added some more logging.

rajveer — Tue, 09 Oct 2012 12:59:28 +0530

rajveer – 1 file(s) modified
Added some more logging.

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

Rev 6108 – Changes to log events in case of 1) Recharge ...

amar.kumar — Tue, 09 Oct 2012 12:37:16 +0530

amar.kumar – 5 file(s) modified
Changes to log events in case of
1) Recharge Successful
2) Recharge Failed + Payment Successful
3) Payment Failed for Recharge
4) Failure in getting provider for Number

Reviewed by: Amit Gupta

+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProviderFetchFailure.java
+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/RechargeStatusEvent.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java

Rev 6107 – Addded code for ecommerce for recharge confirm.

rajveer — Tue, 09 Oct 2012 12:31:51 +0530

rajveer – 1 file(s) modified
Addded code for ecommerce for recharge confirm.

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

Rev 6106 – Added Google Analytics for recharge.

rajveer — Tue, 09 Oct 2012 12:10:12 +0530

rajveer – 4 file(s) modified
Added Google Analytics for recharge.

~ /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
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6105 – Updating modified item to prod

amit.gupta — Tue, 09 Oct 2012 11:38:53 +0530

amit.gupta – 1 file(s) modified
Updating modified item to prod

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 6104 – Added uncertain recharge processor task with new category.

rajveer — Tue, 09 Oct 2012 11:24:26 +0530

rajveer – 9 file(s) modified
Added uncertain recharge processor task with new category.

+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6103 – Auto provider selector. Selector only works for mobile recharge.

amit.gupta — Tue, 09 Oct 2012 00:55:39 +0530

amit.gupta – 5 file(s) modified
Auto provider selector.
Selector only works for mobile recharge.

~ /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/recharge-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/service-provider.vm

Rev 6102 – Send email once order has been placed.

rajveer — Mon, 08 Oct 2012 17:58:09 +0530

rajveer – 2 file(s) modified
Send email once order has been placed.

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

Rev 6101 – Making min-price site bold and First Letter capital of the ...

amar.kumar — Mon, 08 Oct 2012 11:45:28 +0530

amar.kumar – 1 file(s) modified
Making min-price site bold and First Letter capital of the name of the site

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 6100 – Added getServiceProvider Method

anupam.singh — Mon, 08 Oct 2012 11:37:41 +0530

anupam.singh – 1 file(s) modified
Added getServiceProvider Method

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

Rev 6099 – Asking for confirmation if user want to update expected delay ...

amit.gupta — Sat, 06 Oct 2012 22:03:56 +0530

amit.gupta – 1 file(s) modified
Asking for confirmation if user want to update expected delay on prod.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 6098 – changed logging and Window alerts messages.

amit.gupta — Sat, 06 Oct 2012 19:56:25 +0530

amit.gupta – 1 file(s) modified
changed logging and Window alerts messages.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 6097 – promotion service now pointing to local db.

amit.gupta — Sat, 06 Oct 2012 17:56:02 +0530

amit.gupta – 1 file(s) modified
promotion service now pointing to local db.

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

Rev 6096 – added feature to update expectded delay on production.

amit.gupta — Sat, 06 Oct 2012 13:55:42 +0530

amit.gupta – 9 file(s) modified
added feature to update expectded delay on production.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 6095 – Adding an extra column specifying min-price-site with price

amar.kumar — Fri, 05 Oct 2012 19:56:47 +0530

amar.kumar – 3 file(s) modified
Adding an extra column specifying min-price-site with price

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 6094 – Added methods to get all recharge orders for device. Added ...

rajveer — Fri, 05 Oct 2012 19:26:27 +0530

rajveer – 9 file(s) modified
Added methods to get all recharge orders for device.
Added method to add some amount to wallet.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.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/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6093 – Added more logging.

rajveer — Fri, 05 Oct 2012 19:03:29 +0530

rajveer – 1 file(s) modified
Added more logging.

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

Rev 6092 – Added description column to the recharge api. Also added logging ...

rajveer — Fri, 05 Oct 2012 19:02:51 +0530

rajveer – 3 file(s) modified
Added description column to the recharge api. Also added logging and exception handlingh.

Rev 6091 – Doing capture with auth for recharges.

anupam.singh — Fri, 05 Oct 2012 15:06:07 +0530

anupam.singh – 9 file(s) modified
Doing capture with auth for recharges.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6090 – Corrected the set method.

anupam.singh — Thu, 04 Oct 2012 18:11:11 +0530

anupam.singh – 1 file(s) modified
Corrected the set method.

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

Rev 6089 – Removed hard coding for redirect URL

anupam.singh — Thu, 04 Oct 2012 17:42:51 +0530

anupam.singh – 1 file(s) modified
Removed hard coding for redirect URL

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

Rev 6088 – Adding recharge.js to minification process

anupam.singh — Thu, 04 Oct 2012 17:38:32 +0530

anupam.singh – 1 file(s) modified
Adding recharge.js to minification process

~ /trunk/Website/pom.xml

Rev 6087 – returning none as it is private coupon.

amit.gupta — Thu, 04 Oct 2012 16:49:07 +0530

amit.gupta – 1 file(s) modified
returning none as it is private coupon.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_note2.py

Rev 6086 – Recharge related fixes

anupam.singh — Thu, 04 Oct 2012 16:33:38 +0530

anupam.singh – 3 file(s) modified
Recharge related fixes

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

Rev 6085 – Removed obselete code path.

rajveer — Thu, 04 Oct 2012 16:30:14 +0530

rajveer – 1 file(s) modified
Removed obselete code path.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_note2.py

Rev 6084 – Removed promotion client reference.

rajveer — Thu, 04 Oct 2012 16:22:10 +0530

rajveer – 1 file(s) modified
Removed promotion client reference.

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

Rev 6083 – item id is 7558

amit.gupta — Thu, 04 Oct 2012 14:42:48 +0530

amit.gupta – 1 file(s) modified
item id is 7558

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_note2.py

Rev 6082 – Changed heading from open orders to failed orders.

kshitij.sood — Thu, 04 Oct 2012 14:32:17 +0530

kshitij.sood – 1 file(s) modified
Changed heading from open orders to failed orders.

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