SmartDukaan – /

Rev 3028 – Trac#488 Adding ThriftConfig files for CRM service. Also updating one ...

mandeep.dhir — Thu, 25 Aug 2011 11:01:18 +0530

mandeep.dhir – 10 file(s) modified
Trac#488 Adding ThriftConfig files for CRM service. Also updating one for UserContextService

+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketPriority.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 3027 – Ignored target for SVN commit

chandranshu — Thu, 25 Aug 2011 10:59:34 +0530

chandranshu – 1 file(s) modified
Ignored target for SVN commit

~ /trunk/CRMService

Rev 3026 – Trac#488 Adding thrift file for CRMService Adding a new method ...

mandeep.dhir — Thu, 25 Aug 2011 10:45:38 +0530

mandeep.dhir – 3 file(s) modified
Trac#488
Adding thrift file for CRMService
Adding a new method in UserContextService for get User given a mobile number

+ /trunk/ThriftGen/thriftsrc/CRMService
+ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3025 – Trac#488 Adding service for CRM data

mandeep.dhir — Thu, 25 Aug 2011 10:42:05 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Adding service for CRM data

x /trunk/CRMService/target

Rev 3024 – Trac#488 Adding service for CRM data

mandeep.dhir — Thu, 25 Aug 2011 10:40:48 +0530

mandeep.dhir – 84 file(s) modified
Trac#488 Adding service for CRM data

+ /trunk/CRMService
+ /trunk/CRMService/.classpath
+ /trunk/CRMService/.project
+ /trunk/CRMService/.settings
+ /trunk/CRMService/.settings/org.eclipse.jdt.core.prefs
+ /trunk/CRMService/.settings/org.maven.ide.eclipse.prefs
+ /trunk/CRMService/pom.xml
+ /trunk/CRMService/src
+ /trunk/CRMService/src/main
+ /trunk/CRMService/src/main/java
+ /trunk/CRMService/src/main/java/in
+ /trunk/CRMService/src/main/java/in/shop2020
+ /trunk/CRMService/src/main/java/in/shop2020/crm
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/handler
+ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence
+ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/service
+ /trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler
+ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
+ /trunk/CRMService/src/main/resources
+ /trunk/CRMService/src/main/resources/context.xml
+ /trunk/CRMService/src/main/resources/in
+ /trunk/CRMService/src/main/resources/in/shop2020
+ /trunk/CRMService/src/main/resources/in/shop2020/crm
+ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence
+ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
+ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
+ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
+ /trunk/CRMService/src/main/resources/jdbc.properties
+ /trunk/CRMService/src/main/resources/log4j.properties
+ /trunk/CRMService/src/main/resources/mybatis-config.xml
+ /trunk/CRMService/src/test
+ /trunk/CRMService/src/test/java
+ /trunk/CRMService/src/test/java/in
+ /trunk/CRMService/src/test/java/in/shop2020
+ /trunk/CRMService/src/test/java/in/shop2020/crm
+ /trunk/CRMService/src/test/java/in/shop2020/crm/handler
+ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
+ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
+ /trunk/CRMService/target
+ /trunk/CRMService/target/classes
+ /trunk/CRMService/target/classes/context.xml
+ /trunk/CRMService/target/classes/in
+ /trunk/CRMService/target/classes/in/shop2020
+ /trunk/CRMService/target/classes/in/shop2020/crm
+ /trunk/CRMService/target/classes/in/shop2020/crm/domain
+ /trunk/CRMService/target/classes/in/shop2020/crm/domain/Activity.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/domain/Agent.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/domain/Ticket.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/handler
+ /trunk/CRMService/target/classes/in/shop2020/crm/handler/ActivityHandler.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/handler/AgentHandler.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/handler/TicketHandler.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/ActivityMapper.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/ActivityMapper.xml
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/AgentMapper.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/AgentMapper.xml
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/TicketMapper.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/persistence/TicketMapper.xml
+ /trunk/CRMService/target/classes/in/shop2020/crm/service
+ /trunk/CRMService/target/classes/in/shop2020/crm/service/CRMServer.class
+ /trunk/CRMService/target/classes/in/shop2020/crm/service/handler
+ /trunk/CRMService/target/classes/in/shop2020/crm/service/handler/CRMServiceHandler.class
+ /trunk/CRMService/target/classes/jdbc.properties
+ /trunk/CRMService/target/classes/log4j.properties
+ /trunk/CRMService/target/classes/mybatis-config.xml
+ /trunk/CRMService/target/test-classes
+ /trunk/CRMService/target/test-classes/in
+ /trunk/CRMService/target/test-classes/in/shop2020
+ /trunk/CRMService/target/test-classes/in/shop2020/crm
+ /trunk/CRMService/target/test-classes/in/shop2020/crm/handler
+ /trunk/CRMService/target/test-classes/in/shop2020/crm/handler/ActivityHandlerTest.class
+ /trunk/CRMService/target/test-classes/in/shop2020/crm/handler/TicketHandlerTest.class

Rev 3023 – Changes file name to be read for alter sales content.

rajveer — Wed, 24 Aug 2011 20:23:37 +0530

rajveer – 1 file(s) modified
Changes file name to be read for alter sales content.

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

Rev 3022 – Changed signature to provide list of statuses.

rajveer — Wed, 24 Aug 2011 20:04:08 +0530

rajveer – 1 file(s) modified
Changed signature to provide list of statuses.

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

Rev 3021 – NPE check for slide also.

rajveer — Wed, 24 Aug 2011 20:01:13 +0530

rajveer – 1 file(s) modified
NPE check for slide also.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

Rev 3020 – Added check for NPE.

rajveer — Wed, 24 Aug 2011 19:55:49 +0530

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

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

Rev 3019 – Added support of my purchase and after sales.

rajveer — Wed, 24 Aug 2011 19:47:24 +0530

rajveer – 12 file(s) modified
Added support of my purchase and after sales.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AfterSalesController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /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/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 3018 – Added EntityUtils to separate out entity related common usage methods. ...

rajveer — Wed, 24 Aug 2011 19:45:24 +0530

rajveer – 7 file(s) modified
Added EntityUtils to separate out entity related common usage methods. Added support of after sales slides.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/FreeformContent.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/EntityUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
+ /trunk/ContentStore/src/velocity/AfterSales.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 3017 – Pass empty list of categories on brand page.

vikas — Wed, 24 Aug 2011 17:48:19 +0530

vikas – 1 file(s) modified
Pass empty list of categories on brand page.

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

Rev 3016 – Updated the comments to reflect the actual API implementation

chandranshu — Wed, 24 Aug 2011 17:42:21 +0530

chandranshu – 1 file(s) modified
Updated the comments to reflect the actual API implementation

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 3015 – MyNotes Reporting App

varun.gupta — Wed, 24 Aug 2011 16:30:56 +0530

varun.gupta – 2 file(s) modified
MyNotes Reporting App

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/MyNotesReporterServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 3014 – Added support to fetch orders in multiple states

chandranshu — Wed, 24 Aug 2011 14:52:00 +0530

chandranshu – 9 file(s) modified
Added support to fetch orders in multiple states

~ /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
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompletedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 3013 – Add new product activity report showing view count, add to ...

vikas — Wed, 24 Aug 2011 13:39:39 +0530

vikas – 1 file(s) modified
Add new product activity report showing view count, add to carts etc.

+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp

Rev 3012 – Added alcatel as brand in brand controller and main menu.

rajveer — Wed, 24 Aug 2011 12:49:49 +0530

rajveer – 2 file(s) modified
Added alcatel as brand in brand controller and main menu.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 3011 – Added coupons for Xperia Arc and Xperia Mini Pro.

varun.gupta — Wed, 24 Aug 2011 12:11:05 +0530

varun.gupta – 1 file(s) modified
Added coupons for Xperia Arc and Xperia Mini Pro.

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 3010 – Capturing payments at the time of accepting orders

chandranshu — Wed, 24 Aug 2011 11:57:58 +0530

chandranshu – 13 file(s) modified
Capturing payments at the time of accepting orders

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/EbsPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/IPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /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/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 3009 – Added a comment to the status

chandranshu — Wed, 24 Aug 2011 11:34:51 +0530

chandranshu – 1 file(s) modified
Added a comment to the status

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3008 – Added support to add similar items for a product.

rajveer — Tue, 23 Aug 2011 21:50:36 +0530

rajveer – 3 file(s) modified
Added support to add similar items for a product.

~ /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/catalog/test/CatalogTest.py

Rev 3007 – Ensured that we use the default host and port if ...

chandranshu — Tue, 23 Aug 2011 19:09:08 +0530

chandranshu – 1 file(s) modified
Ensured that we use the default host and port if the config server is not up.

~ /trunk/PyProj/src/shop2020/clients/HelperClient.py

Rev 3006 – Try to start the client even if we are unable ...

chandranshu — Tue, 23 Aug 2011 19:07:33 +0530

chandranshu – 1 file(s) modified
Try to start the client even if we are unable to connect to the config server.

~ /trunk/PyProj/src/shop2020/clients/HelperClient.py

Rev 3005 – Started archiving user emails. This should reduce the time taken ...

chandranshu — Tue, 23 Aug 2011 19:04:51 +0530

chandranshu – 3 file(s) modified
Started archiving user emails. This should reduce the time taken to query the table.

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/test/Test.py

Rev 3004 – Add commons-logger dependency for mapreduce plugin.

vikas — Tue, 23 Aug 2011 18:34:38 +0530

vikas – 1 file(s) modified
Add commons-logger dependency for mapreduce plugin.

~ /trunk/GoogleAppDatalog/pom.xml

Rev 3003 – Fix a bug in RegisterFailedUserExists event.

vikas — Tue, 23 Aug 2011 17:32:19 +0530

vikas – 1 file(s) modified
Fix a bug in RegisterFailedUserExists event.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 3002 – Fix a bug in register event.

vikas — Tue, 23 Aug 2011 17:30:38 +0530

vikas – 1 file(s) modified
Fix a bug in register event.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 3001 – Scaled phone icon image to actual display size.

rajveer — Tue, 23 Aug 2011 16:16:20 +0530

rajveer – 1 file(s) modified
Scaled phone icon image to actual display size.

~ /trunk/Website/src/main/webapp/images/phone-header.png

Rev 3000 – Samsung Galaxy Pro & Samsung S5830 Ace are removed from ...

varun.gupta — Tue, 23 Aug 2011 11:43:28 +0530

varun.gupta – 1 file(s) modified
Samsung Galaxy Pro & Samsung S5830 Ace are removed from UPTO75 coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_single_coupon_different_discounts_for_different_models.py

Rev 2999 – Updated test cases for css changes and additional item in ...

rajveer — Tue, 23 Aug 2011 11:40:21 +0530

rajveer – 3 file(s) modified
Updated test cases for css changes and additional item in best deals at home page

~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/home/test6.css
~ /trunk/Website/src/test/samples/product/test6.css

Rev 2998 – Made static DesEncryptor to class variable to make it thread ...

rajveer — Sat, 20 Aug 2011 07:00:33 +0530

rajveer – 4 file(s) modified
Made static DesEncryptor to class variable to make it thread safe.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java

Rev 2997 – Final price of Galaxy S2 modified

varun.gupta — Fri, 19 Aug 2011 20:19:15 +0530

varun.gupta – 1 file(s) modified
Final price of Galaxy S2 modified

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 2996 – Fix the login success event failure, when user source is ...

vikas — Fri, 19 Aug 2011 19:35:04 +0530

vikas – 1 file(s) modified
Fix the login success event failure, when user source is null.

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

Rev 2995 – Save entire url with querystring in case of direct traffic.

vikas — Fri, 19 Aug 2011 19:07:22 +0530

vikas – 1 file(s) modified
Save entire url with querystring in case of direct traffic.

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

Rev 2994 – Some datatables enhancements.

vikas — Fri, 19 Aug 2011 19:05:16 +0530

vikas – 3 file(s) modified
Some datatables enhancements.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp

Rev 2993 – MyNotes servlet-URL mappings added

varun.gupta — Fri, 19 Aug 2011 17:00:14 +0530

varun.gupta – 1 file(s) modified
MyNotes servlet-URL mappings added

~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 2992 – Changed style for widgets

rajveer — Fri, 19 Aug 2011 15:23:17 +0530

rajveer – 1 file(s) modified
Changed style for widgets

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

Rev 2991 – Reduced font size from 18 to 16 for widgets

rajveer — Fri, 19 Aug 2011 15:00:47 +0530

rajveer – 1 file(s) modified
Reduced font size from 18 to 16 for widgets

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

Rev 2990 – Updated test cases for small js changes.

rajveer — Fri, 19 Aug 2011 14:07:51 +0530

rajveer – 1 file(s) modified
Updated test cases for small js changes.

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

Rev 2989 – Save home page visit event.

vikas — Fri, 19 Aug 2011 14:05:29 +0530

vikas – 1 file(s) modified
Save home page visit event.

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