Merge pull request #15 from landofcoder/fix-issues-on-magento-246

Fix issues on magento 246

Author: landofcoder

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Version 1.0.3 - 06/12/2023
+- Fix issues 13, 14
+- Compatible magento 2.4.6, PHP 8.1

Controller/Adminhtml/Configurable.php

@@ -45,8 +45,7 @@ abstract class Configurable extends \Magento\Backend\App\Action
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry
-    )
-    {
+    ) {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);
     }

Controller/Adminhtml/Configurable/Authorize.php

@@ -51,7 +51,7 @@ class Authorize extends \Lof\Mautic\Controller\Adminhtml\Configurable
     protected $resultPageFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Lof\Mautic\Helper\Data $helper
      * @param \Lof\Mautic\Model\Mautic $webhookSetup
@@ -60,15 +60,14 @@ class Authorize extends \Lof\Mautic\Controller\Adminhtml\Configurable
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
+        \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Lof\Mautic\Helper\Data $helper,
         \Lof\Mautic\Model\Mautic $webhookSetup,
         \Magento\Framework\DB\Transaction $dbTransaction,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
-    )
-    {
+    ) {
 
         parent::__construct($context, $coreRegistry);
 
@@ -79,6 +78,9 @@ public function __construct(
         $this->resultPageFactory = $resultPageFactory;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function execute()
     {
         $version = $this->getRequest()->getParam('version');

Controller/Webhook/Index.php

@@ -111,7 +111,7 @@ public function execute() {
             //$this->logger->info($rawData);
             if ($flag) {
                 // @todo Process the $requestData as needed
-                $requestData = json_decode($rawData);
+                $requestData = json_decode($rawData, true);
                 $changedData = isset($requestData["mautic.lead_channel_subscription_changed"]) ? $requestData["mautic.lead_channel_subscription_changed"] : [];
                 //$oldStatus = isset($changedData['old_status']) ? $changedData['old_status']: "";//unsubscribed, contactable
                 $newStatus = isset($changedData['new_status']) ? $changedData['new_status']: "";//contactable, unsubscribed

Lib/Api.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @copyright   2014 Mautic, NP. All rights reserved.
+ * @author      Mautic
+ *
+ * @see        http://mautic.org
+ *
+ * @license     MIT http://opensource.org/licenses/MIT
+ */
+
+namespace Lof\Mautic\Lib;
+
+/**
+ * Base API class.
+ */
+class Api extends \Mautic\Api\Api
+{
+    /**
+     * Set the base URL for API endpoints.
+     *
+     * @param string $url
+     *
+     * @return $this
+     */
+    public function setBaseUrl($url)
+    {
+        $url = $url ? $url : "";
+        if ('/' != @substr($url, -1)) {
+            $url .= '/';
+        }
+
+        if ('api/' != @substr($url, -4, 4)) {
+            $url .= 'api/';
+        }
+
+        $this->baseUrl = $url;
+
+        return $this;
+    }
+}

Ui/Component/Listing/Column/StageName.php

@@ -78,7 +78,7 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as &$item) {
                 if (isset($item['stage'])) {
-                    $stage = $item['stage'] ? json_decode($item['stage']): [];
+                    $stage = $item['stage'] ? json_decode($item['stage'], true): [];
                     $item[$fieldName."_html"] = $stage ? "<strong>".$stage["name"].'</strong><br/><span class="small-text">'. __("(weight: %1)", $stage["weight"]).'</span>' : "";
                 }
             }

Ui/Component/Listing/Column/TagsName.php

@@ -78,7 +78,7 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as &$item) {
                 if (isset($item['tags'])) {
-                    $tags = $item['tags'] ? json_decode($item['tags']): [];
+                    $tags = $item['tags'] ? json_decode($item['tags'], true): [];
                     $newTags = [];
                     foreach ($tags as $_tag) {
                         $newTags[] = $_tag->tag;

composer.json

@@ -6,7 +6,7 @@
         "landofcoder/module-all" : "1.*"
     },
     "type": "magento2-module",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "keywords": [
         "landofcoder",
         "magento 2 mautic",

etc/di.xml

@@ -3,6 +3,7 @@
 	<preference for="Lof\Mautic\Api\ContactRepositoryInterface" type="Lof\Mautic\Model\ContactRepository"/>
 	<preference for="Lof\Mautic\Api\Data\ContactInterface" type="Lof\Mautic\Model\Contact"/>
 	<preference for="Lof\Mautic\Api\Data\ContactSearchResultsInterface" type="Magento\Framework\Api\SearchResults"/>
+    <preference for="Mautic\Api\Api" type="Lof\Mautic\Lib\Api"/>
 	<virtualType name="Lof\Mautic\Model\ResourceModel\Contact\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
 		<arguments>
 			<argument name="mainTable" xsi:type="string">lof_mautic_contact</argument>
@@ -53,7 +54,7 @@
             </argument>
         </arguments>
     </type>
-    
+
     <type name="Magento\Customer\Model\AccountManagement">
         <plugin name="mautic-abandoned-checkout-save-quote" type="Lof\Mautic\Model\Plugin\AccountManagement" sortOrder="10"/>
     </type>