Added logic to set u_brand from appropriate Product's Attribute. Set …

…v1.2.0
Returnless-com · Dec 20, 2021 · 7f0e821 · 7f0e821
1 parent 119e4ab
commit 7f0e821
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 4 deletions.
diff --git a/Model/Api/OrderInfo.php b/Model/Api/OrderInfo.php
@@ -230,7 +230,7 @@ public function getOrderInfoReturnless($incrementId)
                                 $orderInfo['order_products'][$orderItemKey]['bundle_children'][$key]['images'][1]['http_path'] = $this->getImageByProduct1($product);
                                 $orderInfo['order_products'][$orderItemKey]['bundle_children'][$key]['url'] = $product->getProductUrl();
                                 $orderInfo['order_products'][$orderItemKey]['bundle_children'][$key]['categories_ids'] = $product->getCategoryIds();
-                                $orderInfo['order_products'][$orderItemKey]['bundle_children'][$key]['u_brand'] = $product->getBrand();
+                                $orderInfo['order_products'][$orderItemKey]['bundle_children'][$key]['u_brand'] = $this->getUBrand($product);
 
                                 $eavAttributeCode = $this->config->getEanAttributeCode();
 
@@ -253,7 +253,7 @@ public function getOrderInfoReturnless($incrementId)
                     $orderInfo['order_products'][$orderItemKey]['images'][1]['http_path'] = $this->getImageByProduct1($product);
                     $orderInfo['order_products'][$orderItemKey]['url'] = $product->getProductUrl();
                     $orderInfo['order_products'][$orderItemKey]['categories_ids'] = $product->getCategoryIds();
-                    $orderInfo['order_products'][$orderItemKey]['u_brand'] = $product->getBrand();
+                    $orderInfo['order_products'][$orderItemKey]['u_brand'] = $this->getUBrand($product);
 
                     $eavAttributeCode = $this->config->getEanAttributeCode();
 
@@ -350,6 +350,25 @@ public function getImageByProduct($product)
         return $image;
     }
 
+    /**
+     * Method returns variable for Product's Brand Attribute
+     *
+     * @param $product
+     * @return null
+     */
+    protected function getUBrand($product)
+    {
+        $brandAttributeCode = $this->config->getBrandAttributeCode();
+        $brandAttributeCode = !empty($brandAttributeCode) ? $brandAttributeCode : null;
+
+        $uBrand = null;
+        if (!empty($brandAttributeCode)) {
+            $uBrand = $product->getResource()->getAttribute($brandAttributeCode)->getFrontend()->getValue($product);
+        }
+
+        return $uBrand ? $uBrand : null;
+    }
+
     /**
      * @param $result
      */

diff --git a/Model/Config.php b/Model/Config.php
@@ -30,6 +30,11 @@ class Config
      */
     const CONFIG_EAN_ATTRIBUTE_CODE = 'returnless_connector/general/u_upc';
 
+    /**
+     * const CONFIG_BRAND_ATTRIBUTE_CODE
+     */
+    const CONFIG_BRAND_ATTRIBUTE_CODE = 'returnless_connector/general/u_brand';
+
     /**
      * const CONFIG_SEPARATE_BUNDLE_PRODUCTS
      */
@@ -147,4 +152,19 @@ public function getSeparateBundle($store = null)
 
         return $separateBundle;
     }
+
+    /**
+     * @param null $store
+     * @return string
+     */
+    public function getBrandAttributeCode($store = null)
+    {
+        $brandttributeCode = (string)$this->scopeConfig->getValue(
+            self::CONFIG_BRAND_ATTRIBUTE_CODE,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+
+        return $brandttributeCode;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -17,5 +17,5 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "1.1.9"
+    "version": "1.2.0"
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -28,6 +28,10 @@
                     <label>EAN attribute code</label>
                     <comment><![CDATA[The name of the EAN attribute in your system]]></comment>
                 </field>
+                <field id="u_brand" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Brand attribute code</label>
+                    <comment><![CDATA[The name of the Brand attribute in your system]]></comment>
+                </field>
                 <field id="bundle_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Separate bundle products</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Returnless_Connector" setup_version="1.1.9">
+    <module name="Returnless_Connector" setup_version="1.2.0">
         <sequence>
             <module name="Magento_Sales"/>
         </sequence>