Fix N/A attributes, remove empty attributes

Author: AleksandrsKondratjevs

src/Model/Resolver/Products/DataPostProcessor/Attributes.php

@@ -128,11 +128,6 @@ protected function appendWithValue(
 
                 // Remove all empty attributes
                 if (!$attributeValue) {
-                    // If attribute does not contain both value nor options then we remove it from output
-                    if (!isset($productAttributes[$productId][$attributeCode]) ||
-                        !$productAttributes[$productId][$attributeCode]['attribute_options']) {
-                        unset($productAttributes[$productId][$attributeCode]);
-                    }
                     continue;
                 }
 
@@ -200,6 +195,8 @@ protected function appendWithOptions(
                     !isset($productAttributes[$id][$key]['attribute_value'])
                     && !count($variantAttributeValues)
                 ) {
+                    // Remove attribute if it has no value and empty options
+                    unset($productAttributes[$id][$key]);
                     continue;
                 }
 
@@ -376,6 +373,12 @@ public function process(
             }
         }
 
+        $this->appendWithValue(
+            $attributes,
+            $productIds,
+            $productAttributes
+        );
+
         if ($isCollectOptions) {
             $this->appendWithOptions(
                 $attributes,
@@ -385,12 +388,6 @@ public function process(
             );
         }
 
-        $this->appendWithValue(
-            $attributes,
-            $productIds,
-            $productAttributes
-        );
-
         return function (&$productData) use ($productAttributes) {
             if (!isset($productData['entity_id'])) {
                 return;