Merge pull request #25 from cyl3x/fix/customer-active-addresses

Fix: Customer active addresses
shopware · Sep 12, 2024 · c5514e2 · c5514e2
2 parents 0fdf101 + 67c06a3
commit c5514e2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Context/SalesChannelContext/Customer.php b/src/Context/SalesChannelContext/Customer.php
@@ -117,13 +117,21 @@ public function getDefaultShippingAddress(): Address
 
     public function getActiveBillingAddress(): Address
     {
-        \assert(is_array($this->data['activeBillingAddress']));
-        return new Address($this->data['activeBillingAddress']);
+        if (\array_key_exists('activeBillingAddress', $this->data)) {
+            \assert(is_array($this->data['activeBillingAddress']));
+            return new Address($this->data['activeBillingAddress']);
+        }
+
+        return $this->getDefaultBillingAddress();
     }
 
     public function getActiveShippingAddress(): Address
     {
-        \assert(is_array($this->data['activeShippingAddress']));
-        return new Address($this->data['activeShippingAddress']);
+        if (\array_key_exists('activeShippingAddress', $this->data)) {
+            \assert(is_array($this->data['activeShippingAddress']));
+            return new Address($this->data['activeShippingAddress']);
+        }
+
+        return $this->getDefaultShippingAddress();
     }
 }
diff --git a/tests/Context/SalesChannelContext/CustomerTest.php b/tests/Context/SalesChannelContext/CustomerTest.php
@@ -54,6 +54,17 @@ public function testConstruct(): void
         static::assertSame('test', $customer->getActiveShippingAddress()->getId());
     }
 
+    public function testActiveAddresses(): void
+    {
+        $customer = new Customer([
+            'defaultBillingAddress' => ['id' => 'test'],
+            'defaultShippingAddress' => ['id' => 'test'],
+        ]);
+
+        static::assertSame('test', $customer->getActiveBillingAddress()->getId());
+        static::assertSame('test', $customer->getActiveShippingAddress()->getId());
+    }
+
     public function testConstructNullables(): void
     {
         $customer = new Customer([