SmartDukaan – /

Rev 3374 – Added GenericService and isAlive call in this service. Extended other ...

rajveer — Tue, 20 Sep 2011 13:06:51 +0530

rajveer – 21 file(s) modified
Added GenericService and isAlive call in this service. Extended other services from this service.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /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/payments/PaymentService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
+ /trunk/ThriftGen/thriftsrc/GenericService
+ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3373 – Trac#488 Creating thrift clients before every invocation BugFix - Updating ...

mandeep.dhir — Tue, 20 Sep 2011 11:08:26 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Creating thrift clients before every invocation
BugFix - Updating the lastReceivedTimestamp only when an email is successfully processed

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 3372 – Added three more handsets

varun.gupta — Mon, 19 Sep 2011 20:02:45 +0530

varun.gupta – 1 file(s) modified
Added three more handsets

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

Rev 3371 – Product access detail report.

vikas — Mon, 19 Sep 2011 19:05:19 +0530

vikas – 1 file(s) modified
Product access detail report.

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

Rev 3370 – fix a typo.

vikas — Mon, 19 Sep 2011 19:04:30 +0530

vikas – 2 file(s) modified
fix a typo.

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

Rev 3369 – Trac#488 Ignoring mails from mailor-daemon

mandeep.dhir — Mon, 19 Sep 2011 18:30:30 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ignoring mails from mailor-daemon

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java

Rev 3368 – Trac#488 Mime emails support date and not time precisions as ...

mandeep.dhir — Mon, 19 Sep 2011 18:21:14 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Mime emails support date and not time precisions as IMAP search commands do not accept them.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 3367 – Updated solr script to start solr with jmx.

rajveer — Mon, 19 Sep 2011 18:18:03 +0530

rajveer – 1 file(s) modified
Updated solr script to start solr with jmx.

~ /trunk/runutils/start-solr-service.sh

Rev 3366 – Added support to refund COD orders till the time they ...

chandranshu — Mon, 19 Sep 2011 17:28:43 +0530

chandranshu – 2 file(s) modified
Added support to refund COD orders till the time they are shipped

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 3365 – Added a test for getting all items

chandranshu — Mon, 19 Sep 2011 17:28:12 +0530

chandranshu – 1 file(s) modified
Added a test for getting all items

~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py

Rev 3364 – Added inventory stock report to the reports dashboard

chandranshu — Mon, 19 Sep 2011 16:41:35 +0530

chandranshu – 4 file(s) modified
Added inventory stock report to the reports dashboard

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/utils/FileUtils.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/stock-reports-index.vm

Rev 3363 – Added expected delay and preferred warehouse to the new item ...

chandranshu — Mon, 19 Sep 2011 13:56:59 +0530

chandranshu – 1 file(s) modified
Added expected delay and preferred warehouse to the new item created for item update

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 3362 – Updated the check which ensures that the updates are sent ...

chandranshu — Mon, 19 Sep 2011 13:43:18 +0530

chandranshu – 1 file(s) modified
Updated the check which ensures that the updates are sent to server only if something has changed

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 3361 – Corrected the type of preferred warehouse from long to string

chandranshu — Mon, 19 Sep 2011 13:15:41 +0530

chandranshu – 4 file(s) modified
Corrected the type of preferred warehouse from long to string

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

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 3359 – Adding support for Chaitnaya to adjust the delivery estimate and ...

chandranshu — Mon, 19 Sep 2011 12:47:30 +0530

chandranshu – 10 file(s) modified
Adding support for Chaitnaya to adjust the delivery estimate and set the preferred warehouse

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.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/ItemDetails.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /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/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3358 – Added support to delete a special page. Also fixed small ...

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

rajveer – 3 file(s) modified
Added support to delete a special page. Also fixed small ui issue.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-index.vm

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 3356 – Added support to delete a special page from bdb

rajveer — Mon, 19 Sep 2011 12:27:44 +0530

rajveer – 2 file(s) modified
Added support to delete a special page from bdb

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java

Rev 3355 – Added support to manipulate the estimate of an item's delivery

chandranshu — Mon, 19 Sep 2011 12:06:34 +0530

chandranshu – 11 file(s) modified
Added support to manipulate the estimate of an item's delivery

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /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/impl/InventoryServiceHandler.py
~ /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/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3354 – Started logging all messages instead of just the push-to-prod ones ...

chandranshu — Mon, 19 Sep 2011 11:39:17 +0530

chandranshu – 2 file(s) modified
Started logging all messages instead of just the push-to-prod ones and started rolling the log files daily

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/log4j.properties

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 3352 – Trac#488 Adding support for assembly plugin

mandeep.dhir — Mon, 19 Sep 2011 11:15:29 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Adding support for assembly plugin

~ /trunk/Crm/pom.xml

Rev 3351 – M-5445, M-5570, M-6200 removed from effect of this coupon

varun.gupta — Sat, 17 Sep 2011 07:27:25 +0530

varun.gupta – 1 file(s) modified
M-5445, M-5570, M-6200 removed from effect of this coupon

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

Rev 3350 – Added non-active items and made brands import dynamic

varun.gupta — Fri, 16 Sep 2011 20:23:30 +0530

varun.gupta – 2 file(s) modified
Added non-active items and made brands import dynamic

~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py

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 3348 – Added method to retrieve brands for a given category

varun.gupta — Fri, 16 Sep 2011 20:18:04 +0530

varun.gupta – 6 file(s) modified
Added method to retrieve brands for a given category

~ /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 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 3345 – Removed the risky item check when an item is marked ...

chandranshu — Fri, 16 Sep 2011 18:29:12 +0530

chandranshu – 1 file(s) modified
Removed the risky item check when an item is marked as risky on staging

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

Rev 3344 – script to deplot GAE project.

vikas — Fri, 16 Sep 2011 17:11:03 +0530

vikas – 1 file(s) modified
script to deplot GAE project.

+ /trunk/runutils/deploy-gae.sh

Rev 3343 – Add Total row.

vikas — Fri, 16 Sep 2011 15:41:38 +0530

vikas – 1 file(s) modified
Add Total row.

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

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 3341 – Fix a bug. Check for only orderd that are delivered ...

vikas — Fri, 16 Sep 2011 14:06:46 +0530

vikas – 1 file(s) modified
Fix a bug. Check for only orderd that are delivered successfully.

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

Rev 3340 – Trac#488 Creating CRM client again at the end before updating ...

mandeep.dhir — Fri, 16 Sep 2011 12:45:46 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Creating CRM client again at the end before updating last updated timestamp

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java

Rev 3339 – Trac#488 - Added support for Inbox scan of ...

mandeep.dhir — Fri, 16 Sep 2011 12:17:21 +0530

mandeep.dhir – 35 file(s) modified
Trac#488
- Added support for Inbox scan of help@shop2020.in account and creating tickets for them
- Added support for creating tickets/activities for unregistered users

+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /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/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.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/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
~ /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/persistence/ActivityMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3338 – Now outputting the Social data logs

varun.gupta — Thu, 15 Sep 2011 20:12:11 +0530

varun.gupta – 1 file(s) modified
Now outputting the Social data logs

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/ShowSocialDataLog.java

Rev 3337 – Added event type to track BlackBerry Campaign

varun.gupta — Thu, 15 Sep 2011 19:42:40 +0530

varun.gupta – 1 file(s) modified
Added event type to track BlackBerry Campaign

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

Rev 3336 – Added logging to track BlackBerry campaign

varun.gupta — Thu, 15 Sep 2011 19:33:59 +0530

varun.gupta – 1 file(s) modified
Added logging to track BlackBerry campaign

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/CommunityPromotionController.java

Rev 3335 – Added a new parameter to the config server to be ...

chandranshu — Thu, 15 Sep 2011 19:32:14 +0530

chandranshu – 2 file(s) modified
Added a new parameter to the config server to be used by the inventory history server to connect to the local database

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py