Merge branch 'develop' into bugfix/MAGE-792

Author: cammonro

Model/Indexer/CategoryObserver.php

@@ -54,6 +54,11 @@ public function afterSave(
         CategoryResourceModel $result,
         CategoryModel $category
     ) {
+        if (!$this->configHelper->getApplicationID()
+            || !$this->configHelper->getAPIKey()
+            || !$this->configHelper->getSearchOnlyAPIKey()) {
+            return $result;
+        }
         $categoryResource->addCommitCallback(function () use ($category) {
             $collectionIds = [];
             // To reduce the indexing operation for products, only update if these values have changed

view/adminhtml/templates/merchandising/page.phtml

@@ -26,8 +26,11 @@
     </div>
 </div>
 <section class="algoliasearch-merchandising-banner clearfix">
-    <div class="algolia_dashboard_warning std description" style="background-position: 25px 7px; padding: 20px 20px 20px 90px;">
-        <strong><?php echo $block->escapeHtml(__('We recommend using Merchandising Studio if it is available in your plan.')) ?></strong>
+    <div class="algolia_dashboard_warning std description" style="background-position: 25px 20px; padding: 20px 20px 20px 90px;">
+        <?php echo $block->escapeHtml(__('We recommend using ')) ?><a href="https://www.algolia.com/industries-and-solutions/ecommerce/digital-merchandising/"><?php echo $block->escapeHtml(__('Merchandising Studio ')) ?></a>
+            <?php echo $block->escapeHtml(__('if you’re on a ')) ?><a href="https://www.algolia.com/pricing/"><?php echo $block->escapeHtml(__('Premium plan.')) ?></a>
+            <?php echo $block->escapeHtml(__('While the legacy merchandising capabilities within the Magento extension shall remain for now, we strongly advice that users ')) ?><a href="https://www.algolia.com/doc/integration/magento-2/merchandising/merchandising-studio/?client=php"><?php echo $block->escapeHtml(__('become familiar with this powerful new tool')) ?></a>
+            <?php echo $block->escapeHtml(__('to truly unlock the potential of Algolia.')) ?>
     </div>
 </section>
 <section class="algoliasearch-merchandising-options clearfix">