SmartDukaan – /

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

Rev 6058 – Recharge related fixes

anupam.singh — Thu, 27 Sep 2012 19:17:40 +0530

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

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcRechargeResponseController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/WalletOnlyPaymentController.java
+ /trunk/Website/src/main/webapp/images/back1.jpg
~ /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
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6057 – Fixes in recharge flow

anupam.singh — Thu, 27 Sep 2012 14:07:58 +0530

anupam.singh – 6 file(s) modified
Fixes in recharge flow

~ /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/RechargePayOptionsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6056 – added recharge related changes. Integrated recharge with backend.

amit.gupta — Thu, 27 Sep 2012 10:56:10 +0530

amit.gupta – 4 file(s) modified
added recharge related changes. Integrated recharge with backend.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6055 – Generate invoice and store it once recharge has been successful.

rajveer — Wed, 26 Sep 2012 21:44:16 +0530

rajveer – 5 file(s) modified
Generate invoice and store it once recharge has been successful.

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

Rev 6054 – Update service for check service provider api.

rajveer — Wed, 26 Sep 2012 21:34:29 +0530

rajveer – 1 file(s) modified
Update service for check service provider api.

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

Rev 6053 – Changed type of operator from String to int

amit.gupta — Wed, 26 Sep 2012 20:58:41 +0530

amit.gupta – 1 file(s) modified
Changed type of operator from String to int

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

Rev 6052 – change in parameters.

amit.gupta — Wed, 26 Sep 2012 19:47:47 +0530

amit.gupta – 1 file(s) modified
change in parameters.

~ /trunk/PaymentService/src/test/java/in/shop2020/payment/service/TestPaymentServer.java

Rev 6051 – isdigital false for bulk orders.

amit.gupta — Wed, 26 Sep 2012 15:58:46 +0530

amit.gupta – 1 file(s) modified
isdigital false for bulk orders.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 6050 – Create Recharge.

anupam.singh — Wed, 26 Sep 2012 15:33:51 +0530

anupam.singh – 53 file(s) modified
Create Recharge.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
+ /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/HdfcRechargeResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.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/java/in/shop2020/serving/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/css/recharge.css
+ /trunk/Website/src/main/webapp/images/+91.png
+ /trunk/Website/src/main/webapp/images/91.jpg
+ /trunk/Website/src/main/webapp/images/back1.png
+ /trunk/Website/src/main/webapp/images/back2.jpg
+ /trunk/Website/src/main/webapp/images/blue.png
+ /trunk/Website/src/main/webapp/images/confirm.png
+ /trunk/Website/src/main/webapp/images/confirm_pressed.png
+ /trunk/Website/src/main/webapp/images/dth.png
+ /trunk/Website/src/main/webapp/images/dth_pressed.png
+ /trunk/Website/src/main/webapp/images/grey.jpg
+ /trunk/Website/src/main/webapp/images/input_back.jpg
+ /trunk/Website/src/main/webapp/images/phone.png
+ /trunk/Website/src/main/webapp/images/phone_pressed.png
+ /trunk/Website/src/main/webapp/images/Rupee.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/hdfc-recharge-response-index.vm
+ /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-payment-success.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6049 – Added rechargeType argument.

rajveer — Wed, 26 Sep 2012 13:03:55 +0530

rajveer – 6 file(s) modified
Added rechargeType argument.

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

Rev 6048 – Committing the code after integrating with spicedeck services.

rajveer — Wed, 26 Sep 2012 12:43:33 +0530

rajveer – 11 file(s) modified
Committing the code after integrating with spicedeck services.

~ /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/model/ServiceProvider.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.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 6047 – Commit on change jacket number.

rajveer — Tue, 25 Sep 2012 16:02:47 +0530

rajveer – 1 file(s) modified
Commit on change jacket number.

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

Rev 6046 – Changed the name and pincode of saholic

rajveer — Tue, 25 Sep 2012 10:26:57 +0530

rajveer – 1 file(s) modified
Changed the name and pincode of saholic

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InvoiceGenerationService.properties

Rev 6045 – Added width of 710 and height 1600

amit.gupta — Mon, 24 Sep 2012 20:14:44 +0530

amit.gupta – 1 file(s) modified
Added width of 710 and height 1600

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6044 – adjusted height 1450

amit.gupta — Mon, 24 Sep 2012 20:06:31 +0530

amit.gupta – 1 file(s) modified
adjusted height 1450

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6043 – adjusted height 1550

amit.gupta — Mon, 24 Sep 2012 20:04:56 +0530

amit.gupta – 1 file(s) modified
adjusted height 1550

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6042 – New omg contest launch.

amit.gupta — Mon, 24 Sep 2012 18:54:34 +0530

amit.gupta – 2 file(s) modified
New omg contest launch.

+ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/thankyou.vm

Rev 6041 – Fixed NPE in case of accessories.

amit.gupta — Mon, 24 Sep 2012 17:27:04 +0530

amit.gupta – 1 file(s) modified
Fixed NPE in case of accessories.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6040 – Affiliate id added for thinkdigit.

amit.gupta — Mon, 24 Sep 2012 14:53:42 +0530

amit.gupta – 1 file(s) modified
Affiliate id added for thinkdigit.

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

Rev 6039 – New Vat rate implementation.

amit.gupta — Mon, 24 Sep 2012 12:43:12 +0530

amit.gupta – 15 file(s) modified
New Vat rate implementation.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6038 – getting numeric value from numeric value instead of text value ...

amar.kumar — Sun, 23 Sep 2012 03:03:05 +0530

amar.kumar – 1 file(s) modified
getting numeric value from numeric value instead of text value from Sarvottam sheet

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