Update Supplier.php

Author: switch-cheehau

lib/mshoplib/src/MShop/Service/Provider/Decorator/Supplier.php

@@ -21,6 +21,18 @@ class Supplier
 	extends \Aimeos\MShop\Service\Provider\Decorator\Base
 	implements \Aimeos\MShop\Service\Provider\Decorator\Iface
 {
+	private $beConfig = array(
+		'supplier.addressformat' => array(
+			'code' => 'supplier.addressformat',
+			'internalcode' => 'supplier.addressformat',
+			'label' => 'Change how supplier address display.',
+			'type' => 'string',
+			'internaltype' => 'string',
+			'default' => 'short',
+			'required' => false,
+		),
+	);
+
 	private $feConfig = array(
 		'supplier.code' => array(
 			'code' => 'supplier.code',
@@ -64,12 +76,7 @@ public function __construct( \Aimeos\MShop\Service\Provider\Iface $provider,
 			{
 				$addrId = ( count( $addresses ) > 1 ) ? $item->getCode() . '-' . $id : $item->getCode();
 
-				$this->feConfig['supplier.code']['default'][$addrId] = trim( preg_replace( "/\n+/m", "\n", sprintf(
-					/// Supplier address format with label (%1$s), company (%2$s),
-					/// address part one (%3$s, e.g street), address part two (%4$s, e.g house number), address part three (%5$s, e.g additional information),
-					/// postal/zip code (%6$s), city (%7$s), state (%8$s), country ID (%9$s),
-					/// e-mail (%10$s), phone (%11$s), facsimile/telefax (%12$s), web site (%13$s)
-					$context->getI18n()->dt( 'mshop', '%1$s
+				$format = $this->getConfigValue( 'supplier.addressformat', '%1$s
 %2$s
 %3$s %4$s
 %5$s
@@ -79,7 +86,14 @@ public function __construct( \Aimeos\MShop\Service\Provider\Iface $provider,
 %11$s
 %12$s
 %13$s'
-					),
+				);
+
+				$this->feConfig['supplier.code']['default'][$addrId] = trim( preg_replace( "/\n+/m", "\n", sprintf(
+					/// Supplier address format with label (%1$s), company (%2$s),
+					/// address part one (%3$s, e.g street), address part two (%4$s, e.g house number), address part three (%5$s, e.g additional information),
+					/// postal/zip code (%6$s), city (%7$s), state (%8$s), country ID (%9$s),
+					/// e-mail (%10$s), phone (%11$s), facsimile/telefax (%12$s), web site (%13$s)
+					$context->getI18n()->dt( 'mshop', $format ),
 					$item->getLabel(),
 					$addr->getCompany(),
 					$addr->getAddress1(),
@@ -179,7 +193,7 @@ public function setConfigFE( \Aimeos\MShop\Order\Item\Base\Service\Iface $orderS
 		if( ( $code = $attributes['supplier.code'] ) != '' )
 		{
 			// add short address as attribute for summary page / customer email
-			$attributes['supplier.address'] = $this->feConfig['supplier.code']['short'][$code];
+			$attributes['supplier.address'] = $this->feConfig['supplier.code']['default'][$code];
 
 			// remove code attribute for summary page / customer email
 			$this->setAttributes( $orderServiceItem, ['supplier.code' => $attributes['supplier.code']], 'hidden' );