Merge 9a8cdcdd73 into 9b6799e2b8

src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml

@@ -114,7 +114,7 @@ sylius_grid:
                     form_options:
                         extra_options:
                             class: '%sylius.model.customer.class%'
-                            choice_label: fullname
+                            choice_label: nameOrEmail
                 date:
                     type: date
                     label: sylius.ui.date

src/Sylius/Component/Customer/Model/Customer.php

@@ -89,6 +89,21 @@ class Customer implements CustomerInterface, \Stringable
         return trim(sprintf('%s %s', $this->firstName, $this->lastName));
     }
 
+    public function getNameOrEmail(): string
+    {
+        $fullName = $this->getFullName();
+
+        if ('' !== $fullName && null !== $this->email) {
+            return sprintf('%s (%s)', $fullName, $this->email);
+        }
+
+        if ('' !== $fullName) {
+            return $fullName;
+        }
+
+        return (string) $this->email;
+    }
+
     public function getFirstName(): ?string
     {
         return $this->firstName;

src/Sylius/Component/Customer/Model/CustomerInterface.php

@@ -37,6 +37,8 @@ interface CustomerInterface extends TimestampableInterface, ResourceInterface
 
     public function getFullName(): string;
 
+    public function getNameOrEmail(): string;
+
     public function getFirstName(): ?string;
 
     public function setFirstName(?string $firstName): void;