Merge pull request #23 from magmodules/release/1.6.0

Release/1.6.0

Author: Marvin-Magmodules

Api/WebApi/RepositoryInterface.php

@@ -15,6 +15,11 @@
 interface RepositoryInterface
 {
 
+    /**
+     * @return mixed
+     */
+    public function getSettings(): array;
+
     /**
      * @param int $entityId
      * @return mixed

Model/WebApi/Repository.php

@@ -18,6 +18,7 @@
 use Magmodules\Reloadify\Service\WebApi\Product;
 use Magmodules\Reloadify\Service\WebApi\Profiles;
 use Magmodules\Reloadify\Service\WebApi\Review;
+use Magmodules\Reloadify\Service\WebApi\Settings;
 use Magmodules\Reloadify\Service\WebApi\Variants;
 
 /**
@@ -58,6 +59,10 @@ class Repository implements RepositoryInterface
      * @var Variants
      */
     private $variants;
+    /**
+     * @var Settings
+     */
+    private $settings;
     /**
      * @var RequestInterface
      */
@@ -70,16 +75,17 @@ class Repository implements RepositoryInterface
     /**
      * Repository constructor.
      *
-     * @param Category         $category
-     * @param Product          $product
-     * @param Language         $language
-     * @param Profiles         $profiles
-     * @param Order            $order
-     * @param Cart             $cart
-     * @param Review           $review
-     * @param Variants         $variants
+     * @param Category $category
+     * @param Product $product
+     * @param Language $language
+     * @param Profiles $profiles
+     * @param Order $order
+     * @param Cart $cart
+     * @param Review $review
+     * @param Variants $variants
+     * @param Settings $settings
      * @param RequestInterface $requestInterface
-     * @param Json             $json
+     * @param Json $json
      */
     public function __construct(
         Category $category,
@@ -90,6 +96,7 @@ public function __construct(
         Cart $cart,
         Review $review,
         Variants $variants,
+        Settings $settings,
         RequestInterface $requestInterface,
         Json $json
     ) {
@@ -101,10 +108,19 @@ public function __construct(
         $this->cart = $cart;
         $this->review = $review;
         $this->variants = $variants;
+        $this->settings = $settings;
         $this->request = $requestInterface;
         $this->json = $json;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getSettings(): array
+    {
+        return $this->settings->execute();
+    }
+
     /**
      * @inheritDoc
      */

Service/WebApi/Profiles.php

@@ -16,6 +16,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Newsletter\Model\Subscriber;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory as SubscriberCollection;
 
 /**
  * Profiles web API service class
@@ -56,6 +57,8 @@ class Profiles
      */
     private $addressRepository;
 
+    private $subscriberCollection;
+
     /**
      * Profiles constructor.
      *
@@ -72,14 +75,16 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         CustomerResource $customerResource,
-        AddressRepository $addressRepository
+        AddressRepository $addressRepository,
+        SubscriberCollection $subscriberCollection
     ) {
         $this->subscriber = $subscriber;
         $this->storeManager = $storeManager;
         $this->customerRepository = $customerRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->customerResource = $customerResource;
         $this->addressRepository = $addressRepository;
+        $this->subscriberCollection = $subscriberCollection;
     }
 
     /**
@@ -97,6 +102,9 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
             $mainData = [
                 "id" => $customer->getId(),
                 "email" => $customer->getEmail(),
+                "first_name" => $customer->getFirstname(),
+                "middle_name" => $customer->getMiddlename(),
+                "last_name" => $customer->getLastname(),
                 "gender" => $this->getGender($customer),
                 "active" => true,
                 "subscribed_to_newsletter" => $this->isSubscribed($customer),
@@ -121,6 +129,17 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
 
             $data[] = $mainData;
         }
+
+        $subscribers = $this->subscriberCollection->create()
+            ->addFieldToFilter('customer_id', ['eq' => 0]);
+        foreach ($subscribers as $subscriber) {
+            $data[] = [
+                'id' => null,
+                'email' => $subscriber->getSubscriberEmail(),
+                'subscribed_to_newsletter' => $subscriber->getSubscriberStatus()
+            ];
+        }
+
         return $data;
     }
 

Service/WebApi/Settings.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magmodules\Reloadify\Service\WebApi;
+
+use Magmodules\Reloadify\Api\Config\RepositoryInterface as ConfigRepository;
+
+/**
+ * Settings web API service class
+ */
+class Settings
+{
+
+    /**
+     * @var ConfigRepository
+     */
+    private $configRepository;
+
+    /**
+     * @param ConfigRepository $configRepository
+     */
+    public function __construct(
+        ConfigRepository $configRepository
+    ) {
+        $this->configRepository = $configRepository;
+    }
+
+    /**
+     * @return array
+     */
+    public function execute(): array
+    {
+        return [
+            [
+                "enabled" => $this->configRepository->isEnabled(),
+                "extension_version" => $this->configRepository->getExtensionVersion(),
+                "magento_version" => $this->configRepository->getMagentoVersion(),
+            ]
+        ];
+    }
+}

composer.json

@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-reloadify",
     "description": "Reloadify extension for Magento 2",
     "type": "magento2-module",
-    "version": "1.5.8",
+    "version": "1.6.0",
     "license": [
         "BSD-2-Clause"
     ],

etc/config.xml

@@ -10,7 +10,7 @@
     <default>
         <magmodules_reloadify>
             <general>
-                <version>v1.5.8</version>
+                <version>v1.6.0</version>
                 <enable>0</enable>
                 <debug>0</debug>
             </general>

etc/webapi.xml

@@ -8,6 +8,14 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
 
+    <!-- Version Endpoints -->
+    <route url="/V1/reloadify/settings" method="GET">
+        <service class="Magmodules\Reloadify\Api\WebApi\RepositoryInterface" method="getSettings"/>
+        <resources>
+            <resource ref="Magmodules_Reloadify::webapi"/>
+        </resources>
+    </route>
+
     <!-- Language Endpoints -->
     <route url="/V1/reloadify/languages" method="GET">
         <service class="Magmodules\Reloadify\Api\WebApi\RepositoryInterface" method="getLanguages"/>