Skip to content
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

Jump to bottom

Customer Name Prefix shows white space when extra separator is addes.… #18077

Closed
wants to merge 4 commits into from
Closed

Customer Name Prefix shows white space when extra separator is addes.… #18077

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9291068
Customer Name Prefix shows white space when extra separator is addes.…
ivanbastos Sep 16, 2018
01601ec
#18077 Fixed Patterns
ivanbastos Sep 16, 2018
94b8272
#18077 Apply Fix again
ivanbastos Sep 16, 2018
08bf3f5
#18077 Apply Web Standards
ivanbastos Sep 17, 2018
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
15 changes: 12 additions & 3 deletions app/code/Magento/Customer/Model/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
use Magento\Customer\Helper\Address as AddressHelper;
use Magento\Framework\Escaper;

/**
* Class Options
*
* @package Magento\Customer\Model
*/
class Options
{
/**
Expand Down Expand Up @@ -38,7 +43,7 @@ public function __construct(
/**
* Retrieve name prefix dropdown options
*
* @param null $store
* @param string|null $store
* @return array|bool
*/
public function getNamePrefixOptions($store = null)
Expand All @@ -52,7 +57,7 @@ public function getNamePrefixOptions($store = null)
/**
* Retrieve name suffix dropdown options
*
* @param null $store
* @param string|null $store
* @return array|bool
*/
public function getNameSuffixOptions($store = null)
Expand All @@ -64,7 +69,9 @@ public function getNameSuffixOptions($store = null)
}

/**
* @param $options
* Prepare Name Suffix Options
*
* @param string|null $options
* @param bool $isOptional
* @return array|bool
*
Expand All @@ -78,6 +85,7 @@ protected function _prepareNamePrefixSuffixOptions($options, $isOptional = false

/**
* Unserialize and clear name prefix or suffix options
*
* If field is optional, add an empty first option.
*
* @param string $options
Expand All @@ -95,6 +103,7 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
foreach ($options as $value) {
$value = $this->escaper->escapeHtml(trim($value));
$result[$value] = $value;
$result = array_filter($result);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this outside the loop.

}
if ($isOptional && trim(current($options))) {
$result = array_merge([' ' => ' '], $result);
Expand Down