8219-fix-brand-attribute-value

Author: ihorvansach

Model/AbstractDataLayer.php

@@ -153,4 +153,24 @@ protected function getPrice(Product $product): string
         $price = $priceInfo->getValue();
         return $this->formatPrice($price);
     }
+
+    /**
+     * @param Product $product
+     * @param string $attributeCode
+     * @return string
+     */
+    protected function getProductAttributeValue(Product $product, ?string $attributeCode): string
+    {
+        if ($attributeCode) {
+            $result = $product->getData($attributeCode);
+            if (is_numeric($result) && 'sku' != $attributeCode) {
+                $result = $product->getResource()->getAttribute($attributeCode)->getFrontend()->getValue($product);
+            }
+            if ($result) {
+                return (string)$result;
+            }
+        }
+
+        return '';
+    }
 }

Model/DataLayer/Cart/Item.php

@@ -23,11 +23,10 @@ public function get(\Magento\Quote\Model\Quote\Item $quoteItem): array
         return array_merge(array_filter([
             'item_id' => ($this->config->getProductAttribute() == 'sku')
                 ? $quoteItem->getSku()
-                : $product->getData($this->config->getProductAttribute()),
+                : $this->getProductAttributeValue($product, $this->config->getProductAttribute()),
             'item_name' => $quoteItem->getName(),
             'discount' => $this->formatPrice((float)$quoteItem->getDiscountAmount()),
-            'item_brand' => $this->config->getBrandAttribute() ?
-                $product->getData($this->config->getBrandAttribute()) : '',
+            'item_brand' => $this->getProductAttributeValue($product, $this->config->getBrandAttribute()),
             'price' => $this->formatPrice((float)$quoteItem->getPrice()),
             'quantity' => $quoteItem->getQty() * 1
         ]), $categoryNames);

Model/DataLayer/Order/Item.php

@@ -22,11 +22,12 @@ public function get(OrderItemInterface $orderItem): array
         $product = $orderItem->getProduct();
         $categoryNames = $this->getCategoryNames($product);
         return array_merge(array_filter([
-            'item_id' => $product->getData($this->config->getProductAttribute()),
+            'item_id' => ($this->config->getProductAttribute() == 'sku')
+                ? $orderItem->getSku()
+                : $this->getProductAttributeValue($product, $this->config->getProductAttribute()),
             'item_name' => $orderItem->getName(),
             'discount' => $this->formatPrice((float)$orderItem->getDiscountAmount()),
-            'item_brand' => $this->config->getBrandAttribute() ?
-                $product->getData($this->config->getBrandAttribute()) : '',
+            'item_brand' => $this->getProductAttributeValue($product, $this->config->getBrandAttribute()),
             'price' => $this->formatPrice((float)$orderItem->getPrice()),
             'quantity' => $orderItem->getQtyOrdered() * 1
         ]), $categoryNames);

Model/DataLayer/Product/Item.php

@@ -21,10 +21,9 @@ public function get(Product $product): array
     {
         $categoryNames = $this->getCategoryNames($product);
         return array_merge(array_filter([
-            'item_id' => $product->getData($this->config->getProductAttribute()),
+            'item_id' => $this->getProductAttributeValue($product, $this->config->getProductAttribute()),
             'item_name' => $product->getName(),
-            'item_brand' => $this->config->getBrandAttribute() ?
-                $product->getData($this->config->getBrandAttribute()) : '',
+            'item_brand' => $this->getProductAttributeValue($product, $this->config->getBrandAttribute()),
             'price' => $this->getPrice($product)
         ]), $categoryNames);
     }