SmartDukaan – /

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

Rev 6081 – Added new rule for Note2. 2K discount

amit.gupta — Thu, 04 Oct 2012 14:28:05 +0530

amit.gupta – 1 file(s) modified
Added new rule for Note2.
2K discount

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

Rev 6080 – Removing Pankaj Jain, Pankaj Kankar and Ashutosh from report mails.

anupam.singh — Thu, 04 Oct 2012 12:56:16 +0530

anupam.singh – 2 file(s) modified
Removing Pankaj Jain, Pankaj Kankar and Ashutosh from report mails.

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties
~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 6079 – Reverted the order status.

rajveer — Wed, 03 Oct 2012 19:42:55 +0530

rajveer – 1 file(s) modified
Reverted the order status.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 6078 – Adding try catch block

amar.kumar — Wed, 03 Oct 2012 19:20:09 +0530

amar.kumar – 1 file(s) modified
Adding try catch block

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6077 – Changes related to recharge

anupam.singh — Wed, 03 Oct 2012 17:47:45 +0530

anupam.singh – 10 file(s) modified
Changes related to recharge

~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm

Rev 6076 – Initialize previous Files Map for warehouses

amar.kumar — Wed, 03 Oct 2012 16:40:28 +0530

amar.kumar – 1 file(s) modified
Initialize previous Files Map for warehouses

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6075 – Added vat rate bug fix.

amit.gupta — Mon, 01 Oct 2012 11:35:56 +0530

amit.gupta – 1 file(s) modified
Added vat rate bug fix.

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

Rev 6074 – added Coming soon status as valid estimation.

amit.gupta — Fri, 28 Sep 2012 18:16:11 +0530

amit.gupta – 1 file(s) modified
added Coming soon status as valid estimation.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 6073 – bug fixes in recharge.

amit.gupta — Fri, 28 Sep 2012 16:35:09 +0530

amit.gupta – 3 file(s) modified
bug fixes in recharge.

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

Rev 6072 – added-recharge.css to saholic min css

amit.gupta — Fri, 28 Sep 2012 15:44:03 +0530

amit.gupta – 1 file(s) modified
added-recharge.css to saholic min css

~ /trunk/Website/pom.xml

Rev 6071 – Changed back the prices for coming soon.

amit.gupta — Fri, 28 Sep 2012 15:04:22 +0530

amit.gupta – 7 file(s) modified
Changed back the prices for coming soon.

~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm

Rev 6070 – Recharge related changes

anupam.singh — Fri, 28 Sep 2012 14:58:36 +0530

anupam.singh – 5 file(s) modified
Recharge related changes

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/WalletOnlyPaymentController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/wallet-only-payment-index.vm

Rev 6069 – Camera feed for junglee generation.

amit.gupta — Fri, 28 Sep 2012 14:52:28 +0530

amit.gupta – 1 file(s) modified
Camera feed for junglee generation.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 6068 – changed windows 8 to windows phone 8.

amit.gupta — Fri, 28 Sep 2012 14:42:03 +0530

amit.gupta – 2 file(s) modified
changed windows 8 to windows phone 8.

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6067 – added windows 8

amit.gupta — Fri, 28 Sep 2012 14:36:44 +0530

amit.gupta – 1 file(s) modified
added windows 8

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

Rev 6066 – recharge validations and ui related changes

amit.gupta — Fri, 28 Sep 2012 14:26:45 +0530

amit.gupta – 5 file(s) modified
recharge validations and ui related changes

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6065 – Added status in the return hash.

rajveer — Fri, 28 Sep 2012 14:02:46 +0530

rajveer – 1 file(s) modified
Added status in the return hash.

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

Rev 6064 – Removed unused package.

rajveer — Fri, 28 Sep 2012 12:34:51 +0530

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

x /trunk/Website/src/main/java/in/shop2020/serving/pages

Rev 6063 – Added configuration for payu PG.

rajveer — Fri, 28 Sep 2012 12:33:51 +0530

rajveer – 1 file(s) modified
Added configuration for payu PG.

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

Rev 6062 – Moved required parameters in config file.

rajveer — Fri, 28 Sep 2012 12:30:08 +0530

rajveer – 3 file(s) modified
Moved required parameters in config file.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 6061 – Change for Alerts for Vendor inventory integration and removal of ...

amar.kumar — Fri, 28 Sep 2012 12:18:45 +0530

amar.kumar – 1 file(s) modified
Change for Alerts for Vendor inventory integration and removal of resetting of currentInventory before updating of data
Reviewed by Amit Gupta

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6060 – Added code for new payment gateway Payu.

rajveer — Fri, 28 Sep 2012 12:14:11 +0530

rajveer – 15 file(s) modified
Added code for new payment gateway Payu.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/DummyPageFetcher.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/IPageFetcher.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/PageContentKeys.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/PageEnum.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/PageFetcherFactory.java
x /trunk/Website/src/main/java/in/shop2020/serving/pages/PageManager.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/PayuPaymentService.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/payu-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/payu-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6059 – layout related fixes

amit.gupta — Thu, 27 Sep 2012 22:12:51 +0530

amit.gupta – 1 file(s) modified
layout related fixes

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