Merge branch 'develop' into release/1.10.0

dotmailer · Mar 8, 2024 · afbd604 · afbd604
2 parents ce29605 + 3bda158
commit afbd604
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 37 deletions.
diff --git a/Block/Adminhtml/Config/Settings/ConfigureTeamsButton.php b/Block/Adminhtml/Config/Settings/ConfigureTeamsButton.php
diff --git a/CustomerData/Chat.php b/CustomerData/Chat.php
@@ -7,12 +7,13 @@
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\UrlInterface;
 use Dotdigitalgroup\Email\Helper\Data;
 use Magento\TestFramework\Event\Magento;
 
-class Chat implements SectionSourceInterface
+class Chat implements SectionSourceInterface, ArgumentInterface
 {
  /**
  * @var Config

diff --git a/Model/Config.php b/Model/Config.php
@@ -23,7 +23,6 @@ class Config
  public const XML_PATH_LIVECHAT_API_HOST = 'chat_api_credentials/settings/api_host';
  public const XML_PATH_LIVECHAT_API_TOKEN = 'chat_api_credentials/credentials/api_token';
  public const CHAT_PORTAL_URL = 'WebChat';
- public const CHAT_CONFIGURE_TEAM_PATH = 'team/users/all';
  public const CHAT_CONFIGURE_WIDGET_PATH = 'account/chat-settings';
  public const MAGENTO_PROFILE_CALLBACK_ROUTE = 'ec_chat/profile?isAjax=true';
 
@@ -201,17 +200,6 @@ public function getChatPortalUrl(): string
  return $this->emailConfig->getRegionAwarePortalUrl() . self::CHAT_PORTAL_URL;
  }
 
- /**
- * Get configuration chat team url
- *
- * @return string
- * @throws LocalizedException
- */
- public function getConfigureChatTeamUrl(): string
- {
- return $this->emailConfig->getRegionAwarePortalUrl() . self::CHAT_CONFIGURE_TEAM_PATH;
- }
-
  /**
  * Get configuration chat widget url
  *

diff --git a/README.md b/README.md
@@ -12,6 +12,12 @@
 
 ## Changelog
 
+### 1.10.0
+
+##### Improvements
+- The 'Configure Chat Teams' button on Dotdigital > Chat Settings has been removed.
+- The `CustomerData\Chat` class can now be used as a view model (for Hyvä Themes).
+
 ### 1.9.0
 
 ##### Improvements

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
  "name": "dotdigital/dotdigital-magento2-extension-chat",
  "description": "Dotdigital for Magento 2: Chat module",
  "type": "magento2-module",
- "version": "1.9.0",
+ "version": "1.10.0",
  "license": "MIT",
  "repositories": [
  {

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -22,13 +22,7 @@
  <field id="enabled">1</field>
  </depends>
  <frontend_model>Dotdigitalgroup\Chat\Block\Adminhtml\Config\Settings\ConfigureWidgetButton</frontend_model>
- </field>
- <field id="configure_chat_teams" translate="label" sortOrder="13" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Configure Chat Teams</label>
- <depends>
- <field id="enabled">1</field>
- </depends>
- <frontend_model>Dotdigitalgroup\Chat\Block\Adminhtml\Config\Settings\ConfigureTeamsButton</frontend_model>
+ <comment><![CDATA[Learn how to set up Chat by reading our <a href="https://support.dotdigital.com/en/articles/8409160-set-up-chat-in-magento-open-source-and-adobe-commerce" target="_blank">Help Centre</a> articles.]]></comment>
  </field>
  </group>
  </section>