Skip to content

Fix: Fall back to CustomerUser name for B2B addresses #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
powli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Fall back to CustomerUser name for B2B addresses #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Mapper/MollieDtoMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,18 @@ public function getOrderData(PaymentTransaction $paymentTransaction)
),
]);

// Fall back to CustomerUser name when address has no first/last name (common in B2B)
$customerUser = $order->getCustomerUser();
$mollieAddress = $orderData->getBillingAddress();
if (
$customerUser
&& ((string) $billingAddress->getFirstName() === '' || (string) $billingAddress->getLastName() === '')
) {
$mollieAddress->setGivenName($customerUser->getFirstName());
$mollieAddress->setFamilyName($customerUser->getLastName());
$orderData->setBillingAddress($mollieAddress);
}

$orderData->setLines(
array_merge(
$this->getOrderLinesData($orderLines),
Expand All @@ -212,6 +224,16 @@ public function getOrderData(PaymentTransaction $paymentTransaction)

if ($shippingAddress = $order->getShippingAddress()) {
$orderData->setShippingAddress($this->getAddressData($shippingAddress, $order->getEmail()));

if (
$customerUser
&& ((string) $shippingAddress->getFirstName() === '' || (string) $shippingAddress->getLastName() === '')
) {
$mollieShipping = $orderData->getShippingAddress();
$mollieShipping->setGivenName($customerUser->getFirstName());
$mollieShipping->setFamilyName($customerUser->getLastName());
$orderData->setShippingAddress($mollieShipping);
}
}

if ($frontendOwner = $paymentTransaction->getFrontendOwner()) {
Expand Down