ENGCOM-3334: Added $_regionCollection property to class #140

magento-engcom-team · magento-engcom-team · commit 72733cbb6573 · 2018-10-30T10:34:18.000-05:00
- Merge Pull Request magento-engcom/import-export-improvements#140 from maxalmonte14/import-export-improvements:improvement/supress_undefined_property_error - Merged commits: 1. 9a7fa4c 2. d0c4c64 3. fab32c6
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -101,6 +101,13 @@ class Address extends AbstractCustomer
      */
     protected $_entityTable;
 
+    /**
+     * Region collection instance
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\Collection
+     */
+    private $_regionCollection;
+
     /**
      * Countries and regions
      *
@@ -781,7 +788,7 @@ public static function getDefaultAddressAttributeMapping()
     }
 
     /**
-     * check if address for import is empty (for customer composite mode)
+     * Check if address for import is empty (for customer composite mode)
      *
      * @param array $rowData
      * @return array
@@ -940,7 +947,7 @@ protected function _checkRowDuplicate($customerId, $addressId)
     }
 
     /**
-     * set customer attributes
+     * Set customer attributes
      *
      * @param array $customerAttributes
      * @return $this

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,13 @@ class Address extends AbstractCustomer`
`101`	`101`	`*/`
`102`	`102`	`protected $_entityTable;`
`103`	`103`
	`104`	`+ /**`
	`105`	`+ * Region collection instance`
	`106`	`+ *`
	`107`	`+ * @var \Magento\Directory\Model\ResourceModel\Region\Collection`
	`108`	`+ */`
	`109`	`+ private $_regionCollection;`
	`110`	`+`
`104`	`111`	`/**`
`105`	`112`	`* Countries and regions`
`106`	`113`	`*`
`@@ -781,7 +788,7 @@ public static function getDefaultAddressAttributeMapping()`
`781`	`788`	`}`
`782`	`789`
`783`	`790`	`/**`
`784`		`- * check if address for import is empty (for customer composite mode)`
	`791`	`+ * Check if address for import is empty (for customer composite mode)`
`785`	`792`	`*`
`786`	`793`	`* @param array $rowData`
`787`	`794`	`* @return array`
`@@ -940,7 +947,7 @@ protected function _checkRowDuplicate($customerId, $addressId)`
`940`	`947`	`}`
`941`	`948`
`942`	`949`	`/**`
`943`		`- * set customer attributes`
	`950`	`+ * Set customer attributes`
`944`	`951`	`*`
`945`	`952`	`* @param array $customerAttributes`
`946`	`953`	`* @return $this`