Changes after QA test

ihorvansach · ihorvansach · commit 656ff6250f0a · 2018-02-10T11:48:43.000+02:00
diff --git a/Block/Adminhtml/System/Config/Form/Info.php b/Block/Adminhtml/System/Config/Form/Info.php
@@ -43,7 +43,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     {
         $m = $this->moduleList->getOne($this->getModuleName());
         $html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">
-            Blog Extension v' . $m['setup_version'] . ' was developed by <a href="http://magefan.com/" target="_blank">MageFan</a>.
+            Blog Extension v' . $m['setup_version'] . ' was developed by <a href="https://magefan.com?utm_source=m2admin_blog_config&utm_medium=link&utm_campaign=regular" target="_blank">Magefan</a>.
         </div>';
 
         return $html;
diff --git a/Block/Adminhtml/System/Config/Form/UpdateInfo.php b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
@@ -21,33 +21,56 @@ class UpdateInfo extends \Magento\Backend\Block\Template
     const PATH_TO_JSON_FILE = 'https://magefan.com/media/product-versions.json';
     const LATESTS_VERSION_CACHE_KEY = 'magefan_latests_product_versions';
 
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
     protected $curlClient;
-    protected $_moduleList;
+
+    /**
+     * @var ModuleListInterface
+     */
+    protected $moduleList;
+
+    /**
+     * @var mixed
+     */
     protected $latestVersion;
+
+    /**
+     * @var mixed
+     */
     protected $currentVersion;
+
+    /**
+     * @var AdminNotificationFeed
+     */
     protected $adminNotificationFeed;
+
+    /**
+     * @var \Magento\Framework\App\CacheInterface
+     */
     protected $cacheManager;
 
     /**
      * UpdateInfo constructor.
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\HTTP\Client\Curl $curl
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param AdminNotificationFeed $adminNotificationFeed
      * @param ModuleListInterface $moduleList
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\App\CacheInterface $cacheManager,
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\HTTP\Client\Curl $curl,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         AdminNotificationFeed $adminNotificationFeed,
         ModuleListInterface $moduleList,
         array $data = []
     ) {
-        $this->cacheManager = $cacheManager;
+        $this->cacheManager = $context->getCache();
         $this->adminNotificationFeed = $adminNotificationFeed;
-        $this->_moduleList = $moduleList;
+        $this->moduleList = $moduleList;
         $this->jsonHelper = $jsonHelper;
         $this->curlClient = $curl;
         parent::__construct($context, $data);
@@ -59,7 +82,7 @@ public function __construct(
     public function getCurrentVersion()
     {
         if (null === $this->currentVersion) {
-            $this->currentVersion = $this->_moduleList
+            $this->currentVersion = $this->moduleList
                 ->getOne($this->getModuleName())['setup_version'];
         }
 
diff --git a/view/adminhtml/layout/blog_category_grid.xml b/view/adminhtml/layout/blog_category_grid.xml
@@ -10,7 +10,6 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <update handle="blog_category_grid_block"/>
-    <update handle="blog_update_info"/>
     <container name="root">
         <block class="Magento\Backend\Block\Widget\Grid\Container" name="blog.category.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
     </container>
diff --git a/view/adminhtml/layout/blog_category_index.xml b/view/adminhtml/layout/blog_category_index.xml
@@ -9,8 +9,8 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="formkey"/>
-    <update handle="blog_category_grid_block"/>
     <update handle="blog_update_info"/>
+    <update handle="blog_category_grid_block"/>
     <body>
         <referenceContainer name="content">
             <block class="Magefan\Blog\Block\Adminhtml\Category" name="blog.category.container"/>
diff --git a/view/adminhtml/layout/blog_comment_grid.xml b/view/adminhtml/layout/blog_comment_grid.xml
@@ -10,7 +10,6 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <update handle="blog_comment_grid_block"/>
-    <update handle="blog_update_info"/>
     <container name="root">
         <block class="Magento\Backend\Block\Widget\Grid\Container" name="blog.comment.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
     </container>
diff --git a/view/adminhtml/layout/blog_comment_index.xml b/view/adminhtml/layout/blog_comment_index.xml
@@ -9,8 +9,8 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="formkey"/>
-    <update handle="blog_comment_grid_block"/>
     <update handle="blog_update_info"/>
+    <update handle="blog_comment_grid_block"/>
     <body>
         <referenceContainer name="content">
             <block class="Magefan\Blog\Block\Adminhtml\Comment" name="blog.comment.container"/>
diff --git a/view/adminhtml/layout/blog_post_grid.xml b/view/adminhtml/layout/blog_post_grid.xml
@@ -10,7 +10,6 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <update handle="blog_post_grid_block"/>
-    <update handle="blog_update_info"/>
     <container name="root">
         <block class="Magento\Backend\Block\Widget\Grid\Container" name="blog.post.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
     </container>
diff --git a/view/adminhtml/templates/import.phtml b/view/adminhtml/templates/import.phtml
@@ -50,7 +50,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-joomla-to-magento2')">
+                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-joomla-to-magento2?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <img class="img" src="<?= $block->escapeUrl($this->getViewFileUrl('Magefan_Blog::images/joomla.jpg')) ?>" />
                             <br/>
                             <span class="lable">Import from Joomla<br/><br/></span>
@@ -63,7 +63,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-blogger-to-magento2')">
+                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-blogger-to-magento2?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <img class="img" src="<?= $block->escapeUrl($this->getViewFileUrl('Magefan_Blog::images/bloger.jpg')) ?>" />
                             <br/>
                             <span class="lable">Import from Blogger.com<br/><br/></span>
@@ -78,7 +78,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-drupal-to-magento2')">
+                        <div class="itm-hld" onclick="window.open('https://magefan.com/migrate-drupal-to-magento2?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <img class="img" src="<?= $block->escapeUrl($this->getViewFileUrl('Magefan_Blog::images/drupal.jpg')) ?>" />
                             <br/>
                             <span class="lable">Import from Drupal<br/><br/></span>
@@ -91,7 +91,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('https://magefan.com/import-xml-csv-to-magento2-blog')">
+                        <div class="itm-hld" onclick="window.open('https://magefan.com/import-xml-csv-to-magento2-blog?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <img class="img" src="<?= $block->escapeUrl($this->getViewFileUrl('Magefan_Blog::images/csv.jpg')) ?>" />
                             <br/>
                             <span class="lable">Import from CSV File<br/><br/></span>
@@ -104,7 +104,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('https://magefan.com/import-xml-csv-to-magento2-blog')">
+                        <div class="itm-hld" onclick="window.open('https://magefan.com/import-xml-csv-to-magento2-blog?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <img class="img" src="<?= $block->escapeUrl($this->getViewFileUrl('Magefan_Blog::images/xml.jpg')) ?>" />
                             <br/>
                             <span class="lable">Import from XML File<br/><br/></span>
@@ -117,7 +117,7 @@
             <table>
                 <tr>
                     <td>
-                        <div class="itm-hld" onclick="window.open('http://magefan.com/contact/')">
+                        <div class="itm-hld" onclick="window.open('http://magefan.com/contact?utm_source=m2admin_blog_import&utm_medium=link&utm_campaign=regular')">
                             <h2 class="img more">Need More?<br/><br/>Other CMS or Extension</h2>
                             <span class="lable">Contact Magefan Team<br/><br/></span>
                         </div>
diff --git a/view/adminhtml/templates/updateinfo.phtml b/view/adminhtml/templates/updateinfo.phtml
@@ -17,7 +17,7 @@
     <div class="messages">
         <div class="message message-notice notice">
             <div data-ui-id="messages-message-error">
-               <?php $html = __('Important: It is recommended to update Blog Extension to the version %1. You can update it via composer or download the new versions archive from <a href="https://magefan.com/magento2-blog-extension?utm_source=update_blog_info_block_in_adminp&utm_medium=link1&utm_campaign=new_blog_version" target="_blank">Magefan Store</a>. Please <a href="https://magefan.com/contact?utm_source=update_blog_info_block_in_adminp&utm_medium=link2&utm_campaign=new_blog_version" target="_blank">contact</a> Magefan Team if you have any questions or need help with an update.', $block->getLatestVersion());
+               <?php $html = __('Your Blog Extension is out of date. You can update it to the <strong>version %1</strong> via composer or you can download the new version archive from the <a href="https://magefan.com/magento2-blog-extension?utm_source=m2admin_blog_updateinfo&utm_medium=link1&utm_campaign=new_blog_version" target="_blank">Magefan Store</a>. Please <a href="https://magefan.com/contact?utm_source=m2admin_blog_updateinfo&utm_medium=link2&utm_campaign=new_blog_version" target="_blank">contact</a> Magefan Team if you have any questions or need help with an update.', $block->getLatestVersion());
                ?>
                 <?= $html ?>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele`
`43`	`43`	`{`
`44`	`44`	`$m = $this->moduleList->getOne($this->getModuleName());`
`45`	`45`	`$html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">`
`46`		`- Blog Extension v' . $m['setup_version'] . ' was developed by <a href="http://magefan.com/" target="_blank">MageFan</a>.`
	`46`	`+ Blog Extension v' . $m['setup_version'] . ' was developed by <a href="https://magefan.com?utm_source=m2admin_blog_config&utm_medium=link&utm_campaign=regular" target="_blank">Magefan</a>.`
`47`	`47`	`</div>';`
`48`	`48`
`49`	`49`	`return $html;`