SmartDukaan – /trunk/Website/

Rev 3588 – Some clean ups in source tracking code.

vikas — Tue, 11 Oct 2011 18:38:32 +0530

vikas – 1 file(s) modified
Some clean ups in source tracking code.

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

Rev 3583 – Removed individual methods for capturing HDFC and EBS payments from ...

chandranshu — Tue, 11 Oct 2011 16:10:15 +0530

chandranshu – 8 file(s) modified
Removed individual methods for capturing HDFC and EBS payments from Payment service. Added new class for handling HDFC EMI payments

+ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /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/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 3565 – Expire source cookie if user comes from another source.

rajveer — Mon, 10 Oct 2011 17:53:15 +0530

rajveer – 1 file(s) modified
Expire source cookie if user comes from another source.

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

Rev 3562 – Updated method call.

rajveer — Mon, 10 Oct 2011 17:06:52 +0530

rajveer – 1 file(s) modified
Updated method call.

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

Rev 3561 – Support to display different prices for different sources.

rajveer — Mon, 10 Oct 2011 16:28:11 +0530

rajveer – 29 file(s) modified
Support to display different prices for different sources.

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.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/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceAware.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.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/ContentServingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.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/java/in/shop2020/serving/services/SolrSearchService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 3550 – Limit no of characters to 60 for line1 in address.

vikas — Fri, 07 Oct 2011 19:52:10 +0530

vikas – 1 file(s) modified
Limit no of characters to 60 for line1 in address.

~ /trunk/Website/src/main/webapp/js/custom-jquery.js

Rev 3549 – Increased nav bar height and padding.

varun.gupta — Fri, 07 Oct 2011 18:54:26 +0530

varun.gupta – 1 file(s) modified
Increased nav bar height and padding.

~ /trunk/Website/src/main/webapp/css/nav.css

Rev 3525 – Removed overriding line-height property which was reducing gap between price ...

varun.gupta — Mon, 03 Oct 2011 19:32:00 +0530

varun.gupta – 1 file(s) modified
Removed overriding line-height property which was reducing gap between price figure and short description.

~ /trunk/Website/src/main/webapp/css/style.css

Rev 3508 – Some of the website put saholic in referer while redirecting ...

vikas — Fri, 30 Sep 2011 18:51:04 +0530

vikas – 1 file(s) modified
Some of the website put saholic in referer while redirecting and they were also attributed as direct traffic

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

Rev 3507 – As per ticket #119 to avoid displaying stale information.

rajveer — Fri, 30 Sep 2011 18:45:15 +0530

rajveer – 1 file(s) modified
As per ticket #119 to avoid displaying stale information.

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

Rev 3499 – Trac#504 Added functionality to help CRM agents to verify COD ...

mandeep.dhir — Fri, 30 Sep 2011 15:17:56 +0530

mandeep.dhir – 42 file(s) modified
Trac#504 Added functionality to help CRM agents to verify COD orders

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
~ /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/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /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/user/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/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
x /trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 3494 – Mark facebooks add traffic as paid.

vikas — Fri, 30 Sep 2011 14:36:55 +0530

vikas – 1 file(s) modified
Mark facebooks add traffic as paid.

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

Rev 3493 – Made changes to getSource() to avoid possible NPE Reviewer: vikas

mandeep.dhir — Fri, 30 Sep 2011 13:37:23 +0530

mandeep.dhir – 1 file(s) modified
Made changes to getSource() to avoid possible NPE
Reviewer: vikas

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

Rev 3447 – Updated class path for test setup

rajveer — Tue, 27 Sep 2011 17:21:27 +0530

rajveer – 1 file(s) modified
Updated class path for test setup

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3433 – Updated the thrift dependency from 0.2 to 0.7

rajveer — Mon, 26 Sep 2011 21:50:23 +0530

rajveer – 1 file(s) modified
Updated the thrift dependency from 0.2 to 0.7

~ /trunk/Website/pom.xml

Rev 3418 – Missed staring promotion service. Fixing.

vikas — Fri, 23 Sep 2011 16:18:27 +0530

vikas – 1 file(s) modified
Missed staring promotion service. Fixing.

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3407 – Updated the test cases

rajveer — Fri, 23 Sep 2011 11:22:47 +0530

rajveer – 1 file(s) modified
Updated the test cases

~ /trunk/Website/src/test/samples/product/test34.javascript

Rev 3406 – Added most compared phones widget

rajveer — Fri, 23 Sep 2011 11:12:18 +0530

rajveer – 2 file(s) modified
Added most compared phones widget

~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3403 – Changes to test databases to create not store create table ...

vikas — Thu, 22 Sep 2011 18:54:39 +0530

vikas – 7 file(s) modified
Changes to test databases to create not store create table queries. Tables to be created by service itself.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/resources/db/helper.sql
~ /trunk/Website/src/test/resources/db/logistics.sql
~ /trunk/Website/src/test/resources/db/transaction.sql
~ /trunk/Website/src/test/resources/db/user.sql
~ /trunk/Website/src/test/resources/scripts/create_dump.sh
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3394 – In a order creation event add items only in its ...

vikas — Wed, 21 Sep 2011 18:47:03 +0530

vikas – 1 file(s) modified
In a order creation event add items only in its line instead of all items from transaction.

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

Rev 3392 – Increase element count for category and product snippets cache.

vikas — Wed, 21 Sep 2011 13:35:30 +0530

vikas – 1 file(s) modified
Increase element count for category and product snippets cache.

~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3391 – Update test database and samples.

vikas — Wed, 21 Sep 2011 13:26:11 +0530

vikas – 3 file(s) modified
Update test database and samples.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/samples/home/test18.javascript
~ /trunk/Website/src/test/samples/product/test20.javascript

Rev 3380 – Update test database to get rid of string column to ...

vikas — Tue, 20 Sep 2011 13:18:22 +0530

vikas – 1 file(s) modified
Update test database to get rid of string column to store the event type.

~ /trunk/Website/src/test/resources/db/user.sql

Rev 3378 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:13:41 +0530

vikas – 13 file(s) modified
Get rid of string column to store the event type.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java

Rev 3360 – Show the Myresearch widget as closed if there is no ...

rajveer — Mon, 19 Sep 2011 13:12:31 +0530

rajveer – 1 file(s) modified
Show the Myresearch widget as closed if there is no item in myresearch.

~ /trunk/Website/src/main/webapp/js/all.js

Rev 3357 – Increase cache element limits.

vikas — Mon, 19 Sep 2011 12:28:53 +0530

vikas – 1 file(s) modified
Increase cache element limits.

~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3353 – Added delay in delivery notice

chandranshu — Mon, 19 Sep 2011 11:36:32 +0530

chandranshu – 1 file(s) modified
Added delay in delivery notice

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3349 – Update payment test.

vikas — Fri, 16 Sep 2011 20:22:24 +0530

vikas – 2 file(s) modified
Update payment test.

~ /trunk/Website/src/test/jmeter/payment.jmx
~ /trunk/Website/src/test/resources/db/user.sql

Rev 3347 – Add hit ration statistics.

vikas — Fri, 16 Sep 2011 19:17:16 +0530

vikas – 2 file(s) modified
Add hit ration statistics.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CacheAdminController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm

Rev 3346 – Update test samples.

vikas — Fri, 16 Sep 2011 19:10:03 +0530

vikas – 22 file(s) modified
Update test samples.

~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/home/test18.javascript
~ /trunk/Website/src/test/samples/home/test34.javascript
~ /trunk/Website/src/test/samples/home/test58.png
~ /trunk/Website/src/test/samples/home/test60.gif
~ /trunk/Website/src/test/samples/home/test61.png
~ /trunk/Website/src/test/samples/home/test62.gif
~ /trunk/Website/src/test/samples/home/test64.png
~ /trunk/Website/src/test/samples/home/test66.jpeg
~ /trunk/Website/src/test/samples/home/test67.png
~ /trunk/Website/src/test/samples/product/test1.html
~ /trunk/Website/src/test/samples/product/test20.javascript
~ /trunk/Website/src/test/samples/product/test30.css
~ /trunk/Website/src/test/samples/product/test34.javascript
~ /trunk/Website/src/test/samples/product/test40.javascript
~ /trunk/Website/src/test/samples/product/test59.png
~ /trunk/Website/src/test/samples/product/test60.png
~ /trunk/Website/src/test/samples/product/test62.png
~ /trunk/Website/src/test/samples/product/test63.gif
~ /trunk/Website/src/test/samples/product/test64.png
~ /trunk/Website/src/test/samples/product/test65.jpeg
~ /trunk/Website/src/test/samples/product/test67.gif

Rev 3342 – Removed brand controller, as brands will be handled by special ...

rajveer — Fri, 16 Sep 2011 15:29:39 +0530

rajveer – 2 file(s) modified
Removed brand controller, as brands will be handled by special page controller

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
x /trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm

Rev 3329 – Added caching in special page controller.

rajveer — Thu, 15 Sep 2011 18:47:47 +0530

rajveer – 1 file(s) modified
Added caching in special page controller.

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

Rev 3321 – Added two new brands.

rajveer — Thu, 15 Sep 2011 16:32:15 +0530

rajveer – 1 file(s) modified
Added two new brands.

~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 3320 – Modifications in special page controllers

rajveer — Thu, 15 Sep 2011 16:31:46 +0530

rajveer – 3 file(s) modified
Modifications in special page controllers

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java

Rev 3312 – Just added a javascript check when people leave captcha empty. ...

chandranshu — Thu, 15 Sep 2011 12:06:35 +0530

chandranshu – 4 file(s) modified
Just added a javascript check when people leave captcha empty. Added a friendlier message on the shipping page when the location is not serviceable. Deleted the long obsolete HdfcPayController

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3311 – Changed the logger class name

chandranshu — Thu, 15 Sep 2011 11:56:24 +0530

chandranshu – 2 file(s) modified
Changed the logger class name

~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java

Rev 3310 – Added NPE check.

rajveer — Thu, 15 Sep 2011 11:45:28 +0530

rajveer – 1 file(s) modified
Added NPE check.

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

Rev 3305 – Added GA event on helpdocs click.

rajveer — Wed, 14 Sep 2011 19:48:51 +0530

rajveer – 1 file(s) modified
Added GA event on helpdocs click.

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 3304 – Updated URI and some changes in vm file.

rajveer — Wed, 14 Sep 2011 19:33:53 +0530

rajveer – 3 file(s) modified
Updated URI and some changes in vm file.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 3303 – Added our own mapper so that we can map all ...

rajveer — Wed, 14 Sep 2011 18:59:02 +0530

rajveer – 5 file(s) modified
Added our own mapper so that we can map all our special pages to SpecialPageController.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
~ /trunk/Website/src/main/resources/struts.xml