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

Rev 11686 –

amit.gupta — Tue, 17 Jun 2014 16:26:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 11682 – Improved redirect logic

amit.gupta — Tue, 17 Jun 2014 14:16:37 +0530

amit.gupta – 1 file(s) modified
Improved redirect logic

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

Rev 11680 – Added authentication for Private Deal User

vikram.raghav — Tue, 17 Jun 2014 12:55:09 +0530

vikram.raghav – 1 file(s) modified
Added authentication for Private Deal User

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

Rev 11676 – changed get to set

amit.gupta — Mon, 16 Jun 2014 16:08:23 +0530

amit.gupta – 1 file(s) modified
changed get to set

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

Rev 11672 – generating the delivery estimate on controller itself to reduce the ...

anikendra — Fri, 13 Jun 2014 18:26:53 +0530

anikendra – 4 file(s) modified
generating the delivery estimate on controller itself to reduce the time of display of the same

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 11653 – Added private deals coupon application logic

amit.gupta — Thu, 12 Jun 2014 18:13:53 +0530

amit.gupta – 14 file(s) modified
Added private deals coupon application logic

~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.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/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CouponCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 11645 – private Deals count added.

amit.gupta — Wed, 11 Jun 2014 18:34:54 +0530

amit.gupta – 7 file(s) modified
private Deals count added.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PrivateDealsController.java

Rev 11644 –

vikram.raghav — Wed, 11 Jun 2014 18:00:02 +0530

vikram.raghav – 1 file(s) modified

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

Rev 11636 – Private Deals Page controller and vm changes

vikram.raghav — Wed, 11 Jun 2014 11:48:55 +0530

vikram.raghav – 5 file(s) modified
Private Deals Page controller and vm changes

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PrivateDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
+ /trunk/Website/src/main/resources/templates/privatedeals.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/private-deals-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/private-deals-show.vm

Rev 11526 – Added mobile as source while creating orders. Logging related changes.

amit.gupta — Mon, 02 Jun 2014 12:53:42 +0530

amit.gupta – 20 file(s) modified
Added mobile as source while creating orders. Logging related changes.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EbsPayController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/interceptors/UserInterceptor.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ContentServingService.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 11435 – Removed logs.

amit.gupta — Wed, 28 May 2014 16:14:59 +0530

amit.gupta – 1 file(s) modified
Removed logs.

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

Rev 11416 – Added ind

amit.gupta — Tue, 27 May 2014 23:32:03 +0530

amit.gupta – 1 file(s) modified
Added ind

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

Rev 11238 –

kshitij.sood — Tue, 20 May 2014 01:44:49 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/map-image.vm

Rev 11114 –

amit.gupta — Tue, 13 May 2014 22:04:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 11084 – Added cookied log

amit.gupta — Tue, 13 May 2014 12:05:01 +0530

amit.gupta – 1 file(s) modified
Added cookied log

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 10968 – Added logging to figure out bug related to hdfc payment ...

amit.gupta — Wed, 07 May 2014 16:48:10 +0530

amit.gupta – 5 file(s) modified
Added logging to figure out bug related to hdfc payment failures.

~ /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/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 10493 –

amit.gupta — Sat, 05 Apr 2014 18:52:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 10477 – Minor clean up.

amit.gupta — Fri, 04 Apr 2014 16:59:50 +0530

amit.gupta – 2 file(s) modified
Minor clean up.

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

Rev 10269 – Adding Payment urls in case of mobile

amit.gupta — Wed, 19 Mar 2014 16:43:36 +0530

amit.gupta – 8 file(s) modified
Adding Payment urls in case of mobile

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/HdfcEmiPaymentService.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/HdfcPaymentService.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/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 10241 –

amit.gupta — Sun, 16 Mar 2014 22:29:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 10232 – Separating caching of banners.

kshitij.sood — Sat, 15 Mar 2014 11:23:47 +0530

kshitij.sood – 4 file(s) modified
Separating caching of banners.

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 10216 – Made single cache entry for homepage snippet.

amit.gupta — Fri, 14 Mar 2014 15:11:01 +0530

amit.gupta – 2 file(s) modified
Made single cache entry for homepage snippet.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 10208 – Added logging

amit.gupta — Fri, 14 Mar 2014 12:35:31 +0530

amit.gupta – 1 file(s) modified
Added logging

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

Rev 10195 – Added null check

amit.gupta — Thu, 13 Mar 2014 18:55:02 +0530

amit.gupta – 1 file(s) modified
Added null check

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

Rev 10190 – Changes in Website minor bug fixing

amit.gupta — Thu, 13 Mar 2014 14:43:34 +0530

amit.gupta – 4 file(s) modified
Changes in Website minor bug fixing

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 10169 – changed the query passed.

amit.gupta — Wed, 12 Mar 2014 13:05:59 +0530

amit.gupta – 1 file(s) modified
changed the query passed.

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

Rev 10161 – Added few more categories

amit.gupta — Tue, 11 Mar 2014 23:02:30 +0530

amit.gupta – 1 file(s) modified
Added few more categories

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

Rev 10124 – Removed comma.

amit.gupta — Mon, 10 Mar 2014 16:39:04 +0530

amit.gupta – 1 file(s) modified
Removed comma.

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

Rev 10118 –

amit.gupta — Fri, 07 Mar 2014 17:13:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 10113 – Added or to search query

amit.gupta — Fri, 07 Mar 2014 12:45:19 +0530

amit.gupta – 1 file(s) modified
Added or to search query

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

Rev 10095 – Added target

kshitij.sood — Thu, 06 Mar 2014 15:28:03 +0530

kshitij.sood – 16 file(s) modified
Added target

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/accessory-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/spiceaircel-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm

Rev 10040 – Added dhanlaxmi bank

amit.gupta — Tue, 04 Mar 2014 17:43:55 +0530

amit.gupta – 7 file(s) modified
Added dhanlaxmi bank

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
+ /trunk/Website/src/main/webapp/images/banks-dhanlaxmi.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 9840 – Added logistics with display text

amit.gupta — Tue, 11 Feb 2014 16:32:09 +0530

amit.gupta – 11 file(s) modified
Added logistics with display text

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ItemText.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.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

Rev 9624 – Added Vehicle mounts

amit.gupta — Fri, 24 Jan 2014 14:04:25 +0530

amit.gupta – 1 file(s) modified
Added Vehicle mounts

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

Rev 9472 – Added Filter for Mobile type.

amit.gupta — Thu, 16 Jan 2014 16:36:11 +0530

amit.gupta – 1 file(s) modified
Added Filter for Mobile type.

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 9357 – small change

kshitij.sood — Fri, 10 Jan 2014 17:49:04 +0530

kshitij.sood – 1 file(s) modified
small change

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

Rev 9356 – small change

kshitij.sood — Fri, 10 Jan 2014 17:45:47 +0530

kshitij.sood – 1 file(s) modified
small change

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

Rev 9338 – Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse ...

manish.sharma — Thu, 09 Jan 2014 16:14:25 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse on Jan-09-2014

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java
~ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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.py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 9301 – One assist changes for website.

kshitij.sood — Mon, 06 Jan 2014 15:49:45 +0530

kshitij.sood – 10 file(s) modified
One assist changes for website.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/images/insurance.jpg
+ /trunk/Website/src/main/webapp/images/oneassist.jpg
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/widgets.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/accessory-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 9155 – Added bannetr type and banners for mobile site (addition and ...

kshitij.sood — Tue, 17 Dec 2013 16:09:02 +0530

kshitij.sood – 23 file(s) modified
Added bannetr type and banners for mobile site (addition and retrieval logic)

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.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/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerCongregate.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/UserImageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm