Fix jquery timing issue. Class changes for Magento 2 convention.

Author: Paul Bosselaar

Api/Data/HealthCheckInterface.php

@@ -36,15 +36,15 @@ public function getPluginVersion();
 
     /**
      * @api
-     * @param array $features
+     * @param string[] $features
      * @return $this
      */
     public function setFeatures(array $features);
 
 
     /**
      * @api
-     * @return array
+     * @return string[]
      */
     public function getFeatures();
 }

Service/HealthCheckServiceInterface.php renamed to Api/HealthCheckRepositoryInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace MailPlus\MailPlus\Service;
+namespace MailPlus\MailPlus\Api;
 
-interface HealthCheckServiceInterface
+interface HealthCheckRepositoryInterface
 {
     /**
      * @return \MailPlus\MailPlus\Api\Data\HealthCheckInterface

Api/ProductImageRepositoryInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace MailPlus\MailPlus\Api;
+
+
+interface ProductImageRepositoryInterface
+{
+    /**
+     * Get productImage listMailPlus\MailPlus\Service\HealthCheckRepositoryMailPlus\MailPlus\Service\HealthCheckRepositoryMailPlus\MailPlus\Service\HealthCheckRepository
+     *
+     * Should never return as it does a redirect to the image
+     *
+     * @param int $productId
+     * @param int $storeId
+     * @return void
+     */
+    public function get(int $productId, int $storeId);
+}

Model/HealthCheck.php

@@ -8,7 +8,7 @@ class HealthCheck implements \MailPlus\MailPlus\Api\Data\HealthCheckInterface
     private $magento2Version;
     /** @var string $pluginVersion */
     private $pluginVersion;
-    /** @var array $features */
+    /** @var string[] $features */
     private $features;
 
     /**
@@ -48,7 +48,7 @@ public function getPluginVersion()
     }
 
     /**
-     * @param array $features
+     * @param string[] $features
      * @return $this
      */
     public function setFeatures(array $features)
@@ -58,7 +58,7 @@ public function setFeatures(array $features)
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getFeatures()
     {

Service/HealthCheckService.php renamed to Model/HealthCheckRepository.php

@@ -1,16 +1,17 @@
 <?php
 
-namespace MailPlus\MailPlus\Service;
+namespace MailPlus\MailPlus\Model;
 
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Module\ModuleListInterface;
 use MailPlus\MailPlus\Api\Data\HealthCheckInterface;
+use MailPlus\MailPlus\Api\HealthCheckRepositoryInterface;
 
-class HealthCheckService implements HealthCheckServiceInterface
+class HealthCheckRepository implements HealthCheckRepositoryInterface
 {
     const MODULE_NAME = 'MailPlus_MailPlus';
 
-    const FEATURES = [
+    private $features = [
         'IMAGE_FALLBACK'
     ];
 
@@ -45,7 +46,7 @@ public function get()
         $result = $this->healthCheckInterfaceFactory->create();
         $result->setMagento2Version($magento2Version)
             ->setPluginVersion($pluginVersion)
-            ->setFeatures(self::FEATURES);
+            ->setFeatures($this->features);
         return $result;
     }
 

Service/ProductImageService.php renamed to Model/ProductImageRepository.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace MailPlus\MailPlus\Service;
+namespace MailPlus\MailPlus\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Framework\Exception\NoSuchEntityException;
+use MailPlus\MailPlus\Api\ProductImageRepositoryInterface;
 
-class ProductImageService implements ProductImageServiceInterface
+class ProductImageRepository implements ProductImageRepositoryInterface
 {
     /** @var $productRepository ProductRepositoryInterface */
     private $productRepository;

README.md

@@ -2,7 +2,7 @@
 
 Connect your webshop to your MailPlus account.
 
-NOTE: This version is for Magento 2.2 or higher. Please use [version 1.3.3](https://github.com/SpotlerSoftware/magento2-mailplus-connector/releases/tag/v1.3.3) for Magento 2.1. A MailPlus eCom account is required to utilize the following features. 
+NOTE: This version is for Magento 2.2 or higher. Please use [version 1.3.4](https://github.com/SpotlerSoftware/magento2-mailplus-connector/releases/tag/v1.3.4) for Magento 2.1. A MailPlus eCom account is required to utilize the following features. 
 Please contact MailPlus to setup your account.
 
 ## Installation using composer

Service/ProductImageServiceInterface.php

@@ -18,13 +18,13 @@
 
     <preference for="MailPlus\MailPlus\Api\CatalogRuleRepositoryInterface"
                 type="MailPlus\MailPlus\Model\CatalogRuleRepository"/>
-    <preference for="MailPlus\MailPlus\Service\ProductImageServiceInterface"
-                type="MailPlus\MailPlus\Service\ProductImageService"/>
+    <preference for="MailPlus\MailPlus\Api\ProductImageRepositoryInterface"
+                type="MailPlus\MailPlus\Model\ProductImageRepository"/>
 
     <preference for="MailPlus\MailPlus\Api\Data\HealthCheckInterface"
                 type="MailPlus\MailPlus\Model\HealthCheck"/>
-    <preference for="MailPlus\MailPlus\Service\HealthCheckServiceInterface"
-                type="MailPlus\MailPlus\Service\HealthCheckService"/>
+    <preference for="MailPlus\MailPlus\Api\HealthCheckRepositoryInterface"
+                type="MailPlus\MailPlus\Model\HealthCheckRepository"/>
 
     <type name="Magento\Catalog\Api\ProductRepositoryInterface">
         <plugin name="Final price for product" type="MailPlus\MailPlus\Plugin\ProductRepositoryPlugin" sortOrder="1"/>

etc/di.xml

@@ -18,5 +18,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MailPlus_MailPlus" setup_version="1.4.4"/>
+    <module name="MailPlus_MailPlus" setup_version="1.4.5"/>
 </config>