SmartDukaan – /

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

Rev 3334 – Changed the log file name

chandranshu — Thu, 15 Sep 2011 19:26:04 +0530

chandranshu – 1 file(s) modified
Changed the log file name

~ /trunk/runutils/start-inventory-history-service.sh

Rev 3333 – Renamed the Price Comparison UI Server name

varun.gupta — Thu, 15 Sep 2011 19:14:00 +0530

varun.gupta – 1 file(s) modified
Renamed the Price Comparison UI Server name

~ /trunk/runutils/start-price-comparison-server.sh

Rev 3332 – :q

varun.gupta — Thu, 15 Sep 2011 18:55:43 +0530

varun.gupta – 1 file(s) modified
:q

x /trunk/PriceComparisonFramework/src/WebUI/Server.py

Rev 3331 – Renamed Price Comparison UI Server

varun.gupta — Thu, 15 Sep 2011 18:55:00 +0530

varun.gupta – 1 file(s) modified
Renamed Price Comparison UI Server

+ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py (copied from /trunk/PriceComparisonFramework/src/WebUI/Server.py@3313)

Rev 3330 – Separate script to update the catalog

chandranshu — Thu, 15 Sep 2011 18:51:00 +0530

chandranshu – 1 file(s) modified
Separate script to update the catalog

+ /trunk/runutils/update-catalog.sh

Rev 3329 – Added caching in special page controller.

rajveer — Thu, 15 Sep 2011 18:47:47 +0530

rajveer – 1 file(s) modified
Added caching in special page controller.

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

Rev 3328 – Added support to copy the catalog dump to the support ...

chandranshu — Thu, 15 Sep 2011 18:47:30 +0530

chandranshu – 1 file(s) modified
Added support to copy the catalog dump to the support machine

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 3327 – Updated the Support section in the service config file for ...

chandranshu — Thu, 15 Sep 2011 16:58:50 +0530

chandranshu – 1 file(s) modified
Updated the Support section in the service config file for connecting to the local catalog server

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3326 – Added support to update the inventory history and inventory snapshot ...

chandranshu — Thu, 15 Sep 2011 16:52:52 +0530

chandranshu – 1 file(s) modified
Added support to update the inventory history and inventory snapshot on different machines

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

Rev 3325 – Added support to update the inventory history and inventory snapshot ...

chandranshu — Thu, 15 Sep 2011 16:52:07 +0530

chandranshu – 3 file(s) modified
Added support to update the inventory history and inventory snapshot on different machines

~ /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/InventoryHistoryServer.py

Rev 3324 – Added host and port configuration to run the inventory history ...

chandranshu — Thu, 15 Sep 2011 16:49:49 +0530

chandranshu – 2 file(s) modified
Added host and port configuration to run the inventory history server

~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3323 – Added a method to update item inventory history

chandranshu — Thu, 15 Sep 2011 16:47:48 +0530

chandranshu – 4 file(s) modified
Added a method to update item inventory history

~ /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 3322 – Added a script to start the inventory history server

chandranshu — Thu, 15 Sep 2011 16:46:48 +0530

chandranshu – 1 file(s) modified
Added a script to start the inventory history server

+ /trunk/runutils/start-inventory-history-service.sh

Rev 3321 – Added two new brands.

rajveer — Thu, 15 Sep 2011 16:32:15 +0530

rajveer – 1 file(s) modified
Added two new brands.

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

Rev 3320 – Modifications in special page controllers

rajveer — Thu, 15 Sep 2011 16:31:46 +0530

rajveer – 3 file(s) modified
Modifications in special page controllers

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java

Rev 3319 – Added group by clause to the query for out of ...

chandranshu — Thu, 15 Sep 2011 16:03:34 +0530

chandranshu – 1 file(s) modified
Added group by clause to the query for out of stock items

~ /trunk/runutils/NextDayDeliverableItemsReporter.sh

Rev 3318 – Ensured that the item stock reporting script can send email ...

chandranshu — Thu, 15 Sep 2011 15:33:50 +0530

chandranshu – 1 file(s) modified
Ensured that the item stock reporting script can send email to a single address as well

~ /trunk/runutils/NextDayDeliverableItemsReporter.sh

Rev 3317 – Ensured that the item stock reporting script has to send ...

chandranshu — Thu, 15 Sep 2011 15:32:01 +0530

chandranshu – 1 file(s) modified
Ensured that the item stock reporting script has to send a single email with all the attachments

~ /trunk/runutils/NextDayDeliverableItemsReporter.sh

Rev 3316 – Added support to send multiple attachments to multiple people at ...

chandranshu — Thu, 15 Sep 2011 15:15:44 +0530

chandranshu – 1 file(s) modified
Added support to send multiple attachments to multiple people at the same time

~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py

Rev 3315 – Changes to affilate report as per Satya.

vikas — Thu, 15 Sep 2011 15:06:29 +0530

vikas – 2 file(s) modified
Changes to affilate report as per Satya.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm

Rev 3314 – Added support to handle Not Available situations.

rajveer — Thu, 15 Sep 2011 14:45:24 +0530

rajveer – 2 file(s) modified
Added support to handle Not Available situations.

~ /trunk/ContentStore/src/jython/comparisonrules/physical_attributes_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedBullet.java

Rev 3313 – Added more sources

varun.gupta — Thu, 15 Sep 2011 12:25:39 +0530

varun.gupta – 7 file(s) modified
Added more sources

~ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
+ /trunk/PriceComparisonFramework/src/PyLucene/IndexManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/Server.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3312 – Just added a javascript check when people leave captcha empty. ...

chandranshu — Thu, 15 Sep 2011 12:06:35 +0530

chandranshu – 4 file(s) modified
Just added a javascript check when people leave captcha empty. Added a friendlier message on the shipping page when the location is not serviceable. Deleted the long obsolete HdfcPayController

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3311 – Changed the logger class name

chandranshu — Thu, 15 Sep 2011 11:56:24 +0530

chandranshu – 2 file(s) modified
Changed the logger class name

~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java

Rev 3310 – Added NPE check.

rajveer — Thu, 15 Sep 2011 11:45:28 +0530

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

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

Rev 3309 – send notification if item is active.

rajveer — Thu, 15 Sep 2011 11:36:49 +0530

rajveer – 1 file(s) modified
send notification if item is active.

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

Rev 3308 – Rule for DesiDime campaign added

varun.gupta — Wed, 14 Sep 2011 21:11:03 +0530

varun.gupta – 1 file(s) modified
Rule for DesiDime campaign added

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

Rev 3307 – Correctrd FB App ID

varun.gupta — Wed, 14 Sep 2011 20:04:18 +0530

varun.gupta – 1 file(s) modified
Correctrd FB App ID

~ /trunk/Social/src/main/webapp/js/bb-promo.js

Rev 3306 – Added note and some CSS styles

varun.gupta — Wed, 14 Sep 2011 19:59:37 +0530

varun.gupta – 3 file(s) modified
Added note and some CSS styles

~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/js/bb-promo.js
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 3305 – Added GA event on helpdocs click.

rajveer — Wed, 14 Sep 2011 19:48:51 +0530

rajveer – 1 file(s) modified
Added GA event on helpdocs click.

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

Rev 3304 – Updated URI and some changes in vm file.

rajveer — Wed, 14 Sep 2011 19:33:53 +0530

rajveer – 3 file(s) modified
Updated URI and some changes in vm file.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 3303 – Added our own mapper so that we can map all ...

rajveer — Wed, 14 Sep 2011 18:59:02 +0530

rajveer – 5 file(s) modified
Added our own mapper so that we can map all our special pages to SpecialPageController.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 3302 – Features enabling Sharing are added

varun.gupta — Wed, 14 Sep 2011 18:30:59 +0530

varun.gupta – 3 file(s) modified
Features enabling Sharing are added

~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/js/bb-promo.js
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 3301 – One more color added for BB Curve 8520

varun.gupta — Wed, 14 Sep 2011 17:33:03 +0530

varun.gupta – 1 file(s) modified
One more color added for BB Curve 8520

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

Rev 3300 – 'Tell a friend' hidden

varun.gupta — Wed, 14 Sep 2011 17:29:27 +0530

varun.gupta – 1 file(s) modified
'Tell a friend' hidden

~ /trunk/Social/src/main/webapp/css/community-promotion.css