aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Supplier/Text/Standard.php

Braces +2 added lines, -4 removed lines

@@ -160,14 +160,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item-text' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item-text' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +67 added lines, -67 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Text;
 
-sprintf( 'text' ); // for translation
+sprintf('text'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->textData = $this->toArray( $view->item, true );
+		$view->textData = $this->toArray($view->item, true);
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,11 +62,11 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'text', [] );
+		$data = $view->param('text', []);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['supplier.lists.siteid'] = $siteid;
 			$data[$idx]['text.siteid'] = $siteid;
@@ -75,11 +75,11 @@ 
 		$view->textData = $data;
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,7 +91,7 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$item->deleteListItems( $item->getListItems( 'text', null, null, false ), true );
+		$item->deleteListItems($item->getListItems('text', null, null, false), true);
 	}
 
 
@@ -102,16 +102,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->textData = $this->toArray( $view->item );
+		$view->textData = $this->toArray($view->item);
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -124,26 +124,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'text', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('text', []));
 			$view->textBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->textBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item-text' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-text' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item-text' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-text' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -157,7 +157,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/supplier/text/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -232,7 +232,7 @@ 
 		 * @see admin/jqadm/supplier/text/decorators/excludes
 		 * @see admin/jqadm/supplier/text/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/text/' . $type, $name );
+		return $this->createSubClient('supplier/text/' . $type, $name);
 	}
 
 
@@ -276,7 +276,7 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/text/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/text/standard/subparts', []);
 	}
 
 
@@ -286,23 +286,23 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$textTypeManager = \Aimeos\MShop::create( $context, 'text/type' );
-		$listTypeManager = \Aimeos\MShop::create( $context, 'supplier/lists/type' );
+		$textTypeManager = \Aimeos\MShop::create($context, 'text/type');
+		$listTypeManager = \Aimeos\MShop::create($context, 'supplier/lists/type');
 
-		$search = $textTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'text.type.domain', 'supplier' ) );
-		$search->setSortations( array( $search->sort( '+', 'text.type.label' ) ) );
+		$search = $textTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'text.type.domain', 'supplier'));
+		$search->setSortations(array($search->sort('+', 'text.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'supplier.lists.type.domain', 'text' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'supplier.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'supplier.lists.type.domain', 'text'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'supplier.lists.type.label')));
 
-		$view->textTypes = $textTypeManager->searchItems( $search );
-		$view->textListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
+		$view->textTypes = $textTypeManager->searchItems($search);
+		$view->textListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
 
 		return $view;
 	}
@@ -314,50 +314,50 @@ 
 	 * @param \Aimeos\MShop\Supplier\Item\Iface $item Supplier item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Supplier\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Supplier\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$textManager = \Aimeos\MShop::create( $context, 'text' );
-		$listManager = \Aimeos\MShop::create( $context, 'supplier/lists' );
+		$textManager = \Aimeos\MShop::create($context, 'text');
+		$listManager = \Aimeos\MShop::create($context, 'supplier/lists');
 
-		$listItems = $item->getListItems( 'text', null, null, false );
+		$listItems = $item->getListItems('text', null, null, false);
 
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( trim( $this->getValue( $entry, 'text.content', '' ) ) === '' ) {
+			if (trim($this->getValue($entry, 'text.content', '')) === '') {
 				continue;
 			}
 
-			if( ( $listItem = $item->getListItem( 'text', $entry['supplier.lists.type'], $entry['text.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('text', $entry['supplier.lists.type'], $entry['text.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $textManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'text', $listItem, $refItem );
+			$item->addListItem('text', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems, true );
+		return $item->deleteListItems($listItems, true);
 	}
 
 
@@ -368,20 +368,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Supplier\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Supplier\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'text', null, null, false ) as $listItem )
+		foreach ($item->getListItems('text', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['supplier.lists.siteid'] = $siteId;
 				$list['supplier.lists.id'] = '';
@@ -389,10 +389,10 @@ 
 				$list['text.id'] = null;
 			}
 
-			$list['supplier.lists.datestart'] = str_replace( ' ', 'T', $list['supplier.lists.datestart'] );
-			$list['supplier.lists.dateend'] = str_replace( ' ', 'T', $list['supplier.lists.dateend'] );
+			$list['supplier.lists.datestart'] = str_replace(' ', 'T', $list['supplier.lists.datestart']);
+			$list['supplier.lists.dateend'] = str_replace(' ', 'T', $list['supplier.lists.dateend']);
 
-			foreach( $list['supplier.lists.config'] as $key => $val )
+			foreach ($list['supplier.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -411,7 +411,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/supplier/text/template-item
 		 * Relative path to the HTML body template of the text subpart for suppliers.
@@ -435,6 +435,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/text/template-item';
 		$default = 'supplier/item-text-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Attribute/Price/Standard.php

Braces +2 added lines, -4 removed lines

@@ -160,14 +160,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Price;
 
-sprintf( 'price' ); // for translation
+sprintf('price'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item, true );
+		$view->priceData = $this->toArray($view->item, true);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,11 +62,11 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'price', [] );
+		$data = $view->param('price', []);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['attribute.lists.siteid'] = $siteid;
 			$data[$idx]['price.siteid'] = $siteid;
@@ -75,11 +75,11 @@ 
 		$view->priceData = $data;
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,7 +91,7 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$item->deleteListItems( $item->getListItems( 'price', null, null, false ), true );
+		$item->deleteListItems($item->getListItems('price', null, null, false), true);
 	}
 
 
@@ -102,16 +102,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item );
+		$view->priceData = $this->toArray($view->item);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -124,26 +124,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'price', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('price', []));
 			$view->priceBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->priceBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-price' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -157,7 +157,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/attribute/price/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -232,7 +232,7 @@ 
 		 * @see admin/jqadm/attribute/price/decorators/excludes
 		 * @see admin/jqadm/attribute/price/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/price/' . $type, $name );
+		return $this->createSubClient('attribute/price/' . $type, $name);
 	}
 
 
@@ -276,7 +276,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/price/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/price/standard/subparts', []);
 	}
 
 
@@ -286,28 +286,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$priceTypeManager = \Aimeos\MShop::create( $context, 'price/type' );
-		$listTypeManager = \Aimeos\MShop::create( $context, 'attribute/lists/type' );
-		$currencyManager = \Aimeos\MShop::create( $context, 'locale/currency' );
+		$priceTypeManager = \Aimeos\MShop::create($context, 'price/type');
+		$listTypeManager = \Aimeos\MShop::create($context, 'attribute/lists/type');
+		$currencyManager = \Aimeos\MShop::create($context, 'locale/currency');
 
-		$search = $priceTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'attribute' ) );
-		$search->setSortations( array( $search->sort( '+', 'price.type.label' ) ) );
+		$search = $priceTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'price.type.domain', 'attribute'));
+		$search->setSortations(array($search->sort('+', 'price.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'attribute.lists.type.domain', 'price' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'attribute.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'attribute.lists.type.domain', 'price'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'attribute.lists.type.label')));
 
-		$view->priceTypes = $priceTypeManager->searchItems( $search );
-		$view->priceListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->priceCurrencies = $currencyManager->searchItems( $currencyManager->createSearch( true )->setSlice( 0, 0x7fffffff ) );
+		$view->priceTypes = $priceTypeManager->searchItems($search);
+		$view->priceListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->priceCurrencies = $currencyManager->searchItems($currencyManager->createSearch(true)->setSlice(0, 0x7fffffff));
 
-		if( $view->priceCurrencies === [] ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( 'No currencies available. Please enable at least one currency' );
+		if ($view->priceCurrencies === []) {
+			throw new \Aimeos\Admin\JQAdm\Exception('No currencies available. Please enable at least one currency');
 		}
 
 		return $view;
@@ -320,46 +320,46 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Attribute\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$priceManager = \Aimeos\MShop::create( $context, 'price' );
-		$listManager = \Aimeos\MShop::create( $context, 'attribute/lists' );
+		$priceManager = \Aimeos\MShop::create($context, 'price');
+		$listManager = \Aimeos\MShop::create($context, 'attribute/lists');
 
-		$listItems = $item->getListItems( 'price', null, null, false );
+		$listItems = $item->getListItems('price', null, null, false);
 
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'price', $entry['attribute.lists.type'], $entry['price.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('price', $entry['attribute.lists.type'], $entry['price.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $priceManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'price', $listItem, $refItem );
+			$item->addListItem('price', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems, true );
+		return $item->deleteListItems($listItems, true);
 	}
 
 
@@ -370,20 +370,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'price', null, null, false ) as $listItem )
+		foreach ($item->getListItems('price', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['attribute.lists.siteid'] = $siteId;
 				$list['attribute.lists.id'] = '';
@@ -391,10 +391,10 @@ 
 				$list['price.id'] = null;
 			}
 
-			$list['attribute.lists.datestart'] = str_replace( ' ', 'T', $list['attribute.lists.datestart'] );
-			$list['attribute.lists.dateend'] = str_replace( ' ', 'T', $list['attribute.lists.dateend'] );
+			$list['attribute.lists.datestart'] = str_replace(' ', 'T', $list['attribute.lists.datestart']);
+			$list['attribute.lists.dateend'] = str_replace(' ', 'T', $list['attribute.lists.dateend']);
 
-			foreach( $list['attribute.lists.config'] as $key => $val )
+			foreach ($list['attribute.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -413,7 +413,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/attribute/price/template-item
 		 * Relative path to the HTML body template of the price subpart for attributes.
@@ -437,6 +437,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/price/template-item';
 		$default = 'attribute/item-price-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Service/Price/Standard.php

Braces +2 added lines, -4 removed lines

@@ -160,14 +160,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Price;
 
-sprintf( 'price' ); // for translation
+sprintf('price'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item, true );
+		$view->priceData = $this->toArray($view->item, true);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,11 +62,11 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'price', [] );
+		$data = $view->param('price', []);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['service.lists.siteid'] = $siteid;
 			$data[$idx]['price.siteid'] = $siteid;
@@ -75,11 +75,11 @@ 
 		$view->priceData = $data;
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,7 +91,7 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$item->deleteListItems( $item->getListItems( 'price', null, null, false ), true );
+		$item->deleteListItems($item->getListItems('price', null, null, false), true);
 	}
 
 
@@ -102,16 +102,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item );
+		$view->priceData = $this->toArray($view->item);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -124,26 +124,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'price', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('price', []));
 			$view->priceBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->priceBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-price' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -157,7 +157,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/service/price/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -232,7 +232,7 @@ 
 		 * @see admin/jqadm/service/price/decorators/excludes
 		 * @see admin/jqadm/service/price/decorators/global
 		 */
-		return $this->createSubClient( 'service/price/' . $type, $name );
+		return $this->createSubClient('service/price/' . $type, $name);
 	}
 
 
@@ -276,7 +276,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/price/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/price/standard/subparts', []);
 	}
 
 
@@ -286,28 +286,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$priceTypeManager = \Aimeos\MShop::create( $context, 'price/type' );
-		$listTypeManager = \Aimeos\MShop::create( $context, 'service/lists/type' );
-		$currencyManager = \Aimeos\MShop::create( $context, 'locale/currency' );
+		$priceTypeManager = \Aimeos\MShop::create($context, 'price/type');
+		$listTypeManager = \Aimeos\MShop::create($context, 'service/lists/type');
+		$currencyManager = \Aimeos\MShop::create($context, 'locale/currency');
 
-		$search = $priceTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'service' ) );
-		$search->setSortations( array( $search->sort( '+', 'price.type.label' ) ) );
+		$search = $priceTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'price.type.domain', 'service'));
+		$search->setSortations(array($search->sort('+', 'price.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'service.lists.type.domain', 'price' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'service.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'service.lists.type.domain', 'price'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'service.lists.type.label')));
 
-		$view->priceTypes = $priceTypeManager->searchItems( $search );
-		$view->priceListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->priceCurrencies = $currencyManager->searchItems( $currencyManager->createSearch( true )->setSlice( 0, 0x7fffffff ) );
+		$view->priceTypes = $priceTypeManager->searchItems($search);
+		$view->priceListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->priceCurrencies = $currencyManager->searchItems($currencyManager->createSearch(true)->setSlice(0, 0x7fffffff));
 
-		if( $view->priceCurrencies === [] ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( 'No currencies available. Please enable at least one currency' );
+		if ($view->priceCurrencies === []) {
+			throw new \Aimeos\Admin\JQAdm\Exception('No currencies available. Please enable at least one currency');
 		}
 
 		return $view;
@@ -320,46 +320,46 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Service\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Service\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$priceManager = \Aimeos\MShop::create( $context, 'price' );
-		$listManager = \Aimeos\MShop::create( $context, 'service/lists' );
+		$priceManager = \Aimeos\MShop::create($context, 'price');
+		$listManager = \Aimeos\MShop::create($context, 'service/lists');
 
-		$listItems = $item->getListItems( 'price', null, null, false );
+		$listItems = $item->getListItems('price', null, null, false);
 
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'price', $entry['service.lists.type'], $entry['price.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('price', $entry['service.lists.type'], $entry['price.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $priceManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'price', $listItem, $refItem );
+			$item->addListItem('price', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems, true );
+		return $item->deleteListItems($listItems, true);
 	}
 
 
@@ -370,20 +370,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Service\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'price', null, null, false ) as $listItem )
+		foreach ($item->getListItems('price', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['service.lists.siteid'] = $siteId;
 				$list['service.lists.id'] = '';
@@ -391,10 +391,10 @@ 
 				$list['price.id'] = null;
 			}
 
-			$list['service.lists.datestart'] = str_replace( ' ', 'T', $list['service.lists.datestart'] );
-			$list['service.lists.dateend'] = str_replace( ' ', 'T', $list['service.lists.dateend'] );
+			$list['service.lists.datestart'] = str_replace(' ', 'T', $list['service.lists.datestart']);
+			$list['service.lists.dateend'] = str_replace(' ', 'T', $list['service.lists.dateend']);
 
-			foreach( $list['service.lists.config'] as $key => $val )
+			foreach ($list['service.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -413,7 +413,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/service/price/template-item
 		 * Relative path to the HTML body template of the price subpart for services.
@@ -437,6 +437,6 @@ 
 		$tplconf = 'admin/jqadm/service/price/template-item';
 		$default = 'service/item-price-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Product/Price/Standard.php

Braces +2 added lines, -4 removed lines

@@ -160,14 +160,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Price;
 
-sprintf( 'price' ); // for translation
+sprintf('price'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item, true );
+		$view->priceData = $this->toArray($view->item, true);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,11 +62,11 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'price', [] );
+		$data = $view->param('price', []);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['product.lists.siteid'] = $siteid;
 			$data[$idx]['price.siteid'] = $siteid;
@@ -75,11 +75,11 @@ 
 		$view->priceData = $data;
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,7 +91,7 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$item->deleteListItems( $item->getListItems( 'price', null, null, false ), true );
+		$item->deleteListItems($item->getListItems('price', null, null, false), true);
 	}
 
 
@@ -102,16 +102,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->priceData = $this->toArray( $view->item );
+		$view->priceData = $this->toArray($view->item);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -124,26 +124,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'price', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('price', []));
 			$view->priceBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->priceBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-price' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -157,7 +157,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/price/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -232,7 +232,7 @@ 
 		 * @see admin/jqadm/product/price/decorators/excludes
 		 * @see admin/jqadm/product/price/decorators/global
 		 */
-		return $this->createSubClient( 'product/price/' . $type, $name );
+		return $this->createSubClient('product/price/' . $type, $name);
 	}
 
 
@@ -276,7 +276,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/price/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/price/standard/subparts', []);
 	}
 
 
@@ -286,28 +286,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$priceTypeManager = \Aimeos\MShop::create( $context, 'price/type' );
-		$listTypeManager = \Aimeos\MShop::create( $context, 'product/lists/type' );
-		$currencyManager = \Aimeos\MShop::create( $context, 'locale/currency' );
+		$priceTypeManager = \Aimeos\MShop::create($context, 'price/type');
+		$listTypeManager = \Aimeos\MShop::create($context, 'product/lists/type');
+		$currencyManager = \Aimeos\MShop::create($context, 'locale/currency');
 
-		$search = $priceTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'product' ) );
-		$search->setSortations( array( $search->sort( '+', 'price.type.label' ) ) );
+		$search = $priceTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'price.type.domain', 'product'));
+		$search->setSortations(array($search->sort('+', 'price.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'product.lists.type.domain', 'price' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'product.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'product.lists.type.domain', 'price'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'product.lists.type.label')));
 
-		$view->priceTypes = $priceTypeManager->searchItems( $search );
-		$view->priceListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->priceCurrencies = $currencyManager->searchItems( $currencyManager->createSearch( true )->setSlice( 0, 0x7fffffff ) );
+		$view->priceTypes = $priceTypeManager->searchItems($search);
+		$view->priceListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->priceCurrencies = $currencyManager->searchItems($currencyManager->createSearch(true)->setSlice(0, 0x7fffffff));
 
-		if( $view->priceCurrencies === [] ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( 'No currencies available. Please enable at least one currency' );
+		if ($view->priceCurrencies === []) {
+			throw new \Aimeos\Admin\JQAdm\Exception('No currencies available. Please enable at least one currency');
 		}
 
 		return $view;
@@ -320,48 +320,48 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$priceManager = \Aimeos\MShop::create( $context, 'price' );
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
+		$priceManager = \Aimeos\MShop::create($context, 'price');
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
 
-		$listItems = $item->getListItems( 'price', null, null, false );
+		$listItems = $item->getListItems('price', null, null, false);
 
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$listType = $entry['product.lists.type'];
 
-			if( ( $listItem = $item->getListItem( 'price', $listType, $entry['price.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('price', $listType, $entry['price.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $priceManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'price', $listItem, $refItem );
+			$item->addListItem('price', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems, true );
+		return $item->deleteListItems($listItems, true);
 	}
 
 
@@ -372,20 +372,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'price', null, null, false ) as $listItem )
+		foreach ($item->getListItems('price', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';
@@ -393,10 +393,10 @@ 
 				$list['price.id'] = null;
 			}
 
-			$list['product.lists.datestart'] = str_replace( ' ', 'T', $list['product.lists.datestart'] );
-			$list['product.lists.dateend'] = str_replace( ' ', 'T', $list['product.lists.dateend'] );
+			$list['product.lists.datestart'] = str_replace(' ', 'T', $list['product.lists.datestart']);
+			$list['product.lists.dateend'] = str_replace(' ', 'T', $list['product.lists.dateend']);
 
-			foreach( $list['product.lists.config'] as $key => $val )
+			foreach ($list['product.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -415,7 +415,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/price/template-item
 		 * Relative path to the HTML body template of the price subpart for products.
@@ -439,6 +439,6 @@ 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Type/Customer/Property/Standard.php

Braces +13 added lines, -26 removed lines

@@ -51,14 +51,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -100,14 +98,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -148,14 +144,12 @@ 
 
 			$this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -196,14 +190,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -241,18 +233,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -291,14 +280,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +102 added lines, -102 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Type\Customer\Property;
 
-sprintf( 'type/customer/property' ); // for translation
+sprintf('type/customer/property'); // for translation
 
 
 /**
@@ -35,37 +35,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop::create( $context, 'customer/property/type' );
-			$view->item = $manager->getItem( $id );
+			$manager = \Aimeos\MShop::create($context, 'customer/property/type');
+			$view->item = $manager->getItem($id);
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -81,10 +81,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop::create( $context, 'customer/property/type' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop::create($context, 'customer/property/type')->createItem();
 			}
 
 			$data['customer.property.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -126,38 +126,38 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'customer/property/type' );
+		$manager = \Aimeos\MShop::create($context, 'customer/property/type');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' );
+			$this->nextAction($view, 'search', 'type/customer/property', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -178,37 +178,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop::create( $context, 'customer/property/type' );
+			$manager = \Aimeos\MShop::create($context, 'customer/property/type');
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -222,40 +222,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'customer/property/type' );
+		$manager = \Aimeos\MShop::create($context, 'customer/property/type');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'type/customer/property', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -277,31 +277,31 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'type/customer/property' );
-			$manager = \Aimeos\MShop::create( $context, 'customer/property/type' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'type/customer/property');
+			$manager = \Aimeos\MShop::create($context, 'customer/property/type');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
-			$view->filterCustomers = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, [], $total);
+			$view->filterCustomers = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/type/customer/property/template-list
@@ -326,7 +326,7 @@ 
 		$tplconf = 'admin/jqadm/type/customer/property/template-list';
 		$default = 'type/customer/property/list-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -337,7 +337,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $propertytype, $name = null )
+	public function getSubClient($propertytype, $name = null)
 	{
 		/** admin/jqadm/type/customer/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@ 
 		 * @see admin/jqadm/type/customer/property/decorators/excludes
 		 * @see admin/jqadm/type/customer/property/decorators/global
 		 */
-		return $this->createSubClient( 'type/customer/property' . $propertytype, $name );
+		return $this->createSubClient('type/customer/property' . $propertytype, $name);
 	}
 
 
@@ -456,7 +456,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/customer/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/customer/property/standard/subparts', []);
 	}
 
 
@@ -467,17 +467,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/property/type' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/property/type');
 
-		if( isset( $data['customer.property.type.id'] ) && $data['customer.property.type.id'] != '' ) {
-			$item = $manager->getItem( $data['customer.property.type.id'] );
+		if (isset($data['customer.property.type.id']) && $data['customer.property.type.id'] != '') {
+			$item = $manager->getItem($data['customer.property.type.id']);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -489,11 +489,11 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['customer.property.type.code'] = $data['customer.property.type.code'] . '_copy';
 			$data['customer.property.type.id'] = '';
@@ -509,7 +509,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/type/customer/property/template-item
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@ 
 		$tplconf = 'admin/jqadm/type/customer/property/template-item';
 		$default = 'type/customer/property/item-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Attribute/Property/Standard.php

Braces +3 added lines, -6 removed lines

@@ -121,14 +121,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -320,8 +318,7 @@ 
 			{
 				$propItem = $propItems[$entry['attribute.property.id']];
 				unset( $propItems[$entry['attribute.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -44,15 +44,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,9 +65,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'property', [] );
+		$data = $view->param('property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['attribute.lists.siteid'] = $siteid;
 		}
 
@@ -75,11 +75,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -113,26 +113,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'property', [] ) );
+			$this->fromArray($view->item, $view->param('property', []));
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-property' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -146,7 +146,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/attribute/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -221,7 +221,7 @@ 
 		 * @see admin/jqadm/attribute/property/decorators/excludes
 		 * @see admin/jqadm/attribute/property/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/property/' . $type, $name );
+		return $this->createSubClient('attribute/property/' . $type, $name);
 	}
 
 
@@ -265,7 +265,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/property/standard/subparts', []);
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute/property/type' );
-		return $manager->searchItems( $manager->createSearch()->setSlice( 0, 0x7fffffff ) );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'attribute/property/type');
+		return $manager->searchItems($manager->createSearch()->setSlice(0, 0x7fffffff));
 	}
 
 
@@ -287,29 +287,29 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Attribute\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute/property' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'attribute/property');
 
-		$propItems = $item->getPropertyItems( null, false );
+		$propItems = $item->getPropertyItems(null, false);
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['attribute.property.id']] ) )
+			if (isset($propItems[$entry['attribute.property.id']]))
 			{
 				$propItem = $propItems[$entry['attribute.property.id']];
-				unset( $propItems[$entry['attribute.property.id']] );
+				unset($propItems[$entry['attribute.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -320,16 +320,16 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $item->getPropertyItems( null, false ) as $item )
+		foreach ($item->getPropertyItems(null, false) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['attribute.property.siteid'] = $siteId;
 				$list['attribute.property.id'] = '';
@@ -348,7 +348,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/attribute/property/template-item
 		 * Relative path to the HTML body template of the property subpart for attributes.
@@ -372,6 +372,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/property/template-item';
 		$default = 'attribute/item-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -305,8 +305,7 @@
 			{
 				$propItem = $propItems[$entry['product.property.id']];
 				unset( $propItems[$entry['product.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +40 added lines, -40 removed lines

@@ -42,15 +42,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -63,9 +63,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'characteristic/property', [] );
+		$data = $view->param('characteristic/property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['product.lists.siteid'] = $siteid;
 		}
 
@@ -73,11 +73,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,15 +90,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -109,10 +109,10 @@ 
 	{
 		$view = $this->getView();
 
-		$this->fromArray( $view->item, $view->param( 'characteristic/property', [] ) );
+		$this->fromArray($view->item, $view->param('characteristic/property', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -125,7 +125,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -200,7 +200,7 @@ 
 		 * @see admin/jqadm/product/characteristic/property/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/property/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/property/' . $type, $name );
+		return $this->createSubClient('product/characteristic/property/' . $type, $name);
 	}
 
 
@@ -210,14 +210,14 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Property\Iface[] $propItems List of property items
 	 * @return \Aimeos\MShop\Common\Item\Property\Iface[] Filtered list of property items
 	 */
-	protected function excludeItems( array $propItems )
+	protected function excludeItems(array $propItems)
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
 
-		foreach( $propItems as $key => $propItem )
+		foreach ($propItems as $key => $propItem)
 		{
-			if( in_array( $propItem->getType(), $excludes ) ) {
-				unset( $propItems[$key] );
+			if (in_array($propItem->getType(), $excludes)) {
+				unset($propItems[$key]);
 			}
 		}
 
@@ -265,7 +265,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/characteristic/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/characteristic/property/standard/subparts', []);
 	}
 
 
@@ -276,14 +276,14 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product/property/type' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('!=', 'product.property.type.code', $excludes));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -293,28 +293,28 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product/property' );
-		$propItems = $this->excludeItems( $item->getPropertyItems( null, false ) );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/property');
+		$propItems = $this->excludeItems($item->getPropertyItems(null, false));
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['product.property.id']] ) )
+			if (isset($propItems[$entry['product.property.id']]))
 			{
 				$propItem = $propItems[$entry['product.property.id']];
-				unset( $propItems[$entry['product.property.id']] );
+				unset($propItems[$entry['product.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -325,16 +325,16 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $this->excludeItems( $item->getPropertyItems( null, false ) ) as $item )
+		foreach ($this->excludeItems($item->getPropertyItems(null, false)) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.property.siteid'] = $siteId;
 				$list['product.property.id'] = '';
@@ -353,7 +353,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/characteristic/property/template-item
 		 * Relative path to the HTML body template of the property characteristic subpart for products.
@@ -377,6 +377,6 @@ 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Customer/Property/Standard.php

Braces +3 added lines, -6 removed lines

@@ -121,14 +121,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -299,8 +297,7 @@ 
 			{
 				$propItem = $propItems[$entry['customer.property.id']];
 				unset( $propItems[$entry['customer.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Customer\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -44,15 +44,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,9 +65,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'property', [] );
+		$data = $view->param('property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['customer.lists.siteid'] = $siteid;
 		}
 
@@ -75,11 +75,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -113,26 +113,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'property', [] ) );
+			$this->fromArray($view->item, $view->param('property', []));
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-property' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -146,7 +146,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/customer/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer JQAdm client
@@ -221,7 +221,7 @@ 
 		 * @see admin/jqadm/customer/property/decorators/excludes
 		 * @see admin/jqadm/customer/property/decorators/global
 		 */
-		return $this->createSubClient( 'customer/property/' . $type, $name );
+		return $this->createSubClient('customer/property/' . $type, $name);
 	}
 
 
@@ -265,7 +265,7 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/property/standard/subparts', []);
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/property/type' );
-		return $manager->searchItems( $manager->createSearch()->setSlice( 0, 0x7fffffff ) );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/property/type');
+		return $manager->searchItems($manager->createSearch()->setSlice(0, 0x7fffffff));
 	}
 
 
@@ -287,29 +287,29 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Customer\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Customer\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/property' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/property');
 
-		$propItems = $item->getPropertyItems( null, false );
+		$propItems = $item->getPropertyItems(null, false);
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['customer.property.id']] ) )
+			if (isset($propItems[$entry['customer.property.id']]))
 			{
 				$propItem = $propItems[$entry['customer.property.id']];
-				unset( $propItems[$entry['customer.property.id']] );
+				unset($propItems[$entry['customer.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -320,16 +320,16 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Customer\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Customer\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $item->getPropertyItems( null, false ) as $item )
+		foreach ($item->getPropertyItems(null, false) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['customer.property.siteid'] = $siteId;
 				$list['customer.property.id'] = '';
@@ -348,7 +348,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/customer/property/template-item
 		 * Relative path to the HTML body template of the property subpart for customers.
@@ -372,6 +372,6 @@ 
 		$tplconf = 'admin/jqadm/customer/property/template-item';
 		$default = 'customer/item-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/templates/customer/item-address-standard.php

Braces +5 added lines, -2 removed lines

@@ -81,9 +81,12 @@
 								</select>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-languageid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 					<div class="form-group row optional">

Spacing +112 added lines, -112 removed lines

@@ -20,8 +20,8 @@ 
 ?>
 <div id="address" class="item-address content-block tab-pane fade" role="tabpanel" aria-labelledby="address">
 	<div id="item-address-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'addressData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('addressData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" v-bind:key="idx" class="group-item card">
@@ -30,20 +30,20 @@ 
 				v-bind:data-target="'#item-address-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-address-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label">{{ getLabel(idx, 'customer.address.') }}</span>
 				&nbsp;
 				<div class="card-tools-right">
-					<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Duplicate entry (Ctrl+D)') ); ?>"
+					<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Duplicate entry (Ctrl+D)')); ?>"
 						v-on:click.stop="duplicateItem(idx)">
 					</div>
 					<div v-if="!checkSite('customer.address.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click="removeItem(idx)">
 					</div>
 				</div>
@@ -53,29 +53,29 @@ 
 				v-bind:aria-labelledby="'item-address-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Personal data' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Personal data')); ?></h2>
 
 					<input class="item-id" type="hidden"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.id' ) ) ); ?>'.replace('idx', idx)"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.id'))); ?>'.replace('idx', idx)"
 						v-bind:value="items[idx]['customer.address.id']" />
 
-					<?php $languages = $this->get( 'pageLangItems', [] ) ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []) ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('customer.address.siteid', idx)"
 									v-model="items[idx]['customer.address.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['customer.address.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['customer.address.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
@@ -83,261 +83,261 @@ 
 						</div>
 					<?php else : ?>
 						<input class="item-languageid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Salutation' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Salutation')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-salutation" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.salutation' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-salutation" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.salutation'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.salutation']" >
 								<option value="company" v-bind:selected="items[idx]['customer.address.salutation'] == 'company'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'company' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'company')); ?>
 								</option>
 								<option value="mr" v-bind:selected="items[idx]['customer.address.salutation'] == 'mr'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'mr' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'mr')); ?>
 								</option>
 								<option value="mrs" v-bind:selected="items[idx]['customer.address.salutation'] == 'mrs'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'mrs' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'mrs')); ?>
 								</option>
 								<option value="miss" v-bind:selected="items[idx]['customer.address.salutation'] == 'miss'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'miss' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'miss')); ?>
 								</option>
 							</select>
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'How the customer is addressed in e-mails' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'How the customer is addressed in e-mails')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Title' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Title')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-title" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.title' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
+							<input class="form-control item-title" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.title'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.title']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Honorary titles like Dr., Ph.D, etc.' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Honorary titles like Dr., Ph.D, etc.')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Last name' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Last name')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-lastname" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.lastname' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
+							<input class="form-control item-lastname" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.lastname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.lastname']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Last name of the person or full name in cultures where no first names are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Last name of the person or full name in cultures where no first names are used')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'First name' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'First name')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-firstname" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.firstname' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
+							<input class="form-control item-firstname" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.firstname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.firstname']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Delivery address' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Delivery address')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Street' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Street')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address1" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.address1' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
+							<input class="form-control item-address1" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.address1'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.address1']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'House number' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'House number')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address2" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.address2' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
+							<input class="form-control item-address2" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.address2'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.address2']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Address identifier of the customer\'s house for delivery' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Address identifier of the customer\'s house for delivery')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Floor / Appartment' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Floor / Appartment')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address3" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.address3' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
+							<input class="form-control item-address3" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.address3'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.address3']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Additional information where the customer\'s apartment can be found' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Additional information where the customer\'s apartment can be found')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Zip code' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Zip code')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-postal" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.postal' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
+							<input class="form-control item-postal" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.postal'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.postal']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Postal code for delivery if used in the area the customer is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Postal code for delivery if used in the area the customer is living')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'City' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'City')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-city" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.city' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
+							<input class="form-control item-city" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.city'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.city']" />
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Country' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Country')); ?></label>
 						<div class="col-sm-8">
 							<select is="combo-box" class="form-control c-select item-countryid" required="required"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.countryid' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.countryid'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
-								v-bind:tabindex="'<?= $this->get( 'tabindex' ); ?>'"
+								v-bind:tabindex="'<?= $this->get('tabindex'); ?>'"
 								v-bind:getfcn="getCountries"
 								v-model="items[idx]['customer.address.countryid']" >
 								<option value=""></option>
 							</select>
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Two letter ISO country code' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Two letter ISO country code')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'State' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'State')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-state" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.state' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
+							<input class="form-control item-state" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.state'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.state']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Short state code (e.g. NY) if used in the country the customer is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Short state code (e.g. NY) if used in the country the customer is living')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Communication' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Communication')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Telephone' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Telephone')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-telephone" type="tel" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.telephone' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
+							<input class="form-control item-telephone" type="tel" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.telephone'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.telephone']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', '(International) telephone number without separation characters, can start with a "+"' ) ); ?>
+							<?= $enc->html($this->translate('admin', '(International) telephone number without separation characters, can start with a "+"')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Facsimile' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Facsimile')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-telefax" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.telefax' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
+							<input class="form-control item-telefax" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.telefax'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.telefax']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', '(International) facsimilie number without separation characters, can start with a "+"' ) ); ?>
+							<?= $enc->html($this->translate('admin', '(International) facsimilie number without separation characters, can start with a "+"')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'E-mail' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'E-mail')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-email" type="email" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.email' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-mail address (optional)' ) ); ?>"
+							<input class="form-control item-email" type="email" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.email'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'E-mail address (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.email']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'E-mail address that belongs to the address' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'E-mail address that belongs to the address')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Web site' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Web site')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-website" type="url" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.website' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
+							<input class="form-control item-website" type="url" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.website'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.website']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'URL of the customer web site' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'URL of the customer web site')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Company details' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Company details')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Company' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Company')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-company" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.company' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
+							<input class="form-control item-company" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.company'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.company']" />
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'VAT ID' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'VAT ID')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-vatid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.vatid' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
+							<input class="form-control item-vatid" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.vatid'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.vatid']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Official VAT ID to determine if the tax needs to be billed in invoices' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Official VAT ID to determine if the tax needs to be billed in invoices')); ?>
 						</div>
 					</div>
 				</div>
 
-				<?= $this->get( 'addressBody' ); ?>
+				<?= $this->get('addressBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('customer.address.')" >
 			</div>
 		</div>