Skip to content

Added template as argument to the store address renderer to allow custom formatting #11138

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

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Added template as argument to the store address renderer to allow custom formatting #11138

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
20 changes: 16 additions & 4 deletions app/code/Magento/Store/Model/Address/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
*/
class Renderer
{
const DEFAULT_TEMPLATE = "{{var name}}\n" .
"{{var street_line1}}\n" .
"{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
"{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
"{{var country}}";

/**
* @var EventManager
*/
Expand All @@ -25,18 +31,26 @@ class Renderer
*/
protected $filterManager;

/**
* @var string
*/
private $template;

/**
* Constructor
*
* @param EventManager $eventManager
* @param FilterManager $filterManager
* @param string $template
*/
public function __construct(
EventManager $eventManager,
FilterManager $filterManager
FilterManager $filterManager,
$template = self::DEFAULT_TEMPLATE
) {
$this->eventManager = $eventManager;
$this->filterManager = $filterManager;
$this->template = $template;
}

/**
Expand All @@ -50,9 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html')
{
$this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]);
$address = $this->filterManager->template(
"{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
"{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
"{{var country}}",
$this->template,
['variables' => $storeInfo->getData()]
);

Expand Down