Merge pull request #34 from magmodules/release/1.14.0

Release/1.14.0

Author: Marvin-Magmodules

Service/WebApi/Order.php

@@ -85,7 +85,7 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
         $collection = $this->getCollection($storeId, $extra, $searchCriteria);
 
         foreach ($collection as $order) {
-            $data[] = [
+            $orderData = [
                 "id" => $order->getId(),
                 "currency" => $order->getOrderCurrencyCode(),
                 "number" => $order->getIncrementId(),
@@ -99,6 +99,29 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
                 "created_at" => $order->getCreatedAt(),
                 "shopping_cart_id" => $order->getQuoteId()
             ];
+            if ($shipAddress = $order->getShippingAddress()) {
+                $shipData = $shipAddress->getData();
+                unset($shipData['entity_id'],
+                    $shipData['parent_id'],
+                    $shipData['quote_address_id'],
+                    $shipData['customer_address_id']
+                );
+                $orderData['shipping_address'] = array_filter($shipData, function ($value) {
+                    return !is_null($value);
+                });
+            }
+            if ($billAddress = $order->getBillingAddress()) {
+                $billData = $billAddress->getData();
+                unset($billData['entity_id'],
+                    $billData['parent_id'],
+                    $billData['quote_address_id'],
+                    $billData['customer_address_id']
+                );
+                $orderData['billing_address'] = array_filter($billData, function ($value) {
+                    return !is_null($value);
+                });
+            }
+            $data[] = $orderData;
         }
 
         return $data;

Service/WebApi/Profiles.php

@@ -11,6 +11,7 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -61,8 +62,18 @@ class Profiles
      * @var LogRepository
      */
     private $logRepository;
-
+    /**
+     * @var GroupCollectionFactory
+     */
     private $groupCollectionFactory;
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+    /**
+     * @var array
+     */
+    private $attributeSourceMap = [];
 
     /**
      * Profiles constructor.
@@ -73,6 +84,9 @@ class Profiles
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param CustomerResource $customerResource
      * @param AddressRepository $addressRepository
+     * @param LogRepository $logRepository
+     * @param GroupCollectionFactory $groupCollectionFactory
+     * @param AttributeRepositoryInterface $attributeRepository
      */
     public function __construct(
         Subscriber $subscriber,
@@ -82,7 +96,8 @@ public function __construct(
         CustomerResource $customerResource,
         AddressRepository $addressRepository,
         LogRepository $logRepository,
-        GroupCollectionFactory $groupCollectionFactory
+        GroupCollectionFactory $groupCollectionFactory,
+        AttributeRepositoryInterface $attributeRepository
     ) {
         $this->subscriber = $subscriber;
         $this->storeManager = $storeManager;
@@ -92,6 +107,7 @@ public function __construct(
         $this->addressRepository = $addressRepository;
         $this->logRepository = $logRepository;
         $this->groupCollectionFactory = $groupCollectionFactory;
+        $this->attributeRepository = $attributeRepository;
     }
 
     /**
@@ -123,7 +139,8 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
 
             $customAttributes = $customer->getCustomAttributes();
             foreach ($customAttributes as $attributeCode => $attribute) {
-                $mainData['eav_' . $attributeCode] = $attribute->getValue();
+                $type = $this->getAttributeType($attributeCode);
+                $mainData['eav_' . $attributeCode] = $this->getAttributeValue($attribute, $type);
             }
 
             if ($billingId = $customer->getDefaultBilling()) {
@@ -237,4 +254,67 @@ private function getCustomersGroups(): array
         }
         return $customerGroups;
     }
-}
+
+    /**
+     * @param $attribute
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getAttributeType($attribute): string
+    {
+        return $this->attributeRepository->get('customer', $attribute)
+            ->getFrontendInput();
+    }
+
+    /**
+     * @param $attribute
+     * @return mixed|string
+     */
+    private function getAttributeValue($attribute, $type)
+    {
+        $value = '';
+        if (!$attribute || !$type) {
+            return $value;
+        }
+        if ($type == 'select' || $type == 'multiselect') {
+            try {
+                $attributeCode = $attribute->getAttributeCode();
+                $attributeSource = $this->getAttributeSource($attributeCode);
+                $attributeValue = $attribute->getValue();
+
+                if ($type == 'multiselect') {
+                    $value = [];
+                    $values = explode(',', $attributeValue);
+                    foreach ($values as $singleValue) {
+                        $label = $attributeSource->getOptionText($singleValue);
+                        if ($label) {
+                            $value[] = $label;
+                        }
+                    }
+                    $value = implode(', ', $value);
+                } else {
+                    $value = $attributeSource->getOptionText($attributeValue);
+                }
+            } catch (\Exception $e) {
+                $value = 'Error retrieving value';
+            }
+        } else {
+            $value = $attribute->getValue();
+        }
+        return $value;
+    }
+
+    /**
+     * @param $attributeCode
+     * @return mixed
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getAttributeSource($attributeCode)
+    {
+        if (!isset($this->attributeSourceMap[$attributeCode])) {
+            $this->attributeSourceMap[$attributeCode] =
+                $this->attributeRepository->get('customer', $attributeCode)->getSource();
+        }
+        return $this->attributeSourceMap[$attributeCode];
+    }
+}

composer.json

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

etc/config.xml

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