SmartDukaan – /

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

Rev 2988 – My Notes backend moved to Google App Engine Datastore

varun.gupta — Fri, 19 Aug 2011 14:04:22 +0530

varun.gupta – 3 file(s) modified
My Notes backend moved to Google App Engine Datastore

+ /trunk/Common/src/main/java/in/shop2020/utils/MyNotesGAEClient.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/MyNotesServlet.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java

Rev 2987 – Use switch instead of if for performance.

vikas — Fri, 19 Aug 2011 14:04:20 +0530

vikas – 1 file(s) modified
Use switch instead of if for performance.

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

Rev 2986 – Store event class as part of eventType enum for better ...

vikas — Fri, 19 Aug 2011 14:03:44 +0530

vikas – 1 file(s) modified
Store event class as part of eventType enum for better design.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java

Rev 2985 – Track add to cart event from product page.

vikas — Fri, 19 Aug 2011 14:02:00 +0530

vikas – 1 file(s) modified
Track add to cart event from product page.

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

Rev 2984 – Explicitly PAUSED item should not be active when inventory available. ...

rajveer — Fri, 19 Aug 2011 11:16:21 +0530

rajveer – 4 file(s) modified
Explicitly PAUSED item should not be active when inventory available. So added another status called, PAUSED_BY_RISK. Item will be paused by risk when inventory will be low and will be active once inventory will appear.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2983 – Added a check to ensure that only limited quantities of ...

chandranshu — Fri, 19 Aug 2011 09:15:43 +0530

chandranshu – 9 file(s) modified
Added a check to ensure that only limited quantities of risky items can be added

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemShippingInfo.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 2982 – Made changes for accessing browse history and my research.

rajveer — Thu, 18 Aug 2011 19:46:01 +0530

rajveer – 4 file(s) modified
Made changes for accessing browse history and my research.

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

Rev 2981 – Removed Widget and WidgetItem and Added a table called UserWidgetItem. ...

rajveer — Thu, 18 Aug 2011 19:45:15 +0530

rajveer – 18 file(s) modified
Removed Widget and WidgetItem and Added a table called UserWidgetItem. Now all browse history and my research data for a user will come from this single table. This effort will help to reduct query time for some slow queries related to widgets, as we will always use index.

~ /trunk/PyProj/.pydevproject
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionRuleDataUtilities.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
x /trunk/PyProj/src/shop2020/model/v1/user/impl/WidgetConverters.py
x /trunk/PyProj/src/shop2020/model/v1/user/impl/WidgetDataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/user/test/UserTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.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/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserWidgetItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Widget.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetItem.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 2980 – Only list completed orders in affiliate report.

vikas — Thu, 18 Aug 2011 19:02:43 +0530

vikas – 1 file(s) modified
Only list completed orders in affiliate report.

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

Rev 2979 – Removed deployment of Social, Support and Crm from everything

chandranshu — Thu, 18 Aug 2011 16:45:44 +0530

chandranshu – 1 file(s) modified
Removed deployment of Social, Support and Crm from everything

~ /trunk/runutils/deploy-everything.sh