Fixed an issue where an error would be thrown if a brand field didn't…

… exist for a given Product Type Signed-off-by: Andrew Welch <[email protected]>
nystudio107 · Mar 13, 2020 · 04a0e16 · 04a0e16
1 parent 5f9d58f
commit 04a0e16
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/services/Commerce.php b/src/services/Commerce.php
@@ -467,13 +467,8 @@ public function getProductDataFromProduct($productVariant = null): array
     private function pullDataFromField($productVariant, $fieldHandle, $isBrand = false): string
     {
         $result = '';
-
         if ($productVariant && $fieldHandle) {
-            $srcField = $productVariant[$fieldHandle];
-
-            if ($srcField === null) {
-                $srcField = $productVariant->product->$fieldHandle;
-            }
+            $srcField = $productVariant[$fieldHandle] ?? $productVariant->product[$fieldHandle] ?? null;
             // If the source field isn't an object, return nothing
             if (!is_object($srcField)) {
                 return $result;