SmartDukaan – /trunk/Website/src/main/java/in/

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 6025 – removed prices from coming soon items.

amit.gupta — Mon, 17 Sep 2012 19:17:34 +0530

amit.gupta – 9 file(s) modified
removed prices from coming soon items.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /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/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5943 – Changed the range for display size for Cameras.

amit.gupta — Fri, 07 Sep 2012 15:34:53 +0530

amit.gupta – 1 file(s) modified
Changed the range for display size for Cameras.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java

Rev 5941 – Adding enhancements for auto height adjustments for compare category. + ...

amit.gupta — Fri, 07 Sep 2012 15:29:31 +0530

amit.gupta – 8 file(s) modified
Adding enhancements for auto height adjustments for compare category.
+ DSLR rollout changes

~ /trunk/Website
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/js/comparison.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 5930 – All entities are comparable irrespective of their scores.

amit.gupta — Tue, 04 Sep 2012 17:04:08 +0530

amit.gupta – 15 file(s) modified
All entities are comparable irrespective of their scores.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/MostComparedSnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5880 – Added Expected Delivery Date in pay success controller.

rajveer — Thu, 23 Aug 2012 20:01:08 +0530

rajveer – 2 file(s) modified
Added Expected Delivery Date in pay success controller.

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

Rev 5873 – Added filters for cameras. related changes and website header ...

amit.gupta — Thu, 23 Aug 2012 16:49:53 +0530

amit.gupta – 13 file(s) modified
Added filters for cameras. related changes and
website header changes + filter related changes in website.

+ /trunk/ContentStore/src/jython/irdatarules/cameras
+ /trunk/ContentStore/src/jython/irdatarules/cameras/display.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/optical-zoom.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/resolution.py
~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5838 – Overwriting customer address with store address

mandeep.dhir — Sun, 19 Aug 2012 09:36:16 +0530

mandeep.dhir – 1 file(s) modified
Overwriting customer address with store address

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 5760 – #1537 Page title and meta description has to be automatically ...

amit.gupta — Thu, 09 Aug 2012 19:44:36 +0530

amit.gupta – 7 file(s) modified
#1537
Page title and meta description has to be automatically created and updated
Reviewer: amar

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm