Merge pull request #3288 from joshuapease/address-migration-fullname-fix

Fix #3278. Migrate address fullName in `commerce/upgrade`
craftcms · Oct 12, 2023 · b6862ae · b6862ae
2 parents 8316643 + c05bbb2
commit b6862ae
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/console/controllers/UpgradeController.php b/src/console/controllers/UpgradeController.php
@@ -966,9 +966,13 @@ private function _createAddress($data): Address
         $address->locality = $data['city'];
         $address->dependentLocality = '';
 
-        if ($data['firstName'] || $data['lastName']) {
+        if ($data['fullName'] || $data['firstName'] || $data['lastName']) {
             $this->_ensureAddressField(new FullNameField());
-            $address->fullName = implode(' ', array_filter([$data['firstName'], $data['lastName']]));
+            if ($data['fullName']) {
+                $address->fullName = $data['fullName'];
+            } else {
+                $address->fullName = implode(' ', array_filter([$data['firstName'], $data['lastName']]));
+            }
         }
 
         if ($data['businessName']) {