Enhance Address model to optionally include email and fixed date format

annotations

src/models/Address.php

@@ -150,7 +150,7 @@ public function setEmail(string $email): void
 		$this->email = $email;
 	}
 
-	public static function fromCommerceAddress(CommerceOrder $commerceOrder, ?CraftAddress $commerceAddress): ?self
+	public static function fromCommerceAddress(CommerceOrder $commerceOrder, ?CraftAddress $commerceAddress, bool $includeEmail): ?self
 	{
 		if (! $commerceAddress instanceof CraftAddress) {
 			return null;
@@ -159,12 +159,11 @@ public static function fromCommerceAddress(CommerceOrder $commerceOrder, ?CraftA
 		$phoneNumberFieldHandle = Plugin::getInstance()?->settings->phoneNumberFieldHandle;
 		$phone = $commerceAddress->{$phoneNumberFieldHandle} ?? null;
 
-		return new self([
+		$address = new self([
 			'name' => $commerceAddress->fullName
 				?? $commerceOrder->getCustomer()?->fullName
 				?? 'Unknown',
 			'phone' => $phone,
-			'email' => $commerceOrder->email,
 			'company' => $commerceAddress->organization,
 			'address1' => $commerceAddress->addressLine1,
 			'address2' => $commerceAddress->addressLine2,
@@ -173,5 +172,11 @@ public static function fromCommerceAddress(CommerceOrder $commerceOrder, ?CraftA
 			'postalCode' => $commerceAddress->postalCode,
 			'country' => $commerceAddress->countryCode,
 		]);
+
+		if ($includeEmail) {
+			$address->setEmail($commerceOrder->email);
+		}
+
+		return $address;
 	}
 }

src/models/Customer.php

@@ -85,8 +85,8 @@ public static function fromCommerceOrder(CommerceOrder $commerceOrder): ?self
 		return $customer instanceof User
 			? new self([
 				'customerCode' => $customer->id,
-				'billToAddress' => Address::fromCommerceAddress($commerceOrder, $billingAddress),
-				'shipToAddress' => Address::fromCommerceAddress($commerceOrder, $shippingAddress),
+				'billToAddress' => Address::fromCommerceAddress($commerceOrder, $billingAddress, true),
+				'shipToAddress' => Address::fromCommerceAddress($commerceOrder, $shippingAddress, false),
 			])
 			: null;
 	}

src/models/Order.php

@@ -49,7 +49,7 @@ class Order extends Base
 
 	#[Groups(['export'])]
 	#[SerializedName('LastModified')]
-	#[Type("DateTime<'n/j/Y H:m'>")]
+	#[Type("DateTime<'n/j/Y H:i'>")]
 	private ?\DateTime $lastModifiedDate = null;
 
 	#[Groups(['export'])]
@@ -82,7 +82,7 @@ class Order extends Base
 
 	#[Groups(['export'])]
 	#[SerializedName('OrderDate')]
-	#[Type("DateTime<'n/j/Y H:m'>")]
+	#[Type("DateTime<'n/j/Y H:i'>")]
 	private ?\DateTime $orderDate = null;
 
 	#[Exclude]