SmartDukaan – /

Rev 2011 – Added selling price to the reconciliation report

rajveer — Tue, 31 May 2011 21:40:19 +0530

rajveer – 1 file(s) modified
Added selling price to the reconciliation report

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

Rev 2010 – All the numbers are now rounded to 2 digits after ...

varun.gupta — Tue, 31 May 2011 20:00:31 +0530

varun.gupta – 1 file(s) modified
All the numbers are now rounded to 2 digits after decimal

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 2009 – Moved tracking code before cart reset call

varun.gupta — Tue, 31 May 2011 19:36:54 +0530

varun.gupta – 1 file(s) modified
Moved tracking code before cart reset call

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

Rev 2008 – Added the column for Customer Name, removed the restriction of ...

chandranshu — Tue, 31 May 2011 19:11:41 +0530

chandranshu – 1 file(s) modified
Added the column for Customer Name, removed the restriction of status, changed the file name to reflect the date range of report, created an enum for columns to ease future refactoring.

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

Rev 2007 – Error message updated

varun.gupta — Tue, 31 May 2011 19:04:56 +0530

varun.gupta – 1 file(s) modified
Error message updated

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 2006 – User friendly error messages added for Promotion Rule

varun.gupta — Tue, 31 May 2011 18:45:16 +0530

varun.gupta – 1 file(s) modified
User friendly error messages added for Promotion Rule

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 2005 – No need to set value while deleting.

vikas — Tue, 31 May 2011 18:36:06 +0530

vikas – 1 file(s) modified
No need to set value while deleting.

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

Rev 2004 – Fix Tracker definition.

vikas — Tue, 31 May 2011 18:31:12 +0530

vikas – 1 file(s) modified
Fix Tracker definition.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 2003 – Coupon rule updated

varun.gupta — Tue, 31 May 2011 18:29:48 +0530

varun.gupta – 1 file(s) modified
Coupon rule updated

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 2002 – Modified for promotion server

rajveer — Tue, 31 May 2011 18:14:24 +0530

rajveer – 2 file(s) modified
Modified for promotion server

~ /trunk/runutils/deploy-everything.sh
~ /trunk/runutils/start-py-services.sh

Rev 2001 – Ensured that the downloaded file is deleted even if there ...

chandranshu — Tue, 31 May 2011 18:02:17 +0530

chandranshu – 1 file(s) modified
Ensured that the downloaded file is deleted even if there are errors in parsing or updating the data. Also started ignoring date-time errors in case of undelivered orders since we don't use them anyway.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py

Rev 2000 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:31:57 +0530

vikas – 1 file(s) modified
Don't use tracker table.

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

Rev 1999 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:31:22 +0530

vikas – 9 file(s) modified
Don't use tracker table.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/DataLogger.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 1998 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:30:47 +0530

vikas – 4 file(s) modified
Don't use tracker table.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Tracker.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserAffiliateException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1997 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:29:29 +0530

vikas – 1 file(s) modified
Don't use tracker table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py

Rev 1996 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:19:00 +0530

vikas – 7 file(s) modified
Don't use tracker table.

~ /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/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

Rev 1995 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:18:28 +0530

vikas – 1 file(s) modified
Don't use tracker table.

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

Rev 1994 – Configuration for Promotion server

varun.gupta — Tue, 31 May 2011 16:13:46 +0530

varun.gupta – 2 file(s) modified
Configuration for Promotion server

~ /trunk/Common/src/main/resources/shop2020_production.cfg
~ /trunk/Common/src/test/resources/shop2020.cfg

Rev 1993 – left out files in last CatalogDashboard commit

ankur.singhal — Tue, 31 May 2011 15:41:12 +0530

ankur.singhal – 1 file(s) modified
left out files in last CatalogDashboard commit

+ /trunk/CatalogDashboard/war/catalogdashboard/DCDEF671B4FD8636EB5EED5780F8D9D2.gwt.rpc

Rev 1992 – Edit functionality for prices and vendor prices.

ankur.singhal — Tue, 31 May 2011 15:38:43 +0530

ankur.singhal – 17 file(s) modified
Edit functionality for prices and vendor prices.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogTree.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/Filters.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/Shortcuts.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VendorPricesDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/CatalogDashboard.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/filters.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/VendorPricesDialog.ui.xml
+ /trunk/CatalogDashboard/war/catalogdashboard/6DBCCEC3D0171D81E199C116C9301B91.gwt.rpc
+ /trunk/CatalogDashboard/war/catalogdashboard/993AB45B2825EA49748779BA473E369C.gwt.rpc

Rev 1991 – added methods getAllItemPricing and updateVendorItemPricing to Catalog service. These are ...

ankur.singhal — Tue, 31 May 2011 15:37:53 +0530

ankur.singhal – 5 file(s) modified
added methods getAllItemPricing and updateVendorItemPricing to Catalog service. These are used in CatalogDashboard.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 1990 – added methods getAllItemPricing and updateVendorItemPricing. These are used in CatalogDashboard.

ankur.singhal — Tue, 31 May 2011 15:36:46 +0530

ankur.singhal – 1 file(s) modified
added methods getAllItemPricing and updateVendorItemPricing. These are used in CatalogDashboard.

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

Rev 1989 – Modified start up scripts for promotion server

rajveer — Tue, 31 May 2011 15:22:55 +0530

rajveer – 2 file(s) modified
Modified start up scripts for promotion server

~ /trunk/runutils/deploy-everything.sh
~ /trunk/runutils/start-py-services.sh

Rev 1988 – entries for Promotion server added

varun.gupta — Tue, 31 May 2011 15:16:05 +0530

varun.gupta – 1 file(s) modified
entries for Promotion server added

~ /trunk/Common/src/main/resources/shop2020.cfg

Rev 1987 – Keys for Promotion Server added

varun.gupta — Tue, 31 May 2011 15:14:05 +0530

varun.gupta – 1 file(s) modified
Keys for Promotion Server added

~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java

Rev 1986 – Java client for Promotion Server

varun.gupta — Tue, 31 May 2011 15:12:22 +0530

varun.gupta – 1 file(s) modified
Java client for Promotion Server

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionServiceClient.java

Rev 1985 – Discounted Amount added to Shipping Details page

varun.gupta — Tue, 31 May 2011 15:05:58 +0530

varun.gupta – 1 file(s) modified
Discounted Amount added to Shipping Details page

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

Rev 1984 – Thrift interface definitions for Promotion Service

varun.gupta — Tue, 31 May 2011 15:03:38 +0530

varun.gupta – 2 file(s) modified
Thrift interface definitions for Promotion Service

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 1983 – Discounted amount is now being saved to LineItem's total amount

varun.gupta — Tue, 31 May 2011 15:02:04 +0530

varun.gupta – 1 file(s) modified
Discounted amount is now being saved to LineItem's total amount

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 1982 – Java interface for Promotion Service

varun.gupta — Tue, 31 May 2011 14:59:39 +0530

varun.gupta – 10 file(s) modified
Java interface for Promotion Service

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Promotion.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionTracking.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1981 – UI changes for Promotion Service

varun.gupta — Tue, 31 May 2011 14:56:46 +0530

varun.gupta – 8 file(s) modified
UI changes for Promotion Service

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/webapp/css/cart.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 1980 – Catalog dump should be taken after content generated

rajveer — Tue, 31 May 2011 14:07:06 +0530

rajveer – 1 file(s) modified
Catalog dump should be taken after content generated

~ /trunk/runutils/generate-static-html.sh

Rev 1979 – Added iOS in the comparison rules

rajveer — Tue, 31 May 2011 12:39:27 +0530

rajveer – 1 file(s) modified
Added iOS in the comparison rules

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 1978 – Modified css for 3, 4 and 5 column comparision

rajveer — Mon, 30 May 2011 22:24:24 +0530

rajveer – 1 file(s) modified
Modified css for 3, 4 and 5 column comparision

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

Rev 1977 – Updated the socre computation formula. Made overall score as bold. ...

rajveer — Mon, 30 May 2011 19:42:29 +0530

rajveer – 4 file(s) modified
Updated the socre computation formula. Made overall score as bold. Changed name of summary slide as Analysis

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /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 1976 – Promotion Service code and relevant changes in other services

varun.gupta — Mon, 30 May 2011 19:20:16 +0530

varun.gupta – 19 file(s) modified
Promotion Service code and relevant changes in other services

+ /trunk/PyProj/src/shop2020/clients/PromotionClient.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.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/PromotionDataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/user/PromotionServer.py
+ /trunk/PyProj/src/shop2020/model/v1/user/test/PromotionTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
+ /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/PyProj/src/shop2020/thriftpy/model/v1/user/__init__.py

Rev 1975 – Added new music formats, image formats and video formats.

rajveer — Mon, 30 May 2011 19:08:48 +0530

rajveer – 1 file(s) modified
Added new music formats, image formats and video formats.

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 1974 – Do not dump pay-success url in affiliate tracking.

vikas — Mon, 30 May 2011 16:34:43 +0530

vikas – 1 file(s) modified
Do not dump pay-success url in affiliate tracking.

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

Rev 1973 – Remove unnecesary methods.

vikas — Mon, 30 May 2011 15:10:48 +0530

vikas – 1 file(s) modified
Remove unnecesary methods.

~ /trunk/Social/src/main/java/in/shop2020/social/utils/Utils.java

Rev 1972 – Fix scope problem with total_price in velocity file.

vikas — Mon, 30 May 2011 14:38:09 +0530

vikas – 1 file(s) modified
Fix scope problem with total_price in velocity file.

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