SmartDukaan – /

Rev 5350 – Ticket #1335 - Partners XML feed will now contain prices ...

varun.gupta — Fri, 01 Jun 2012 16:40:49 +0530

varun.gupta – 1 file(s) modified
Ticket #1335 - Partners XML feed will now contain prices after coupon discount

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 5349 – Fixed comma.

anupam.singh — Fri, 01 Jun 2012 15:04:40 +0530

anupam.singh – 1 file(s) modified
Fixed comma.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 5348 – Adding COD Verification Agent Reviewer : Mandeep

anupam.singh — Fri, 01 Jun 2012 14:55:54 +0530

anupam.singh – 8 file(s) modified
Adding COD Verification Agent
Reviewer : Mandeep

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /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/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

Rev 5347 – Made product comparison generic on website. Reviewed by : rajveer

amit.gupta — Fri, 01 Jun 2012 14:54:01 +0530

amit.gupta – 7 file(s) modified
Made product comparison generic on website.
Reviewed by : rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5346 – #1301 Reviewer: Varun

amit.gupta — Fri, 01 Jun 2012 14:33:25 +0530

amit.gupta – 1 file(s) modified
#1301
Reviewer: Varun

~ /trunk/ContentStore/src/main/java/in/shop2020/util/MostComparedIndexGenerator.java

Rev 5345 – Remove items from cart of anonymous user, when she logs ...

rajveer — Fri, 01 Jun 2012 13:13:39 +0530

rajveer – 1 file(s) modified
Remove items from cart of anonymous user, when she logs in.

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

Rev 5344 – Clear cache after catalog db has been restored.

rajveer — Fri, 01 Jun 2012 11:41:52 +0530

rajveer – 1 file(s) modified
Clear cache after catalog db has been restored.

~ /trunk/runutils/update-content-and-catalog.sh

Rev 5343 – vendor reconciliation aramex error handling

phani.kumar — Thu, 31 May 2012 20:12:39 +0530

phani.kumar – 1 file(s) modified
vendor reconciliation aramex error handling

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

Rev 5342 – Removed create cart method, as it is not supposed to ...

rajveer — Thu, 31 May 2012 18:45:24 +0530

rajveer – 6 file(s) modified
Removed create cart method, as it is not supposed to be called from outside.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 5341 – Removed unused import of AccountStatus.

rajveer — Thu, 31 May 2012 17:36:18 +0530

rajveer – 1 file(s) modified
Removed unused import of AccountStatus.

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

Rev 5340 – Change to log delivery estimates only if item pincode length ...

amar.kumar — Thu, 31 May 2012 16:45:58 +0530

amar.kumar – 1 file(s) modified
Change to log delivery estimates only if item pincode length is 6 and pincode is not default pincode

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

Rev 5339 – Reloaded properties before restarting services

anupam.singh — Thu, 31 May 2012 16:11:26 +0530

anupam.singh – 1 file(s) modified
Reloaded properties before restarting services

~ /trunk/runutils/deploy-everything.sh

Rev 5338 – Updated content updation script to clear item availability cache.

rajveer — Thu, 31 May 2012 14:49:32 +0530

rajveer – 1 file(s) modified
Updated content updation script to clear item availability cache.

~ /trunk/runutils/update-content-and-catalog.sh

Rev 5337 – Added method to clear iteminventorycache in thrift.

rajveer — Thu, 31 May 2012 14:44:10 +0530

rajveer – 3 file(s) modified
Added method to clear iteminventorycache in thrift.

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

Rev 5336 – Added method to clear iteminventorycache in thrift. Also added script ...

rajveer — Thu, 31 May 2012 14:42:56 +0530

rajveer – 7 file(s) modified
Added method to clear iteminventorycache in thrift. Also added script to call the service method.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ClearItemAvailabilityCache.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5335 – Removed unused enum fields PhoneType and AccountStatus from UserModel.

rajveer — Thu, 31 May 2012 14:38:46 +0530

rajveer – 1 file(s) modified
Removed unused enum fields PhoneType and AccountStatus from UserModel.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 5334 – Removed unused enum fields PhoneType and AccountStatus from UserModel.

rajveer — Thu, 31 May 2012 14:38:24 +0530

rajveer – 4 file(s) modified
Removed unused enum fields PhoneType and AccountStatus from UserModel.

~ /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/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5333 – Bugfix. For items where warehousePreferenceSticky is set, we need to ...

mandeep.dhir — Thu, 31 May 2012 12:23:35 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. For items where warehousePreferenceSticky is set, we need to check its availability at all GOOD warehouses at preferred shipping location to determine if item is addable to Cart.
Reviewer: Rajveer

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

Rev 5332 – Removed unnecessary comments.

rajveer — Wed, 30 May 2012 18:28:10 +0530

rajveer – 1 file(s) modified
Removed unnecessary comments.

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

Rev 5331 – Removed reference of userId for cart objects.

rajveer — Wed, 30 May 2012 18:20:39 +0530

rajveer – 6 file(s) modified
Removed reference of userId for cart objects.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_diwali_gift_voucher.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Phone_and_Accessory.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_SAnniversary.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 5330 – using title instead of prodname

amit.gupta — Wed, 30 May 2012 18:08:28 +0530

amit.gupta – 1 file(s) modified
using title instead of prodname

~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm

Rev 5329 – Explicitly setting the datatype for AJAX response while getting data ...

varun.gupta — Wed, 30 May 2012 18:03:47 +0530

varun.gupta – 1 file(s) modified
Explicitly setting the datatype for AJAX response while getting data for saved URLs

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 5328 – Removed references for UserState.

rajveer — Wed, 30 May 2012 17:53:22 +0530

rajveer – 2 file(s) modified
Removed references for UserState.

~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

Rev 5327 – Checking in thrift config for the last changes made.

rajveer — Wed, 30 May 2012 17:51:31 +0530

rajveer – 12 file(s) modified
Checking in thrift config for the last changes made.

x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AccountStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/IPMap.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Phone.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PhoneType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/SocialHandles.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
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserInternalInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserState.java

Rev 5326 – Removed unused objects and methods from user service. Creation of ...

rajveer — Wed, 30 May 2012 17:47:43 +0530

rajveer – 16 file(s) modified
Removed unused objects and methods from user service.
Creation of user and cart made transactional.
Removed reference of user from cart object.
Merged UserState with User object.
Reviewer# Amar and Anupam

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /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/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 5325 – Delhivery tracking api changed to call all awbs at a ...

phani.kumar — Wed, 30 May 2012 17:16:12 +0530

phani.kumar – 1 file(s) modified
Delhivery tracking api changed to call all awbs at a time

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

Rev 5324 – Offloaded item object in thrift. Removed item inventory and otherinfo.

rajveer — Wed, 30 May 2012 17:10:25 +0530

rajveer – 1 file(s) modified
Offloaded item object in thrift. Removed item inventory and otherinfo.

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

Rev 5323 – added js logging to debug

varun.gupta — Wed, 30 May 2012 16:13:03 +0530

varun.gupta – 1 file(s) modified
added js logging to debug

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 5322 – #1164, #1165 Reviewer: rajveer

amit.gupta — Wed, 30 May 2012 14:52:20 +0530

amit.gupta – 5 file(s) modified
#1164, #1165
Reviewer: rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 5321 – dont use info from map in case we fail to ...

amit.gupta — Wed, 30 May 2012 13:58:59 +0530

amit.gupta – 1 file(s) modified
dont use info from map in case we fail to access service from promotion.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5320 – For testing of caching of availability.

rajveer — Wed, 30 May 2012 12:54:32 +0530

rajveer – 1 file(s) modified
For testing of caching of availability.

~ /trunk/PyProj/src/shop2020/logistics/service/test/Test.py

Rev 5319 – handled quotes in conflict data

varun.gupta — Wed, 30 May 2012 12:30:05 +0530

varun.gupta – 1 file(s) modified
handled quotes in conflict data

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html

Rev 5318 – Removed service level caching for item availability and added db ...

rajveer — Wed, 30 May 2012 12:24:21 +0530

rajveer – 2 file(s) modified
Removed service level caching for item availability and added db level caching.
Ticket# 1312
Reviewer# Mandeep

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

Rev 5317 – Bringing data for 1 day instead of 2 days to ...

amar.kumar — Wed, 30 May 2012 01:55:24 +0530

amar.kumar – 1 file(s) modified
Bringing data for 1 day instead of 2 days to avoid DeadlineExceededException and DataStoreTimeoutException

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearchFrequency.jsp

Rev 5316 – Added logging to accessing of Promotion Service

amit.gupta — Tue, 29 May 2012 17:09:18 +0530

amit.gupta – 1 file(s) modified
Added logging to accessing of Promotion Service

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5315 – Added Most Compared index generation to content generation process

varun.gupta — Tue, 29 May 2012 15:12:21 +0530

varun.gupta – 1 file(s) modified
Added Most Compared index generation to content generation process

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 5314 – Class to generate index of most compared products

varun.gupta — Tue, 29 May 2012 15:11:09 +0530

varun.gupta – 1 file(s) modified
Class to generate index of most compared products

+ /trunk/ContentStore/src/main/java/in/shop2020/util/MostComparedIndexGenerator.java

Rev 5313 – Trac#1312 Added method to extract current inventory in a warehouse ...

mandeep.dhir — Tue, 29 May 2012 14:30:54 +0530

mandeep.dhir – 7 file(s) modified
Trac#1312 Added method to extract current inventory in a warehouse
Reviewer: Rajveer

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /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
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5312 – If both offer text and coupon texts are found, we ...

amit.gupta — Tue, 29 May 2012 14:18:14 +0530

amit.gupta – 1 file(s) modified
If both offer text and coupon texts are found, we should show only offer text for junglee offers.
as discussed with abhishek mathur.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5311 – #1275: Suggested Accessories not coming for Sony ericsson Xperia Neo ...

amit.gupta — Tue, 29 May 2012 14:16:38 +0530

amit.gupta – 1 file(s) modified
#1275: Suggested Accessories not coming for Sony ericsson Xperia Neo V MT11i.
Reviewer : rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AccessoriesFinder.java