Skip to content

MAG-713: Add additional space in comma-separated string on the APM co… #440

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
esprit-dev wants to merge 1 commit into
base: release/v4.8.1
Choose a base branch
from
Open

MAG-713: Add additional space in comma-separated string on the APM co… #440

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
32 changes: 17 additions & 15 deletions Controller/Apm/IsAvailable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
namespace Payplug\Payments\Controller\Apm;

use Exception;
use Magento\Directory\Model\Country;
use Magento\Directory\Model\ResourceModel\Country\CollectionFactory as CountryCollectionFactory;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
Expand Down Expand Up @@ -68,23 +69,24 @@ public function execute(): Json
$countryCollection->addFieldToFilter('country_id', ['in' => $allowedCountryIds]);
$countryCollection->loadData();

$countryNames = [];
/**
* @return string
* @var Country $country
*/
$countryNames = array_map(
static fn (Country $country) => $country->getName(),
$countryCollection->getItems()
);

foreach ($countryCollection as $country) {
$countryNames[] = $country->getName();
}
$countries = implode(', ', $countryNames);

if (count($countryNames) === 1) {
$message = __(
'Billing address is not eligible with this payment method. Allowed country : %1',
implode(',', $countryNames)
);
} else {
$message = __(
'Billing address is not eligible with this payment method. Allowed countries : %1',
implode(',', $countryNames)
);
}
$message = count($countryNames) === 1 ? __(
'Billing address is not eligible with this payment method. Allowed country : %1',
$countries
) : __(
'Billing address is not eligible with this payment method. Allowed countries : %1',
$countries
);

$result->setData([
'success' => false,
Expand Down
Loading