aimeos / ai-admin-jqadm

admin/jqadm/templates/order/item-standard.php

Braces +10 added lines, -4 removed lines

@@ -322,8 +322,11 @@ 
 										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div>
 									</div>
 								<?php endforeach; ?>
-							<?php else : ?>
-								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?>
+							<?php else {
+	: ?>
+								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) );
+}
+?>
 							<?php endif; ?>
 						</div>
 
@@ -731,8 +734,11 @@ 
 								<div class="col-6 name">
 									<?php if( $basket->getPrice()->getTaxFlag() ) : ?>
 										<?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?>
-									<?php else : ?>
-										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?>
+									<?php else {
+	: ?>
+										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) );
+}
+?>
 									<?php endif; ?>
 								</div>
 								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div>

Spacing +306 added lines, -306 removed lines

@@ -5,20 +5,20 @@ 
  * @copyright Aimeos (aimeos.org), 2017-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
-$sortItems = function( array $items )
+$sortItems = function(array $items)
 {
 	$result = [];
 
-	if( isset( $items['payment'] ) ) {
-		$result['payment'] = $items['payment']; unset( $items['payment'] );
+	if (isset($items['payment'])) {
+		$result['payment'] = $items['payment']; unset($items['payment']);
 	}
 
-	if( isset( $items['delivery'] ) ) {
-		$result['delivery'] = $items['delivery']; unset( $items['delivery'] );
+	if (isset($items['delivery'])) {
+		$result['delivery'] = $items['delivery']; unset($items['delivery']);
 	}
 
 	return $result + $items;
@@ -28,32 +28,32 @@ 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/save/target' );
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$target = $this->config('admin/jqadm/url/save/target');
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/save/action', 'save');
+$config = $this->config('admin/jqadm/url/save/config', []);
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
-$listTarget = $this->config( 'admin/jqadm/url/search/target' );
-$listCntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$listAction = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$listConfig = $this->config( 'admin/jqadm/url/search/config', [] );
+$listTarget = $this->config('admin/jqadm/url/search/target');
+$listCntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$listAction = $this->config('admin/jqadm/url/search/action', 'search');
+$listConfig = $this->config('admin/jqadm/url/search/config', []);
 
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
+$newTarget = $this->config('admin/jqadm/url/create/target');
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
 
 
-$searchParams = $params = $this->get( 'pageParams', [] );
-unset( $searchParams['id'] );
+$searchParams = $params = $this->get('pageParams', []);
+unset($searchParams['id']);
 
 /// Price format with price value (%1$s) and currency (%2$s)
-$priceFormat = $this->translate( 'client/code', '%1$s %2$s' );
+$priceFormat = $this->translate('client/code', '%1$s %2$s');
 
 $serviceAttrCodes = [
 	/** admin/jqadm/order/service/delivery/attribute/suggest
@@ -68,7 +68,7 @@ 
 	 * @category Developer
 	 * @see admin/jqadm/order/service/payment/attribute/suggest
 	 */
-	'delivery' => $this->config( 'admin/jqadm/order/service/delivery/attribute/suggest', ['trackingid'] ),
+	'delivery' => $this->config('admin/jqadm/order/service/delivery/attribute/suggest', ['trackingid']),
 
 	/** admin/jqadm/order/service/payment/attribute/suggest
 	 * List of suggested configuration keys for payment service attributes in orders
@@ -82,59 +82,59 @@ 
 	 * @category Developer
 	 * @see admin/jqadm/order/service/delivery/attribute/suggest
 	 */
-	'payment' => $this->config( 'admin/jqadm/order/service/payment/attribute/suggest', [] ),
+	'payment' => $this->config('admin/jqadm/order/service/payment/attribute/suggest', []),
 ];
 
 $statusList = [
-	'-1' => $this->translate( 'mshop/code', 'stat:-1' ),
-	'0' => $this->translate( 'mshop/code', 'stat:0' ),
-	'1' => $this->translate( 'mshop/code', 'stat:1' ),
-	'2' => $this->translate( 'mshop/code', 'stat:2' ),
-	'3' => $this->translate( 'mshop/code', 'stat:3' ),
-	'4' => $this->translate( 'mshop/code', 'stat:4' ),
-	'5' => $this->translate( 'mshop/code', 'stat:5' ),
-	'6' => $this->translate( 'mshop/code', 'stat:6' ),
-	'7' => $this->translate( 'mshop/code', 'stat:7' ),
+	'-1' => $this->translate('mshop/code', 'stat:-1'),
+	'0' => $this->translate('mshop/code', 'stat:0'),
+	'1' => $this->translate('mshop/code', 'stat:1'),
+	'2' => $this->translate('mshop/code', 'stat:2'),
+	'3' => $this->translate('mshop/code', 'stat:3'),
+	'4' => $this->translate('mshop/code', 'stat:4'),
+	'5' => $this->translate('mshop/code', 'stat:5'),
+	'6' => $this->translate('mshop/code', 'stat:6'),
+	'7' => $this->translate('mshop/code', 'stat:7'),
 ];
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<?php if( isset( $this->item ) ) : ?>
-	<?php $basket = $this->item; $currency = $this->translate( 'currency', $basket->getPrice()->getCurrencyId() ); ?>
+<?php if (isset($this->item)) : ?>
+	<?php $basket = $this->item; $currency = $this->translate('currency', $basket->getPrice()->getCurrencyId()); ?>
 
-	<form class="item item-order form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-		<input id="item-baseid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.id' ) ) ); ?>" value="<?= $enc->attr( $basket->getId() ); ?>" />
-		<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+	<form class="item item-order form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+		<input id="item-baseid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'order.base.id'))); ?>" value="<?= $enc->attr($basket->getId()); ?>" />
+		<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 		<?= $this->csrf()->formfield(); ?>
 
 		<nav class="main-navbar">
 			<span class="navbar-brand">
-				<?= $enc->html( $this->translate( 'admin', 'Order' ) ); ?>:
-				<?= $enc->html( $basket->getId() ); ?> -
-				<?= $enc->html( $this->number( $basket->getPrice()->getValue() ) ); ?>
-				<?= $enc->html( $basket->getPrice()->getCurrencyId() ); ?>
-				<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $basket->getLocale()->getSiteId() ) ); ?>)</span>
+				<?= $enc->html($this->translate('admin', 'Order')); ?>:
+				<?= $enc->html($basket->getId()); ?> -
+				<?= $enc->html($this->number($basket->getPrice()->getValue())); ?>
+				<?= $enc->html($basket->getPrice()->getCurrencyId()); ?>
+				<span class="navbar-secondary">(<?= $enc->html($this->site()->match($basket->getLocale()->getSiteId())); ?>)</span>
 			</span>
 			<div class="item-actions">
 				<a class="btn btn-secondary act-cancel"
-					title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list') ); ?>"
-					href="<?= $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $searchParams, [], $listConfig ) ); ?>">
-					<?= $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?>
+					title="<?= $enc->attr($this->translate('admin', 'Cancel and return to list')); ?>"
+					href="<?= $enc->attr($this->url($listTarget, $listCntl, $listAction, $searchParams, [], $listConfig)); ?>">
+					<?= $enc->html($this->translate('admin', 'Cancel')); ?>
 				</a>
 
 				<div class="btn-group">
 					<button type="submit" class="btn btn-primary act-save"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)') ); ?>">
-						<?= $enc->html( $this->translate( 'admin', 'Save' ) ); ?>
+						title="<?= $enc->attr($this->translate('admin', 'Save entry (Ctrl+S)')); ?>">
+						<?= $enc->html($this->translate('admin', 'Save')); ?>
 					</button>
 					<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"
 						aria-haspopup="true" aria-expanded="false">
-						<span class="sr-only"><?= $enc->html( $this->translate( 'admin', 'Toggle dropdown' ) ); ?></span>
+						<span class="sr-only"><?= $enc->html($this->translate('admin', 'Toggle dropdown')); ?></span>
 					</button>
 					<ul class="dropdown-menu dropdown-menu-right">
-						<li class="dropdown-item"><a class="next-action" href="#" data-next="search"><?= $enc->html( $this->translate( 'admin', 'Save & Close' ) ); ?></a></li>
+						<li class="dropdown-item"><a class="next-action" href="#" data-next="search"><?= $enc->html($this->translate('admin', 'Save & Close')); ?></a></li>
 					</ul>
 				</div>
 			</div>
@@ -147,14 +147,14 @@ 
 
 					<li class="nav-item order">
 						<a class="nav-link active" href="#order" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="order">
-							<?= $enc->html( $this->translate( 'admin', 'Order' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Order')); ?>
 						</a>
 					</li>
 
-					<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $type => $subpart ) : ?>
-						<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-							<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type+1; ?>">
-								<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+					<?php foreach (array_values($this->get('itemSubparts', [])) as $type => $subpart) : ?>
+						<li class="nav-item <?= $enc->attr($subpart); ?>">
+							<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type + 1; ?>">
+								<?= $enc->html($this->translate('admin', $subpart)); ?>
 							</a>
 						</li>
 					<?php endforeach; ?>
@@ -163,16 +163,16 @@ 
 
 				<div class="item-meta text-muted">
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getTimeModified() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getTimeModified()); ?></span>
 					</small>
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getTimeCreated() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Created')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getTimeCreated()); ?></span>
 					</small>
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getEditor() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getEditor()); ?></span>
 					</small>
 				</div>
 			</div>
@@ -182,57 +182,57 @@ 
 				<div id="order" class="item-order tab-pane fade show active" role="tabpanel" aria-labelledby="order">
 
 					<div class="row item-base">
-						<div class="col-xl-6 content-block <?= $this->site()->readonly( $basket->getSiteId() ); ?>">
+						<div class="col-xl-6 content-block <?= $this->site()->readonly($basket->getSiteId()); ?>">
 							<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" required="required" tabindex="1"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.languageid' ) ) ); ?>"
-										<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
+										name="<?= $enc->attr($this->formparam(array('item', 'order.base.languageid'))); ?>"
+										<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
 										<option value="">
-											<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Please select')); ?>
 										</option>
 
-										<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-											<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $basket->getLocale()->getLanguageId(), $langId ); ?> >
-												<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
+										<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+											<option value="<?= $enc->attr($langId); ?>" <?= $selected($basket->getLocale()->getLanguageId(), $langId); ?> >
+												<?= $enc->html($this->translate('language', $langId)); ?>
 											</option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 							</div>
 							<div class="form-group row">
-								<label class="col-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Site' ) ); ?></label>
+								<label class="col-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Site')); ?></label>
 								<div class="col-8">
-									<span class="form-control item-sitecode"><?= $enc->html( $basket->getSiteCode() ); ?></span>
+									<span class="form-control item-sitecode"><?= $enc->html($basket->getSiteCode()); ?></span>
 								</div>
 								<div class="col-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Site the order was placed at' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Site the order was placed at')); ?>
 								</div>
 							</div>
 						</div>
 
-						<div class="col-xl-6 content-block <?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?>">
+						<div class="col-xl-6 content-block <?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?>">
 							<div class="form-group row">
-								<label class="col-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Customer' ) ); ?></label>
+								<label class="col-4 form-control-label"><?= $enc->html($this->translate('admin', 'Customer')); ?></label>
 								<div class="col-8">
 									<select class="combobox item-customer" tabindex="1"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.customerid' ) ) ); ?>"
-										<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
-										<option value="<?= $enc->attr( $this->get( 'itemData/order.base.customerid' ) ); ?>" >
-											<?= $enc->html( $this->get( 'itemData/customer.code' ) ); ?>
+										name="<?= $enc->attr($this->formparam(array('item', 'order.base.customerid'))); ?>"
+										<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
+										<option value="<?= $enc->attr($this->get('itemData/order.base.customerid')); ?>" >
+											<?= $enc->html($this->get('itemData/customer.code')); ?>
 										</option>
 									</select>
 								</div>
 							</div>
 							<div class="form-group row">
-								<label class="col-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Customer ID' ) ); ?></label>
+								<label class="col-4 form-control-label"><?= $enc->html($this->translate('admin', 'Customer ID')); ?></label>
 								<div class="col-8">
 									<span class="form-control item-customerid">
-										<?php if( $basket->getCustomerId() ) : ?>
+										<?php if ($basket->getCustomerId()) : ?>
 											<a class="act-view" target="_blank"
-												href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'customer', 'id' => $basket->getCustomerId()], [], $getConfig ) ); ?>">
-												<?= $enc->attr( $basket->getCustomerId() ); ?>
+												href="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'customer', 'id' => $basket->getCustomerId()], [], $getConfig)); ?>">
+												<?= $enc->attr($basket->getCustomerId()); ?>
 											</a>
 										<?php endif; ?>
 									</span>
@@ -245,73 +245,73 @@ 
 					<div class="row item-product">
 
 						<div class="col-sm-12 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Products' ) ); ?></h2>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Products')); ?></h2>
 							<table class="item-product-list table table-striped">
 								<thead>
 									<tr>
-										<th class="item-column column-subscription"><?= $enc->html( $this->translate( 'admin', 'Renew' ) ); ?></th>
-										<th class="item-column column-status"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></th>
-										<th class="item-column column-desc"><?= $enc->html( $this->translate( 'admin', 'Name' ) ); ?></th>
-										<th class="item-column column-quantity"><?= $enc->html( $this->translate( 'admin', 'Quantity' ) ); ?></th>
-										<th class="item-column column-price"><?= $enc->html( $this->translate( 'admin', 'Price' ) ); ?></th>
-										<th class="item-column column-sum"><?= $enc->html( $this->translate( 'admin', 'Sum' ) ); ?></th>
+										<th class="item-column column-subscription"><?= $enc->html($this->translate('admin', 'Renew')); ?></th>
+										<th class="item-column column-status"><?= $enc->html($this->translate('admin', 'Status')); ?></th>
+										<th class="item-column column-desc"><?= $enc->html($this->translate('admin', 'Name')); ?></th>
+										<th class="item-column column-quantity"><?= $enc->html($this->translate('admin', 'Quantity')); ?></th>
+										<th class="item-column column-price"><?= $enc->html($this->translate('admin', 'Price')); ?></th>
+										<th class="item-column column-sum"><?= $enc->html($this->translate('admin', 'Sum')); ?></th>
 									</tr>
 								</thead>
 								<tbody>
 
-									<?php foreach( (array) $basket->getProducts() as $pos => $orderProduct ) : ?>
+									<?php foreach ((array) $basket->getProducts() as $pos => $orderProduct) : ?>
 										<tr class="list-item">
 											<td class="item-column column-subscription">
 												<?php $newParams = [
 														'item' => ['subscription.ordbaseid' => $basket->getId(), 'subscription.ordprodid' => $orderProduct->getId()],
-														'site' => $this->param( 'site' ),
-														'lang' => $this->param( 'lang' ),
+														'site' => $this->param('site'),
+														'lang' => $this->param('lang'),
 														'resource' => 'subscription'
 													];
 												?>
-												<a class="btn btn-subscription fa" href="<?= $this->url( $newTarget, $newCntl, $newAction, $newParams, [], $newConfig ) ?>"></a>
+												<a class="btn btn-subscription fa" href="<?= $this->url($newTarget, $newCntl, $newAction, $newParams, [], $newConfig) ?>"></a>
 											</td>
 											<td class="item-column column-status">
 												<select class="form-control custom-select product-status" required="required" tabindex="1"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'product', $pos, 'order.base.product.status' ) ) ); ?>"
-													<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
+													name="<?= $enc->attr($this->formparam(array('item', 'product', $pos, 'order.base.product.status'))); ?>"
+													<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
 													<option value="">
-														<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+														<?= $enc->html($this->translate('admin', 'Please select')); ?>
 													</option>
-													<?php foreach( $statusList as $code => $label ) : ?>
-														<option value="<?= $code ?>" <?= $selected( $this->get( 'itemData/product/' . $pos . '/order.base.product.status' ), $code ); ?> >
-															<?= $enc->html( $label ); ?>
+													<?php foreach ($statusList as $code => $label) : ?>
+														<option value="<?= $code ?>" <?= $selected($this->get('itemData/product/' . $pos . '/order.base.product.status'), $code); ?> >
+															<?= $enc->html($label); ?>
 														</option>
 													<?php endforeach; ?>
 												</select>
 											</td>
 											<td class="item-column column-desc">
-												<span class="product-name"><?= $enc->html( $orderProduct->getName() ); ?></span>
+												<span class="product-name"><?= $enc->html($orderProduct->getName()); ?></span>
 												<span class="product-attr">
-													<?php foreach( $orderProduct->getAttributeItems() as $attrItem ) : ?>
-														<span class="attr-code"><?= $enc->html( $attrItem->getCode() ); ?></span>
+													<?php foreach ($orderProduct->getAttributeItems() as $attrItem) : ?>
+														<span class="attr-code"><?= $enc->html($attrItem->getCode()); ?></span>
 														<span class="attr-value">
-															<?php if( $attrItem->getQuantity() > 1 ) : ?>
-																<?= $enc->html( $attrItem->getQuantity() ); ?>×
+															<?php if ($attrItem->getQuantity() > 1) : ?>
+																<?= $enc->html($attrItem->getQuantity()); ?>×
 															<?php endif; ?>
-															<?= $enc->html( $attrItem->getValue() ); ?>
+															<?= $enc->html($attrItem->getValue()); ?>
 														</span>
 													<?php endforeach; ?>
 												</span>
-												<span class="product-sku"><?= $enc->html( $orderProduct->getProductCode() ); ?></span>
+												<span class="product-sku"><?= $enc->html($orderProduct->getProductCode()); ?></span>
 											</td>
 											<td class="item-column column-quantity">
-												<span class="product-quantity"><?= $enc->html( $orderProduct->getQuantity() ); ?></span>
+												<span class="product-quantity"><?= $enc->html($orderProduct->getQuantity()); ?></span>
 											</td>
 											<td class="item-column column-price">
-												<span class="product-price"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getValue(), $currency ) ); ?></span>
-												<span class="product-costs"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getCosts(), $currency ) ); ?></span>
-												<span class="product-rebate"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getRebate(), $currency ) ); ?></span>
+												<span class="product-price"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getValue(), $currency)); ?></span>
+												<span class="product-costs"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getCosts(), $currency)); ?></span>
+												<span class="product-rebate"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getRebate(), $currency)); ?></span>
 											</td>
 											<td class="item-column column-sum">
-												<span class="product-price"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getValue() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
-												<span class="product-costs"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getCosts() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
-												<span class="product-rebate"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getRebate() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
+												<span class="product-price"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getValue() * $orderProduct->getQuantity()), $currency)); ?></span>
+												<span class="product-costs"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getCosts() * $orderProduct->getQuantity()), $currency)); ?></span>
+												<span class="product-rebate"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getRebate() * $orderProduct->getQuantity()), $currency)); ?></span>
 											</td>
 										</tr>
 									<?php endforeach; ?>
@@ -326,27 +326,27 @@ 
 					<div class="row item-misc">
 
 						<div class="col-xl-6 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Coupon' ) ); ?></h2>
-							<?php if( $basket->getCoupons() !== [] ) : ?>
-								<?php foreach( $basket->getCoupons() as $code => $product ) : ?>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Coupon')); ?></h2>
+							<?php if ($basket->getCoupons() !== []) : ?>
+								<?php foreach ($basket->getCoupons() as $code => $product) : ?>
 									<div class="form-group row">
-										<label class="col-sm-4"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
-										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div>
+										<label class="col-sm-4"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
+										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr($code); ?></span></div>
 									</div>
 								<?php endforeach; ?>
 							<?php else : ?>
-								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'No voucher')); ?>
 							<?php endif; ?>
 						</div>
 
 						<div class="col-xl-6 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Comment' ) ); ?></h2>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Comment')); ?></h2>
 							<div class="form-group optional">
 								<textarea class="form-control item-title" type="text" tabindex="1" rows="3"
-									name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.comment' ) ) ); ?>"
-									placeholder="<?= $enc->attr( $this->translate( 'admin', 'Customer comment (optional)' ) ); ?>"
-									<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?>
-								><?= $enc->html( $basket->getComment() ); ?></textarea>
+									name="<?= $enc->attr($this->formparam(array('item', 'order.base.comment'))); ?>"
+									placeholder="<?= $enc->attr($this->translate('admin', 'Customer comment (optional)')); ?>"
+									<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?>
+								><?= $enc->html($basket->getComment()); ?></textarea>
 							</div>
 						</div>
 
@@ -354,265 +354,265 @@ 
 
 
 					<div class="row">
-						<?php foreach( $sortItems( $basket->getAddresses() ) as $type => $addressItem ) : $code = 'address:' . $type; ?>
+						<?php foreach ($sortItems($basket->getAddresses()) as $type => $addressItem) : $code = 'address:' . $type; ?>
 
 							<div class="col-xl-6 content-block item-address">
-								<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?></h2>
+								<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin/ext', $code)); ?></h2>
 
 								<div class="address-short">
 									<?php
 										/// short order address with company (%1$s), first name (%2$s), last name (%3$s), street (%4$s), house number (%5$s),
 										/// zip code (%6$s), city (%7$s),state (%8$s), countryid (%9$s), e-mail (%10$s), telephone (%11$s), VAT ID  (%12$s)
-										$addrFormat = $this->translate( 'admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s" );
+										$addrFormat = $this->translate('admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s");
 									?>
-									<span class="address-text" data-format="<?= $enc->attr( $addrFormat ); ?>"><!-- inserted by order.js --></span>
+									<span class="address-text" data-format="<?= $enc->attr($addrFormat); ?>"><!-- inserted by order.js --></span>
 									<span class="address-edit"></span>
 								</div>
 
 								<fieldset class="address-form">
 									<div class="form-group row mandatory">
-										<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="1" data-field="email"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.email' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-Mail address (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.email' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.email'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'E-Mail address (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.email')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Customer e-mail address' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Customer e-mail address')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<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="1" data-field="languageid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.languageid' ) ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
-												<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.languageid'))); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
+												<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 
-												<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-													<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.languageid' ), $langId ); ?> >
-														<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
+												<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+													<option value="<?= $enc->attr($langId); ?>" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.languageid'), $langId); ?> >
+														<?= $enc->html($this->translate('language', $langId)); ?>
 													</option>
 												<?php endforeach; ?>
 											</select>
 										</div>
 									</div>
 									<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="1" data-field="salutation"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.salutation' ) ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
-												<option value="" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), '' ); ?> >
-													<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.salutation'))); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
+												<option value="" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), ''); ?> >
+													<?= $enc->html($this->translate('admin', 'Please select')); ?>
 												</option>
-												<option value="company" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'company' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'company' ) ); ?>
+												<option value="company" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'company'); ?> >
+													<?= $enc->html($this->translate('client/code', 'company')); ?>
 												</option>
-												<option value="mr" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'mr' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'mr' ) ); ?>
+												<option value="mr" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'mr'); ?> >
+													<?= $enc->html($this->translate('client/code', 'mr')); ?>
 												</option>
-												<option value="mrs" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'mrs' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'mrs' ) ); ?>
+												<option value="mrs" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'mrs'); ?> >
+													<?= $enc->html($this->translate('client/code', 'mrs')); ?>
 												</option>
-												<option value="miss" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'miss' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'miss' ) ); ?>
+												<option value="miss" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'miss'); ?> >
+													<?= $enc->html($this->translate('client/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="1" data-field="title"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.title' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.title' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.title'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.title')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="lastname"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.lastname' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.lastname' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.lastname'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.lastname')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="firstname"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.firstname' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.firstname' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.firstname'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.firstname')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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', '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="1" data-field="address1"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address1' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address1' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address1'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address1')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="address2"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address2' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address2' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address2'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address2')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="address3"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address3' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address3' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address3'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address3')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="postal"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.postal' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.postal' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.postal'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.postal')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="city"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.city' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.city' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.city'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.city')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="state"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.state' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.state' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.state'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.state')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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 class="form-group row optional">
-										<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">
 											<input class="form-control item-countryid" type="text" tabindex="1" maxlength="2" pattern="^[a-zA-Z]{2}$" data-field="countryid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.countryid' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country code (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.countryid' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.countryid'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Country code (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.countryid')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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', '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="1" data-field="telephone"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.telephone' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.telephone' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.telephone'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.telephone')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="telefax"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.telefax' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.telefax' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.telefax'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.telefax')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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', '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="1" data-field="website"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.website' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.website') ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.website'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.website')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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 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="1" data-field="company"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.company' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.company' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.company'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.company')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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="1" data-field="vatid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.vatid' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.vatid' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.vatid'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.vatid')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</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>
@@ -622,41 +622,41 @@ 
 					</div>
 
 					<div class="row">
-						<?php foreach( $sortItems( $basket->getServices() ) as $type => $services ) : $code = 'service:' . $type; ?>
-							<?php foreach( $services as $serviceItem ) : $serviceId = $serviceItem->getServiceId(); ?>
+						<?php foreach ($sortItems($basket->getServices()) as $type => $services) : $code = 'service:' . $type; ?>
+							<?php foreach ($services as $serviceItem) : $serviceId = $serviceItem->getServiceId(); ?>
 
 								<div class="col-xl-6 content-block item-service">
-									<h2 class="col-12 item-header"><?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?></h2>
+									<h2 class="col-12 item-header"><?= $enc->html($this->translate('admin/ext', $code)); ?></h2>
 									<div class="row">
 										<div class="col-6 content-block">
-											<span class="service-name"><?= $enc->html( $serviceItem->getName() ); ?></span>
-											<span class="service-code"><?= $enc->html( $serviceItem->getCode() ); ?></span>
+											<span class="service-name"><?= $enc->html($serviceItem->getName()); ?></span>
+											<span class="service-code"><?= $enc->html($serviceItem->getCode()); ?></span>
 										</div>
 										<div class="col-6 content-block">
-											<span class="service-price"><?= $enc->html( sprintf( $priceFormat, $this->number( $serviceItem->getPrice()->getValue() + $serviceItem->getPrice()->getCosts() ), $currency ) ); ?></span>
-											<?php if( $serviceItem->getPrice()->getRebate() > 0 ) : ?>
-												<span class="service-rebate"><?= $enc->html( sprintf( $priceFormat, $this->number( $serviceItem->getPrice()->getRebate() ), $currency ) ); ?></span>
+											<span class="service-price"><?= $enc->html(sprintf($priceFormat, $this->number($serviceItem->getPrice()->getValue() + $serviceItem->getPrice()->getCosts()), $currency)); ?></span>
+											<?php if ($serviceItem->getPrice()->getRebate() > 0) : ?>
+												<span class="service-rebate"><?= $enc->html(sprintf($priceFormat, $this->number($serviceItem->getPrice()->getRebate()), $currency)); ?></span>
 											<?php endif; ?>
 										</div>
 									</div>
 
-									<table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId ) ?>"
-										data-codes="<?= $enc->attr( isset( $serviceAttrCodes[$type] ) ? implode( ',', $serviceAttrCodes[$type] ) : '' ); ?>">
+									<table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId) ?>"
+										data-codes="<?= $enc->attr(isset($serviceAttrCodes[$type]) ? implode(',', $serviceAttrCodes[$type]) : ''); ?>">
 										<thead>
 											<tr>
 												<th>
-													<span class="help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></span>
+													<span class="help"><?= $enc->html($this->translate('admin', 'Code')); ?></span>
 													<div class="form-text text-muted help-text">
-														<?= $enc->html( $this->translate( 'admin', 'Service attribute code' ) ); ?>
+														<?= $enc->html($this->translate('admin', 'Service attribute code')); ?>
 													</div>
 												</th>
 												<th>
-													<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+													<?= $enc->html($this->translate('admin', 'Value')); ?>
 												</th>
 												<th class="actions">
-													<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+													<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 														<div class="btn act-add fa" tabindex="1"
-															title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+															title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 														</div>
 													<?php endif; ?>
 												</th>
@@ -664,38 +664,38 @@ 
 										</thead>
 										<tbody>
 
-											<?php foreach( (array) $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.id', [] ) as $idx => $attrId ) : ?>
+											<?php foreach ((array) $this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.id', []) as $idx => $attrId) : ?>
 												<tr class="service-attr-item">
 													<td>
-														<input type="hidden" class="service-attr-id" value="<?= $enc->attr( $attrId ); ?>"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.id', '' ) ) ); ?>" />
+														<input type="hidden" class="service-attr-id" value="<?= $enc->attr($attrId); ?>"
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.id', ''))); ?>" />
 														<input type="hidden" class="service-attr-attributeid"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.attrid', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.attrid/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.attrid', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.attrid/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-type"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.type', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.type/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.type', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.type/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-name"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.name', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.name/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.name', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.name/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-quantity"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.quantity', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.quantity/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.quantity', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.quantity/' . $idx)); ?>" />
 														<input type="text" class="service-attr-code form-control" tabindex="1"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.code', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.code/' . $idx ) ); ?>"
-															<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.code', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.code/' . $idx)); ?>"
+															<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 													</td>
 													<td>
 														<input type="text" class="service-attr-value form-control" tabindex="1"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.value', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.value/' . $idx ) ); ?>"
-															<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.value', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.value/' . $idx)); ?>"
+															<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 													</td>
 													<td class="actions">
-														<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+														<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 															<div class="btn act-delete fa" tabindex="1"
-																title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+																title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 															</div>
 														<?php endif; ?>
 													</td>
@@ -705,26 +705,26 @@ 
 											<tr class="prototype">
 												<td>
 													<input type="hidden" class="service-attr-id" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.id', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.id', ''))); ?>" />
 													<input type="hidden" class="service-attr-attributeid" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.attrid', '' ) ) ); ?>" />
-													<input type="hidden" class="service-attr-type" value="<?= $enc->attr( $type ); ?>" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.type', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.attrid', ''))); ?>" />
+													<input type="hidden" class="service-attr-type" value="<?= $enc->attr($type); ?>" disabled="disabled"
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.type', ''))); ?>" />
 													<input type="hidden" class="service-attr-name" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.name', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.name', ''))); ?>" />
 													<input type="hidden" class="service-attr-quantity" value="1" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.quantity', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.quantity', ''))); ?>" />
 													<input type="text" class="service-attr-code form-control" value="" disabled="disabled" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.code', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.code', ''))); ?>" />
 												</td>
 												<td>
 													<input type="text" class="service-attr-value form-control" value="" disabled="disabled" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.value', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.value', ''))); ?>" />
 												</td>
 												<td class="actions">
-													<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+													<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 														<div class="btn act-delete fa" tabindex="1"
-															title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+															title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 														</div>
 													<?php endif; ?>
 												</td>
@@ -741,40 +741,40 @@ 
 						<div class="col-xl-6 content-block"></div>
 
 						<div class="col-xl-6 content-block item-total">
-							<h2 class="item-header"><?= $enc->html( $this->translate( 'admin', 'Order totals' ) ); ?></h2>
+							<h2 class="item-header"><?= $enc->html($this->translate('admin', 'Order totals')); ?></h2>
 							<div class="form-group row total-subtotal">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Sub-total' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getValue() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Sub-total')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getValue()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-shipping">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Shipping' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getCosts() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Shipping')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getCosts()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-value">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Total' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getValue() + $basket->getPrice()->getCosts() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Total')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getValue() + $basket->getPrice()->getCosts()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-tax">
 								<div class="col-6 name">
-									<?php if( $basket->getPrice()->getTaxFlag() ) : ?>
-										<?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?>
+									<?php if ($basket->getPrice()->getTaxFlag()) : ?>
+										<?= $enc->html($this->translate('admin', 'Incl. tax')); ?>
 									<?php else : ?>
-										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Excl. tax')); ?>
 									<?php endif; ?>
 								</div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getTaxValue()), $currency)); ?></div>
 							</div>
 						</div>
 					</div>
 
 				</div>
 
-				<?= $this->get( 'itemBody' ); ?>
+				<?= $this->get('itemBody'); ?>
 
 			</div>
 
 			<div class="item-actions">
-				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+				<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 			</div>
 		</div>
 	</form>
@@ -784,4 +784,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Page.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 			if( ( $rootItem = reset( $sitePath ) ) !== false ) {
 				$view->pageSiteTree = $siteManager->getTree( $rootItem->getId(), [], $level );
 			}
-		}
-		else
+		} else
 		{
 			$view->pageSiteList = [$view->pageSiteTree];
 		}

Spacing +21 added lines, -21 removed lines

@@ -25,50 +25,50 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
-		parent::setView( $view );
+		parent::setView($view);
 
 		// set first to be able to show errors occuring afterwards
 		$view->pageParams = $this->getClientParams();
 		$context = $this->getContext();
 
-		$siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
-		$langManager = \Aimeos\MShop::create( $context, 'locale/language' );
-		$customerManager = \Aimeos\MShop::create( $context, 'customer' );
+		$siteManager = \Aimeos\MShop::create($context, 'locale/site');
+		$langManager = \Aimeos\MShop::create($context, 'locale/language');
+		$customerManager = \Aimeos\MShop::create($context, 'customer');
 
-		$siteItem = $siteManager->findItem( $view->param( 'site', 'default' ) );
+		$siteItem = $siteManager->findItem($view->param('site', 'default'));
 
 		try {
-			$siteid = $customerManager->getItem( $context->getUserId() )->getSiteId() ?: $siteItem->getSiteId();
-		} catch( \Exception $e ) {
+			$siteid = $customerManager->getItem($context->getUserId())->getSiteId() ?: $siteItem->getSiteId();
+		} catch (\Exception $e) {
 			$siteid = $siteItem->getSiteId();
 		}
 
-		if( $view->access( ['admin', 'super'] ) ) {
+		if ($view->access(['admin', 'super'])) {
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE;
 		} else {
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 		}
 
-		$sitePath = $siteManager->getPath( $siteid );
+		$sitePath = $siteManager->getPath($siteid);
 
-		$view->pageI18nList = $this->getAimeos()->getI18nList( 'admin' );
-		$view->pageLangItems = $langManager->searchItems( $langManager->createSearch( true ) );
-		$view->pageSiteTree = $siteManager->getTree( $siteid, [], $level );
+		$view->pageI18nList = $this->getAimeos()->getI18nList('admin');
+		$view->pageLangItems = $langManager->searchItems($langManager->createSearch(true));
+		$view->pageSiteTree = $siteManager->getTree($siteid, [], $level);
 		$view->pageSitePath = $sitePath;
 		$view->pageSiteItem = $siteItem;
 
-		if( $view->access( ['super'] ) )
+		if ($view->access(['super']))
 		{
-			$search = $siteManager->createSearch()->setSlice( 0, 1000 );
-			$search->setSortations( [$search->sort( '+', 'locale.site.label')] );
-			$search->setConditions( $search->compare( '==', 'locale.site.level', 0 ) );
+			$search = $siteManager->createSearch()->setSlice(0, 1000);
+			$search->setSortations([$search->sort('+', 'locale.site.label')]);
+			$search->setConditions($search->compare('==', 'locale.site.level', 0));
 
-			$view->pageSiteList = $siteManager->searchItems( $search );
+			$view->pageSiteList = $siteManager->searchItems($search);
 
-			if( ( $rootItem = reset( $sitePath ) ) !== false ) {
-				$view->pageSiteTree = $siteManager->getTree( $rootItem->getId(), [], $level );
+			if (($rootItem = reset($sitePath)) !== false) {
+				$view->pageSiteTree = $siteManager->getTree($rootItem->getId(), [], $level);
 			}
 		}
 		else
@@ -76,7 +76,7 @@ 
 			$view->pageSiteList = [$view->pageSiteTree];
 		}
 
-		$this->getClient()->setView( $view );
+		$this->getClient()->setView($view);
 		return $this;
 	}
 }

lib/custom/tests/MW/View/Helper/Site/StandardTest.php

Spacing +8 added lines, -8 removed lines

@@ -17,9 +17,9 @@ 
 	protected function setUp()
 	{
 		$view = new \Aimeos\MW\View\Standard();
-		$view->pageSiteItem = new TestSite( 1, 'label1' );
+		$view->pageSiteItem = new TestSite(1, 'label1');
 
-		$this->object = new \Aimeos\MW\View\Helper\Site\Standard( $view );
+		$this->object = new \Aimeos\MW\View\Helper\Site\Standard($view);
 	}
 
 
@@ -31,31 +31,31 @@ 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\View\\Helper\\Site\\Iface', $this->object->transform() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\View\\Helper\\Site\\Iface', $this->object->transform());
 	}
 
 
 	public function testLabel()
 	{
-		$this->assertEquals( 'label1', $this->object->transform()->label() );
+		$this->assertEquals('label1', $this->object->transform()->label());
 	}
 
 
 	public function testMatch()
 	{
-		$this->assertEquals( 'label1', $this->object->transform()->match( 1 ) );
+		$this->assertEquals('label1', $this->object->transform()->match(1));
 	}
 
 
 	public function testReadonly()
 	{
-		$this->assertEquals( 'readonly', $this->object->transform()->readonly( 2 ) );
+		$this->assertEquals('readonly', $this->object->transform()->readonly(2));
 	}
 
 
 	public function testSiteid()
 	{
-		$this->assertEquals( 1, $this->object->transform()->siteid() );
+		$this->assertEquals(1, $this->object->transform()->siteid());
 	}
 }
 
@@ -65,7 +65,7 @@ 
 	private $id;
 	private $label;
 
-	public function __construct( $id, $label )
+	public function __construct($id, $label)
 	{
 		$this->id = $id;
 		$this->label = $label;

admin/jqadm/templates/dashboard/item-order-latest-standard.php

Spacing +38 added lines, -38 removed lines

@@ -5,29 +5,29 @@ 
  * @copyright Aimeos (aimeos.org), 2016-2018
  */
 
-$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat )
+$price = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat)
 {
-	if( isset( $orders[$item->getBaseId()] ) )
+	if (isset($orders[$item->getBaseId()]))
 	{
 		$price = $orders[$item->getBaseId()]->getPrice();
-		return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() );
+		return sprintf($priceFormat, $price->getValue(), $price->getCurrencyId());
 	}
 };
 
 
-$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item )
+$name = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item)
 {
-	if( isset( $orders[$item->getBaseId()] ) )
+	if (isset($orders[$item->getBaseId()]))
 	{
 		$addresses = $orders[$item->getBaseId()]->getAddresses();
 
-		if( !isset( $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT] ) ) {
+		if (!isset($addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT])) {
 			return;
 		}
 
 		$address = $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT];
 
-		if( $address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY ) {
+		if ($address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY) {
 			return $address->getFirstName() . ' ' . $address->getLastName();
 		} else {
 			return $address->getCompany();
@@ -36,50 +36,50 @@ 
 };
 
 
-$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item )
+$payment = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item)
 {
-	if( isset( $orders[$item->getBaseId()] ) )
+	if (isset($orders[$item->getBaseId()]))
 	{
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT;
-		$services = $orders[$item->getBaseId()]->getService( $type );
+		$services = $orders[$item->getBaseId()]->getService($type);
 		$codes = [];
 
-		foreach( $services as $service ) {
+		foreach ($services as $service) {
 			$codes[] = $service->getCode();
 		}
 
-		return implode( ', ', $codes );
+		return implode(', ', $codes);
 	}
 };
 
 
-$status = function( $list, $key )
+$status = function($list, $key)
 {
-	return ( isset( $list[$key] ) ? $list[$key] : '' );
+	return (isset($list[$key]) ? $list[$key] : '');
 };
 
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
 
 $enc = $this->encoder();
 $params = $this->param();
-$baskets = $this->get( 'orderlatestBaskets', [] );
+$baskets = $this->get('orderlatestBaskets', []);
 /// price format with value (%1$s) and currency (%2$s)
-$priceFormat = $this->translate( 'admin', '%1$s %2$s' );
+$priceFormat = $this->translate('admin', '%1$s %2$s');
 
 $statuslist = array(
-	'-1' => $this->translate( 'mshop/code', 'pay:-1' ),
-	'0' => $this->translate( 'mshop/code', 'pay:0' ),
-	'1' => $this->translate( 'mshop/code', 'pay:1' ),
-	'2' => $this->translate( 'mshop/code', 'pay:2' ),
-	'3' => $this->translate( 'mshop/code', 'pay:3' ),
-	'4' => $this->translate( 'mshop/code', 'pay:4' ),
-	'5' => $this->translate( 'mshop/code', 'pay:5' ),
-	'6' => $this->translate( 'mshop/code', 'pay:6' ),
+	'-1' => $this->translate('mshop/code', 'pay:-1'),
+	'0' => $this->translate('mshop/code', 'pay:0'),
+	'1' => $this->translate('mshop/code', 'pay:1'),
+	'2' => $this->translate('mshop/code', 'pay:2'),
+	'3' => $this->translate('mshop/code', 'pay:3'),
+	'4' => $this->translate('mshop/code', 'pay:4'),
+	'5' => $this->translate('mshop/code', 'pay:5'),
+	'6' => $this->translate('mshop/code', 'pay:6'),
 );
 
 ?>
@@ -91,33 +91,33 @@ 
 			<div class="btn btn-card-header act-show fa"></div>
 		</div>
 		<span class="item-label header-label">
-			<?= $enc->html( $this->translate( 'admin', 'Latest orders' ) ); ?>
+			<?= $enc->html($this->translate('admin', 'Latest orders')); ?>
 		</span>
 	</div>
 	<div id="order-latest-data" class="card-block content collapse show" role="tabpanel" aria-labelledby="order-latest-head">
 		<div class="table-responsive">
 			<table class="list-items table table-hover">
 				<tbody>
-					<?php foreach( $this->get( 'orderlatestItems', [] ) as $item ) : ?>
-						<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?>
+					<?php foreach ($this->get('orderlatestItems', []) as $item) : ?>
+						<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig)); ?>
 						<tr>
 							<td class="order-id">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a>
 							</td>
 							<td class="order-base-address-name">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $name( $baskets, $item ) ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($name($baskets, $item)); ?></a>
 							</td>
 							<td class="order-base-price">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $price( $baskets, $item, $priceFormat ) ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($price($baskets, $item, $priceFormat)); ?></a>
 							</td>
 							<td class="order-datepayment">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDatePayment() ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDatePayment()); ?></a>
 							</td>
 							<td class="order-statuspayment">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $status( $statuslist, $item->getPaymentStatus() ) ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($status($statuslist, $item->getPaymentStatus())); ?></a>
 							</td>
 							<td class="order-base-service-payment">
-								<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $payment( $baskets, $item ) ); ?></a>
+								<a class="items-field" href="<?= $url; ?>"><?= $enc->html($payment($baskets, $item)); ?></a>
 							</td>
 						</tr>
 					<?php endforeach; ?>
@@ -126,4 +126,4 @@ 
 		</div>
 	</div>
 </div>
-<?= $this->get( 'orderlatestBody' ); ?>
+<?= $this->get('orderlatestBody'); ?>

admin/jqadm/templates/product/item-download-standard.php

Spacing +44 added lines, -44 removed lines

@@ -5,8 +5,8 @@ 
  * @copyright Aimeos (aimeos.org), 2016-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 $enc = $this->encoder();
@@ -14,90 +14,90 @@ 
 
 ?>
 <div id="download" class="row item-download tab-pane fade" role="tabpanel" aria-labelledby="download">
-	<div class="col-lg-6 content-block <?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?>">
+	<div class="col-lg-6 content-block <?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?>">
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'File' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'File')); ?></label>
 			<div class="input-group col-sm-8">
-				<input class="item-siteid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'product.lists.siteid' ) ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'downloadData/product.lists.siteid' ) ); ?>" />
-				<input class="item-listid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'product.lists.id' ) ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'downloadData/product.lists.id' ) ); ?>" />
-				<input class="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.id' ) ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'downloadData/attribute.id' ) ); ?>" />
+				<input class="item-siteid" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'product.lists.siteid'))); ?>"
+					value="<?= $enc->attr($this->get('downloadData/product.lists.siteid')); ?>" />
+				<input class="item-listid" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'product.lists.id'))); ?>"
+					value="<?= $enc->attr($this->get('downloadData/product.lists.id')); ?>" />
+				<input class="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'attribute.id'))); ?>"
+					value="<?= $enc->attr($this->get('downloadData/attribute.id')); ?>" />
 				<div class="custom-file">
-					<input id="download-file" class="custom-file-input fileupload" type="file" name="download[file]" tabindex="<?= $this->get( 'tabindex' ); ?>" />
-					<label for="download-file" class="custom-file-label"><?= $enc->html( $this->translate( 'admin', 'Choose file' ) ); ?></label>
+					<input id="download-file" class="custom-file-input fileupload" type="file" name="download[file]" tabindex="<?= $this->get('tabindex'); ?>" />
+					<label for="download-file" class="custom-file-label"><?= $enc->html($this->translate('admin', 'Choose file')); ?></label>
 				</div>
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 			<div class="col-sm-8">
-				<select class="form-control custom-select item-status" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.status' ) ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'downloadData/attribute.siteid', $this->pageSiteItem->getId() ) ); ?> >
-					<option value="1" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), 1 ); ?> >
-						<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+				<select class="form-control custom-select item-status" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('download', 'attribute.status'))); ?>"
+					<?= $this->site()->readonly($this->get('downloadData/attribute.siteid', $this->pageSiteItem->getId())); ?> >
+					<option value="1" <?= $selected($this->get('downloadData/attribute.status', 1), 1); ?> >
+						<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 					</option>
-					<option value="0" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), 0 ); ?> >
-						<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+					<option value="0" <?= $selected($this->get('downloadData/attribute.status', 1), 0); ?> >
+						<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 					</option>
-					<option value="-1" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), -1 ); ?> >
-						<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+					<option value="-1" <?= $selected($this->get('downloadData/attribute.status', 1), -1); ?> >
+						<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 					</option>
-					<option value="-2" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), -2 ); ?> >
-						<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+					<option value="-2" <?= $selected($this->get('downloadData/attribute.status', 1), -2); ?> >
+						<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Name' ) ); ?></label>
+			<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Name')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.label' ) ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'downloadData/attribute.label' ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?> />
+				<input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('download', 'attribute.label'))); ?>"
+					value="<?= $enc->attr($this->get('downloadData/attribute.label')); ?>"
+					<?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?> />
 			</div>
 			<div class="col-sm-12 form-text text-muted help-text">
-				<?= $enc->html( $this->translate( 'admin', 'Name of the downloaded file when customers saves the file on their computers' ) ); ?>
+				<?= $enc->html($this->translate('admin', 'Name of the downloaded file when customers saves the file on their computers')); ?>
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Replace file' ) ); ?></label>
+			<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Replace file')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-overwrite" type="checkbox" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'download', 'overwrite' ) ) ); ?>" value="1"
-					<?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?>
-					<?= $selected( $this->get( 'downloadData/overwrite' ), 1 ); ?> />
+				<input class="form-control item-overwrite" type="checkbox" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('download', 'overwrite'))); ?>" value="1"
+					<?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?>
+					<?= $selected($this->get('downloadData/overwrite'), 1); ?> />
 			</div>
 			<div class="col-sm-12 form-text text-muted help-text">
-				<?= $enc->html( $this->translate( 'admin', 'Overwrite the existing file and customers bought it in the past can then download the new content too' ) ); ?>
+				<?= $enc->html($this->translate('admin', 'Overwrite the existing file and customers bought it in the past can then download the new content too')); ?>
 			</div>
 		</div>
 	</div>
 	<div class="col-lg-6 content-block ">
-		<?php if( $this->get( 'downloadData/attribute.code' ) != '' ) : ?>
+		<?php if ($this->get('downloadData/attribute.code') != '') : ?>
 			<div class="form-group row">
-				<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Path' ) ); ?></label>
+				<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Path')); ?></label>
 				<div class="col-sm-8">
-					<p class="form-control-plaintext item-file"><?= $enc->html( $this->get( 'downloadData/attribute.code' ) ); ?></p>
+					<p class="form-control-plaintext item-file"><?= $enc->html($this->get('downloadData/attribute.code')); ?></p>
 				</div>
 			</div>
 			<div class="form-group row">
-				<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Size' ) ); ?></label>
+				<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Size')); ?></label>
 				<div class="col-sm-8">
-					<p class="form-control-plaintext item-file"><?= $enc->html( number_format( $this->get( 'downloadData/size' ) / 1024, 0, '.', ' ' ) ); ?> KB</p>
+					<p class="form-control-plaintext item-file"><?= $enc->html(number_format($this->get('downloadData/size') / 1024, 0, '.', ' ')); ?> KB</p>
 				</div>
 			</div>
 			<div class="form-group row">
-				<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Uploaded' ) ); ?></label>
+				<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Uploaded')); ?></label>
 				<div class="col-sm-8">
-					<p class="form-control-plaintext item-file"><?= $enc->html( date( 'Y-m-d H:i:s', $this->get( 'downloadData/time' ) ) ); ?></p>
+					<p class="form-control-plaintext item-file"><?= $enc->html(date('Y-m-d H:i:s', $this->get('downloadData/time'))); ?></p>
 				</div>
 			</div>
 		<?php endif; ?>
 	</div>
 
-	<?= $this->get( 'downloadBody' ); ?>
+	<?= $this->get('downloadBody'); ?>
 </div>

admin/jqadm/templates/order/item-invoice-standard.php

Spacing +159 added lines, -159 removed lines

@@ -6,12 +6,12 @@ 
  */
 
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 $enc = $this->encoder();
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 /** admin/jqadm/order/invoice/fields
@@ -29,8 +29,8 @@ 
  * @category Developer
  */
 $default = ['order.id', 'order.datepayment', 'order.statuspayment', 'order.statusdelivery'];
-$default = $this->config( 'admin/jqadm/order/invoice/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/orderinvoice/fields', $default );
+$default = $this->config('admin/jqadm/order/invoice/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/orderinvoice/fields', $default);
 
 
 /** admin/jqadm/order/invoice/types
@@ -44,30 +44,30 @@ 
  * @since 2017.07
  * @category Developer
  */
-$types = $this->config( 'admin/jqadm/order/invoice/fields', ['web', 'phone'] );
+$types = $this->config('admin/jqadm/order/invoice/fields', ['web', 'phone']);
 
 
 $paymentStatusList = [
-	'-1' => $this->translate( 'mshop/code', 'pay:-1' ),
-	'0' => $this->translate( 'mshop/code', 'pay:0' ),
-	'1' => $this->translate( 'mshop/code', 'pay:1' ),
-	'2' => $this->translate( 'mshop/code', 'pay:2' ),
-	'3' => $this->translate( 'mshop/code', 'pay:3' ),
-	'4' => $this->translate( 'mshop/code', 'pay:4' ),
-	'5' => $this->translate( 'mshop/code', 'pay:5' ),
-	'6' => $this->translate( 'mshop/code', 'pay:6' ),
+	'-1' => $this->translate('mshop/code', 'pay:-1'),
+	'0' => $this->translate('mshop/code', 'pay:0'),
+	'1' => $this->translate('mshop/code', 'pay:1'),
+	'2' => $this->translate('mshop/code', 'pay:2'),
+	'3' => $this->translate('mshop/code', 'pay:3'),
+	'4' => $this->translate('mshop/code', 'pay:4'),
+	'5' => $this->translate('mshop/code', 'pay:5'),
+	'6' => $this->translate('mshop/code', 'pay:6'),
 ];
 
 $statusList = [
-	'-1' => $this->translate( 'mshop/code', 'stat:-1' ),
-	'0' => $this->translate( 'mshop/code', 'stat:0' ),
-	'1' => $this->translate( 'mshop/code', 'stat:1' ),
-	'2' => $this->translate( 'mshop/code', 'stat:2' ),
-	'3' => $this->translate( 'mshop/code', 'stat:3' ),
-	'4' => $this->translate( 'mshop/code', 'stat:4' ),
-	'5' => $this->translate( 'mshop/code', 'stat:5' ),
-	'6' => $this->translate( 'mshop/code', 'stat:6' ),
-	'7' => $this->translate( 'mshop/code', 'stat:7' ),
+	'-1' => $this->translate('mshop/code', 'stat:-1'),
+	'0' => $this->translate('mshop/code', 'stat:0'),
+	'1' => $this->translate('mshop/code', 'stat:1'),
+	'2' => $this->translate('mshop/code', 'stat:2'),
+	'3' => $this->translate('mshop/code', 'stat:3'),
+	'4' => $this->translate('mshop/code', 'stat:4'),
+	'5' => $this->translate('mshop/code', 'stat:5'),
+	'6' => $this->translate('mshop/code', 'stat:6'),
+	'7' => $this->translate('mshop/code', 'stat:7'),
 ];
 
 
@@ -75,10 +75,10 @@ 
 <div id="invoice" class="item-invoice content-block tab-pane fade" role="tabpanel" aria-labelledby="invoice">
 
 	<?= $this->partial(
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'invoiceTotal' ),
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('invoiceTotal'),
 			'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice',
-			'page' => $this->session( 'aimeos/admin/jqadm/orderinvoice/page', [] )]
+			'page' => $this->session('aimeos/admin/jqadm/orderinvoice/page', [])]
 		);
 	?>
 
@@ -86,45 +86,45 @@ 
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-					$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [
-						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ),
+					$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), [
+						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get('tabindex'),
 						'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice',
-						'sort' => $this->session( 'aimeos/admin/jqadm/product/sort' ),
+						'sort' => $this->session('aimeos/admin/jqadm/product/sort'),
 						'data' => [
-							'order.id' => $this->translate( 'admin', 'Invoice' ),
-							'order.type' => $this->translate( 'admin', 'Type' ),
-							'order.datepayment' => $this->translate( 'admin', 'Payment' ),
-							'order.statuspayment' => $this->translate( 'admin', 'Payment status' ),
-							'order.datedelivery' => $this->translate( 'admin', 'Delivery' ),
-							'order.statusdelivery' => $this->translate( 'admin', 'Delivery status' ),
-							'order.relatedid' => $this->translate( 'admin', 'Related ID' ),
-							'order.ctime' => $this->translate( 'admin', 'Created' ),
-							'order.mtime' => $this->translate( 'admin', 'Modified' ),
-							'order.editor' => $this->translate( 'admin', 'Editor' ),
+							'order.id' => $this->translate('admin', 'Invoice'),
+							'order.type' => $this->translate('admin', 'Type'),
+							'order.datepayment' => $this->translate('admin', 'Payment'),
+							'order.statuspayment' => $this->translate('admin', 'Payment status'),
+							'order.datedelivery' => $this->translate('admin', 'Delivery'),
+							'order.statusdelivery' => $this->translate('admin', 'Delivery status'),
+							'order.relatedid' => $this->translate('admin', 'Related ID'),
+							'order.ctime' => $this->translate('admin', 'Created'),
+							'order.mtime' => $this->translate('admin', 'Modified'),
+							'order.editor' => $this->translate('admin', 'Editor'),
 						]
 					] );
 				?>
 
 				<th class="actions">
-					<a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
+					<a class="btn fa act-add" href="#" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
 					</a>
 
 					<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ), [
-							'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get( 'tabindex' ),
+						$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [
+							'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get('tabindex'),
 							'data' => [
-								'order.id' => $this->translate( 'admin', 'Invoice' ),
-								'order.type' => $this->translate( 'admin', 'Type' ),
-								'order.datepayment' => $this->translate( 'admin', 'Payment' ),
-								'order.statuspayment' => $this->translate( 'admin', 'Payment status' ),
-								'order.datedelivery' => $this->translate( 'admin', 'Delivery' ),
-								'order.statusdelivery' => $this->translate( 'admin', 'Delivery status' ),
-								'order.relatedid' => $this->translate( 'admin', 'Related ID' ),
-								'order.ctime' => $this->translate( 'admin', 'Created' ),
-								'order.mtime' => $this->translate( 'admin', 'Modified' ),
-								'order.editor' => $this->translate( 'admin', 'Editor' ),
+								'order.id' => $this->translate('admin', 'Invoice'),
+								'order.type' => $this->translate('admin', 'Type'),
+								'order.datepayment' => $this->translate('admin', 'Payment'),
+								'order.statuspayment' => $this->translate('admin', 'Payment status'),
+								'order.datedelivery' => $this->translate('admin', 'Delivery'),
+								'order.statusdelivery' => $this->translate('admin', 'Delivery status'),
+								'order.relatedid' => $this->translate('admin', 'Related ID'),
+								'order.ctime' => $this->translate('admin', 'Created'),
+								'order.mtime' => $this->translate('admin', 'Modified'),
+								'order.editor' => $this->translate('admin', 'Editor'),
 							]
 						] );
 					?>
@@ -133,14 +133,14 @@ 
 		</thead>
 		<tbody>
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'filter' => $this->session( 'aimeos/admin/jqadm/orderinvoice/filter', [] ),
-					'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get( 'tabindex' ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'filter' => $this->session('aimeos/admin/jqadm/orderinvoice/filter', []),
+					'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get('tabindex'),
 					'data' => [
 						'order.id' => ['oi' => '==', 'type' => 'number'],
 						'order.type' => ['oi' => '~=', 'type' => 'select', 'val' => [
-							'web' => $this->translate( 'mshop/code', 'order:web' ),
-							'phone' => $this->translate( 'mshop/code', 'order:phone' ),
+							'web' => $this->translate('mshop/code', 'order:web'),
+							'phone' => $this->translate('mshop/code', 'order:phone'),
 						]],
 						'order.datepayment' => ['oi' => '>=', 'type' => 'datetime-local'],
 						'order.statuspayment' => ['oi' => '==', 'type' => 'select', 'val' => $paymentStatusList],
@@ -155,198 +155,198 @@ 
 			?>
 
 			<tr class="list-item-new prototype">
-				<td colspan="<?= count( $fields ); ?>">
+				<td colspan="<?= count($fields); ?>">
 					<div class="content-block row">
 						<div class="col-xl-6">
 							<input class="order-id" type="hidden" value="" disabled="disabled"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.id', '' ) ) ); ?>" />
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.id', ''))); ?>" />
 
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 								<div class="col-sm-8">
-									<select class="form-control custom-select order-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.type', '' ) ) ); ?>" disabled="disabled">
-										<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+									<select class="form-control custom-select order-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.type', ''))); ?>" disabled="disabled">
+										<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 
-										<?php foreach( $types as $type ) : ?>
-											<option value="<?= $enc->attr( $type ); ?>" ><?= $enc->html( $type ); ?></option>
+										<?php foreach ($types as $type) : ?>
+											<option value="<?= $enc->attr($type); ?>" ><?= $enc->html($type); ?></option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Source of the invoice, e.g. by web or phone' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Source of the invoice, e.g. by web or phone')); ?>
 								</div>
 							</div>
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Payment' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Payment')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datepayment', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.datepayment', ''))); ?>" disabled="disabled" />
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Date of the last payment status change' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Date of the last payment status change')); ?>
 								</div>
 							</div>
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Payment status' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Payment status')); ?></label>
 								<div class="col-sm-8">
-									<select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statuspayment', '' ) ) ); ?>" disabled="disabled">
-										<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
-										<?php foreach( $paymentStatusList as $code => $label ) : ?>
-											<option value="<?= $code ?>"><?= $enc->html( $label ); ?></option>
+									<select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.statuspayment', ''))); ?>" disabled="disabled">
+										<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
+										<?php foreach ($paymentStatusList as $code => $label) : ?>
+											<option value="<?= $code ?>"><?= $enc->html($label); ?></option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Last payment status of the order' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Last payment status of the order')); ?>
 								</div>
 							</div>
 						</div>
 						<div class="col-xl-6">
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Delivery' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Delivery')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datedelivery', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.datedelivery', ''))); ?>" disabled="disabled" />
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Date of the last delivery status change' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Date of the last delivery status change')); ?>
 								</div>
 							</div>
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Delivery status' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Delivery status')); ?></label>
 								<div class="col-sm-8">
-									<select class="form-control custom-select order-statusdelivery" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statusdelivery', '' ) ) ); ?>" disabled="disabled">
-										<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
-										<?php foreach( $statusList as $code => $label ) : ?>
-											<option value="<?= $code ?>"><?= $enc->html( $label ); ?></option>
+									<select class="form-control custom-select order-statusdelivery" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.statusdelivery', ''))); ?>" disabled="disabled">
+										<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
+										<?php foreach ($statusList as $code => $label) : ?>
+											<option value="<?= $code ?>"><?= $enc->html($label); ?></option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Last delivery status of the order' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Last delivery status of the order')); ?>
 								</div>
 							</div>
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Related ID' ) ); ?></label>
+								<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Related ID')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control order-relatedid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.relatedid', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control order-relatedid" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('invoice', 'order.relatedid', ''))); ?>" disabled="disabled" />
 								</div>
 								<div class="col-sm-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'ID of a related invoice, e.g. of a changed or refunded invoice' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'ID of a related invoice, e.g. of a changed or refunded invoice')); ?>
 								</div>
 							</div>
 						</div>
 					</div>
 				</td>
 				<td class="actions">
-					<a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>">
+					<a class="btn fa act-close" href="#" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Close')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Close')); ?>">
 					</a>
 				</td>
 			</tr>
 
-			<?php foreach( $this->get( 'invoiceData/order.id', [] ) as $idx => $orderId ) : ?>
-				<?php $siteId = $this->get( 'invoiceData/order.siteid/' . $idx ); ?>
+			<?php foreach ($this->get('invoiceData/order.id', []) as $idx => $orderId) : ?>
+				<?php $siteId = $this->get('invoiceData/order.siteid/' . $idx); ?>
 
-				<tr class="list-item <?= $this->site()->readonly( $siteId ); ?>">
-					<?php if( in_array( 'order.id', $fields ) ) : ?>
+				<tr class="list-item <?= $this->site()->readonly($siteId); ?>">
+					<?php if (in_array('order.id', $fields)) : ?>
 						<td class="order-id">
 							<input class="order-id" type="hidden"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.id', '' ) ) ); ?>"
-								value="<?= $enc->attr( $orderId ); ?>" disabled="disabled" />
-							<?= $enc->html( $orderId ); ?>
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.id', ''))); ?>"
+								value="<?= $enc->attr($orderId); ?>" disabled="disabled" />
+							<?= $enc->html($orderId); ?>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.type', $fields ) ) : ?>
+					<?php if (in_array('order.type', $fields)) : ?>
 						<td class="order-type">
-							<select class="form-control custom-select order-type" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.type', '' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'invoiceData/order.type/' . $idx ) ); ?>" disabled="disabled" />
-								<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+							<select class="form-control custom-select order-type" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.type', ''))); ?>"
+								value="<?= $enc->attr($this->get('invoiceData/order.type/' . $idx)); ?>" disabled="disabled" />
+								<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 
-								<?php foreach( $types as $type ) : ?>
-									<option value="<?= $enc->attr( $type ); ?>" <?= $selected( $this->get( 'invoiceData/order.type/' . $idx ), $type ); ?> >
-										<?= $enc->html( $type ); ?>
+								<?php foreach ($types as $type) : ?>
+									<option value="<?= $enc->attr($type); ?>" <?= $selected($this->get('invoiceData/order.type/' . $idx), $type); ?> >
+										<?= $enc->html($type); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.datepayment', $fields ) ) : ?>
+					<?php if (in_array('order.datepayment', $fields)) : ?>
 						<td class="order-datepayment">
-							<input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datepayment', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'invoiceData/order.datepayment/' . $idx ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.datepayment', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('invoiceData/order.datepayment/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.statuspayment', $fields ) ) : ?>
+					<?php if (in_array('order.statuspayment', $fields)) : ?>
 						<td class="order-statuspayment">
-							<select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statuspayment', '' ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" >
+							<select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.statuspayment', ''))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<?php foreach( $paymentStatusList as $code => $label ) : ?>
-									<option value="<?= $code ?>" <?= $selected( $this->get( 'invoiceData/order.statuspayment/' . $idx ), $code ); ?> >
-										<?= $enc->html( $label ); ?>
+								<?php foreach ($paymentStatusList as $code => $label) : ?>
+									<option value="<?= $code ?>" <?= $selected($this->get('invoiceData/order.statuspayment/' . $idx), $code); ?> >
+										<?= $enc->html($label); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.datedelivery', $fields ) ) : ?>
+					<?php if (in_array('order.datedelivery', $fields)) : ?>
 						<td class="order-datedelivery">
-							<input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datedelivery', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'invoiceData/order.datedelivery/' . $idx ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.datedelivery', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('invoiceData/order.datedelivery/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.statusdelivery', $fields ) ) : ?>
+					<?php if (in_array('order.statusdelivery', $fields)) : ?>
 						<td class="order-statusdelivery">
-							<select class="form-control custom-select order-statusdelivery" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statusdelivery', '' ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" >
+							<select class="form-control custom-select order-statusdelivery" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.statusdelivery', ''))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<?php foreach( $statusList as $code => $label ) : ?>
-									<option value="<?= $code ?>" <?= $selected( $this->get( 'invoiceData/order.statusdelivery/' . $idx ), $code ); ?> >
-										<?= $enc->html( $label ); ?>
+								<?php foreach ($statusList as $code => $label) : ?>
+									<option value="<?= $code ?>" <?= $selected($this->get('invoiceData/order.statusdelivery/' . $idx), $code); ?> >
+										<?= $enc->html($label); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.relatedid', $fields ) ) : ?>
+					<?php if (in_array('order.relatedid', $fields)) : ?>
 						<td class="order-relatedid">
-							<input class="form-control order-relatedid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.relatedid', '' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'invoiceData/order.relatedid/' . $idx ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control order-relatedid" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('invoice', 'order.relatedid', ''))); ?>"
+								value="<?= $enc->attr($this->get('invoiceData/order.relatedid/' . $idx)); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.ctime', $fields ) ) : ?>
-						<td class="order-ctime"><?= $enc->html( $this->get( 'invoiceData/order.ctime/' . $idx ) ); ?></td>
+					<?php if (in_array('order.ctime', $fields)) : ?>
+						<td class="order-ctime"><?= $enc->html($this->get('invoiceData/order.ctime/' . $idx)); ?></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.mtime', $fields ) ) : ?>
-						<td class="order-mtime"><?= $enc->html( $this->get( 'invoiceData/order.mtime/' . $idx ) ); ?></td>
+					<?php if (in_array('order.mtime', $fields)) : ?>
+						<td class="order-mtime"><?= $enc->html($this->get('invoiceData/order.mtime/' . $idx)); ?></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.editor', $fields ) ) : ?>
-						<td class="order-editor"><?= $enc->html( $this->get( 'invoiceData/order.editor/' . $idx ) ); ?></td>
+					<?php if (in_array('order.editor', $fields)) : ?>
+						<td class="order-editor"><?= $enc->html($this->get('invoiceData/order.editor/' . $idx)); ?></td>
 					<?php endif; ?>
 					<td class="actions">
-						<?php if( !$this->site()->readonly( $siteId ) ) : ?>
-							<a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a>
+						<?php if (!$this->site()->readonly($siteId)) : ?>
+							<a class="btn act-edit fa" tabindex="<?= $this->get('tabindex'); ?>" href="#"
+								title="<?= $enc->attr($this->translate('admin', 'Edit this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Edit')); ?>"></a>
 						<?php endif; ?>
 					</td>
 				</tr>
@@ -354,17 +354,17 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'invoiceData/order.id', [] ) === [] ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('invoiceData/order.id', []) === []) : ?>
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
 	<?php endif; ?>
 
 	<?= $this->partial(
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'invoiceTotal' ),
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('invoiceTotal'),
 			'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice',
-			'page' =>$this->session( 'aimeos/admin/jqadm/orderinvoice/page', [] )]
+			'page' =>$this->session('aimeos/admin/jqadm/orderinvoice/page', [])]
 		);
 	?>
 
 </div>
-<?= $this->get( 'invoiceIBody' ); ?>
+<?= $this->get('invoiceIBody'); ?>

admin/jqadm/templates/order/list-standard.php

Spacing +213 added lines, -213 removed lines

@@ -8,20 +8,20 @@ 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
 
 /** admin/jqadm/url/export/target
  * Destination of the URL where the controller specified in the URL is known
@@ -37,7 +37,7 @@ 
  * @see admin/jqadm/url/export/action
  * @see admin/jqadm/url/export/config
  */
-$expTarget = $this->config( 'admin/jqadm/url/export/target' );
+$expTarget = $this->config('admin/jqadm/url/export/target');
 
 /** admin/jqadm/url/export/controller
  * Name of the controller whose action should be called
@@ -53,7 +53,7 @@ 
  * @see admin/jqadm/url/export/action
  * @see admin/jqadm/url/export/config
  */
-$expCntl = $this->config( 'admin/jqadm/url/export/controller', 'Jqadm' );
+$expCntl = $this->config('admin/jqadm/url/export/controller', 'Jqadm');
 
 /** admin/jqadm/url/export/action
  * Name of the action that should create the output
@@ -69,7 +69,7 @@ 
  * @see admin/jqadm/url/export/controller
  * @see admin/jqadm/url/export/config
  */
-$expAction = $this->config( 'admin/jqadm/url/export/action', 'export' );
+$expAction = $this->config('admin/jqadm/url/export/action', 'export');
 
 /** admin/jqadm/url/export/config
  * Associative list of configuration options used for generating the URL
@@ -91,7 +91,7 @@ 
  * @see admin/jqadm/url/export/controller
  * @see admin/jqadm/url/export/action
  */
-$expConfig = $this->config( 'admin/jqadm/url/export/config', [] );
+$expConfig = $this->config('admin/jqadm/url/export/config', []);
 
 
 /** admin/jqadm/order/fields
@@ -108,105 +108,105 @@ 
  * @since 2017.07
  * @category Developer
  */
-$default = $this->config( 'admin/jqadm/order/fields', ['order.id', 'order.ctime', 'order.statuspayment', 'order.base.address.lastname'] );
-$fields = $this->session( 'aimeos/admin/jqadm/order/fields', $default );
+$default = $this->config('admin/jqadm/order/fields', ['order.id', 'order.ctime', 'order.statuspayment', 'order.base.address.lastname']);
+$fields = $this->session('aimeos/admin/jqadm/order/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
-$baseItems = $this->get( 'baseItems', [] );
+$baseItems = $this->get('baseItems', []);
 
 
 $columnList = [
-	'order.id' => $this->translate( 'admin', 'Invoice' ),
-	'order.type' => $this->translate( 'admin', 'Type' ),
-	'order.statuspayment' => $this->translate( 'admin', 'Pay status' ),
-	'order.datepayment' => $this->translate( 'admin', 'Pay date' ),
-	'order.statusdelivery' => $this->translate( 'admin', 'Ship status' ),
-	'order.datedelivery' => $this->translate( 'admin', 'Ship date' ),
-	'order.relatedid' => $this->translate( 'admin', 'Related order' ),
-	'order.ctime' => $this->translate( 'admin', 'Created' ),
-	'order.mtime' => $this->translate( 'admin', 'Modified' ),
-	'order.editor' => $this->translate( 'admin', 'Editor' ),
-	'order.base.customerid' => $this->translate( 'admin', 'Customer ID' ),
-	'order.base.sitecode' => $this->translate( 'admin', 'Site' ),
-	'order.base.languageid' => $this->translate( 'admin', 'Language' ),
-	'order.base.currencyid' => $this->translate( 'admin', 'Currency' ),
-	'order.base.price' => $this->translate( 'admin', 'Price' ),
-	'order.base.costs' => $this->translate( 'admin', 'Costs' ),
-	'order.base.rebate' => $this->translate( 'admin', 'Rebate' ),
-	'order.base.taxvalue' => $this->translate( 'admin', 'Tax' ),
-	'order.base.taxflag' => $this->translate( 'admin', 'Incl. tax' ),
-	'order.base.comment' => $this->translate( 'admin', 'Comment' ),
-	'order.base.address.salutation' => $this->translate( 'admin', 'Salutation' ),
-	'order.base.address.company' => $this->translate( 'admin', 'Company' ),
-	'order.base.address.vatid' => $this->translate( 'admin', 'VAT ID' ),
-	'order.base.address.title' => $this->translate( 'admin', 'Title' ),
-	'order.base.address.firstname' => $this->translate( 'admin', 'First name' ),
-	'order.base.address.lastname' => $this->translate( 'admin', 'Last name' ),
-	'order.base.address.address1' => $this->translate( 'admin', 'Street' ),
-	'order.base.address.address2' => $this->translate( 'admin', 'House number' ),
-	'order.base.address.address3' => $this->translate( 'admin', 'Floor' ),
-	'order.base.address.postal' => $this->translate( 'admin', 'Zip code' ),
-	'order.base.address.city' => $this->translate( 'admin', 'City' ),
-	'order.base.address.state' => $this->translate( 'admin', 'State' ),
-	'order.base.address.countryid' => $this->translate( 'admin', 'Country' ),
-	'order.base.address.languageid' => $this->translate( 'admin', 'Language' ),
-	'order.base.address.telephone' => $this->translate( 'admin', 'Telephone' ),
-	'order.base.address.telefax' => $this->translate( 'admin', 'Facsimile' ),
-	'order.base.address.email' => $this->translate( 'admin', 'E-Mail' ),
-	'order.base.address.website' => $this->translate( 'admin', 'Web site' ),
-	'order.base.service.code' => $this->translate( 'admin', 'Service' ),
-	'order.base.service.name' => $this->translate( 'admin', 'Service name' ),
-	'order.base.service.price' => $this->translate( 'admin', 'Service price' ),
-	'order.base.service.costs' => $this->translate( 'admin', 'Service costs' ),
-	'order.base.service.rebate' => $this->translate( 'admin', 'Service rebate' ),
+	'order.id' => $this->translate('admin', 'Invoice'),
+	'order.type' => $this->translate('admin', 'Type'),
+	'order.statuspayment' => $this->translate('admin', 'Pay status'),
+	'order.datepayment' => $this->translate('admin', 'Pay date'),
+	'order.statusdelivery' => $this->translate('admin', 'Ship status'),
+	'order.datedelivery' => $this->translate('admin', 'Ship date'),
+	'order.relatedid' => $this->translate('admin', 'Related order'),
+	'order.ctime' => $this->translate('admin', 'Created'),
+	'order.mtime' => $this->translate('admin', 'Modified'),
+	'order.editor' => $this->translate('admin', 'Editor'),
+	'order.base.customerid' => $this->translate('admin', 'Customer ID'),
+	'order.base.sitecode' => $this->translate('admin', 'Site'),
+	'order.base.languageid' => $this->translate('admin', 'Language'),
+	'order.base.currencyid' => $this->translate('admin', 'Currency'),
+	'order.base.price' => $this->translate('admin', 'Price'),
+	'order.base.costs' => $this->translate('admin', 'Costs'),
+	'order.base.rebate' => $this->translate('admin', 'Rebate'),
+	'order.base.taxvalue' => $this->translate('admin', 'Tax'),
+	'order.base.taxflag' => $this->translate('admin', 'Incl. tax'),
+	'order.base.comment' => $this->translate('admin', 'Comment'),
+	'order.base.address.salutation' => $this->translate('admin', 'Salutation'),
+	'order.base.address.company' => $this->translate('admin', 'Company'),
+	'order.base.address.vatid' => $this->translate('admin', 'VAT ID'),
+	'order.base.address.title' => $this->translate('admin', 'Title'),
+	'order.base.address.firstname' => $this->translate('admin', 'First name'),
+	'order.base.address.lastname' => $this->translate('admin', 'Last name'),
+	'order.base.address.address1' => $this->translate('admin', 'Street'),
+	'order.base.address.address2' => $this->translate('admin', 'House number'),
+	'order.base.address.address3' => $this->translate('admin', 'Floor'),
+	'order.base.address.postal' => $this->translate('admin', 'Zip code'),
+	'order.base.address.city' => $this->translate('admin', 'City'),
+	'order.base.address.state' => $this->translate('admin', 'State'),
+	'order.base.address.countryid' => $this->translate('admin', 'Country'),
+	'order.base.address.languageid' => $this->translate('admin', 'Language'),
+	'order.base.address.telephone' => $this->translate('admin', 'Telephone'),
+	'order.base.address.telefax' => $this->translate('admin', 'Facsimile'),
+	'order.base.address.email' => $this->translate('admin', 'E-Mail'),
+	'order.base.address.website' => $this->translate('admin', 'Web site'),
+	'order.base.service.code' => $this->translate('admin', 'Service'),
+	'order.base.service.name' => $this->translate('admin', 'Service name'),
+	'order.base.service.price' => $this->translate('admin', 'Service price'),
+	'order.base.service.costs' => $this->translate('admin', 'Service costs'),
+	'order.base.service.rebate' => $this->translate('admin', 'Service rebate'),
 ];
 
 $paymentStatusList = [
-	'-1' => $this->translate( 'mshop/code', 'pay:-1' ),
-	'0' => $this->translate( 'mshop/code', 'pay:0' ),
-	'1' => $this->translate( 'mshop/code', 'pay:1' ),
-	'2' => $this->translate( 'mshop/code', 'pay:2' ),
-	'3' => $this->translate( 'mshop/code', 'pay:3' ),
-	'4' => $this->translate( 'mshop/code', 'pay:4' ),
-	'5' => $this->translate( 'mshop/code', 'pay:5' ),
-	'6' => $this->translate( 'mshop/code', 'pay:6' ),
+	'-1' => $this->translate('mshop/code', 'pay:-1'),
+	'0' => $this->translate('mshop/code', 'pay:0'),
+	'1' => $this->translate('mshop/code', 'pay:1'),
+	'2' => $this->translate('mshop/code', 'pay:2'),
+	'3' => $this->translate('mshop/code', 'pay:3'),
+	'4' => $this->translate('mshop/code', 'pay:4'),
+	'5' => $this->translate('mshop/code', 'pay:5'),
+	'6' => $this->translate('mshop/code', 'pay:6'),
 ];
 
 $deliveryStatusList = [
-	'-1' => $this->translate( 'mshop/code', 'stat:-1' ),
-	'0' => $this->translate( 'mshop/code', 'stat:0' ),
-	'1' => $this->translate( 'mshop/code', 'stat:1' ),
-	'2' => $this->translate( 'mshop/code', 'stat:2' ),
-	'3' => $this->translate( 'mshop/code', 'stat:3' ),
-	'4' => $this->translate( 'mshop/code', 'stat:4' ),
-	'5' => $this->translate( 'mshop/code', 'stat:5' ),
-	'6' => $this->translate( 'mshop/code', 'stat:6' ),
-	'7' => $this->translate( 'mshop/code', 'stat:7' ),
+	'-1' => $this->translate('mshop/code', 'stat:-1'),
+	'0' => $this->translate('mshop/code', 'stat:0'),
+	'1' => $this->translate('mshop/code', 'stat:1'),
+	'2' => $this->translate('mshop/code', 'stat:2'),
+	'3' => $this->translate('mshop/code', 'stat:3'),
+	'4' => $this->translate('mshop/code', 'stat:4'),
+	'5' => $this->translate('mshop/code', 'stat:5'),
+	'6' => $this->translate('mshop/code', 'stat:6'),
+	'7' => $this->translate('mshop/code', 'stat:7'),
 ];
 
 $statusList = [
-	0 => $this->translate( 'admin', 'no' ),
-	1 => $this->translate( 'admin', 'yes' ),
+	0 => $this->translate('admin', 'no'),
+	1 => $this->translate('admin', 'yes'),
 ];
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'Order' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Order')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/order/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/order/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -214,34 +214,34 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/order/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/order/page', [])]
 	);
 ?>
 
-<?php $searchParam = $params; unset( $searchParam['filter'] ); ?>
-<form class="list list-order" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<?php $searchParam = $params; unset($searchParam['filter']); ?>
+<form class="list list-order" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/order/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/order/sort')]
 					);
 				?>
 
 				<th class="actions">
 					<a class="btn fa act-download" tabindex="1"
-						href="<?= $enc->attr( $this->url( $expTarget, $expCntl, $expAction, $params, [], $expConfig ) ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Download') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>">
+						href="<?= $enc->attr($this->url($expTarget, $expCntl, $expAction, $params, [], $expConfig)); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Download')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Download')); ?>">
 					</a>
 
 					<?= $this->partial(
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -251,8 +251,8 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/order/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/order/filter', []),
 					'data' => [
 						'order.id' => ['op' => '=='],
 						'order.type' => [],
@@ -303,186 +303,186 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?>
-				<tr class="list-item <?= $this->site()->readonly( $item->getSiteId() ); ?>">
-					<?php if( in_array( 'order.id', $fields ) ) : ?>
-						<td class="order-id"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getId() ); ?></a></td>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $item->getBaseId()] + $params, [], $getConfig)); ?>
+				<tr class="list-item <?= $this->site()->readonly($item->getSiteId()); ?>">
+					<?php if (in_array('order.id', $fields)) : ?>
+						<td class="order-id"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.type', $fields ) ) : ?>
-						<td class="order-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getType() ); ?></a></td>
+					<?php if (in_array('order.type', $fields)) : ?>
+						<td class="order-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getType()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.statuspayment', $fields ) ) : ?>
-						<td class="order-statuspayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $paymentStatusList[$item->getPaymentStatus()] ); ?></a></td>
+					<?php if (in_array('order.statuspayment', $fields)) : ?>
+						<td class="order-statuspayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($paymentStatusList[$item->getPaymentStatus()]); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.datepayment', $fields ) ) : ?>
-						<td class="order-datepayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDatePayment() ); ?></a></td>
+					<?php if (in_array('order.datepayment', $fields)) : ?>
+						<td class="order-datepayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDatePayment()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.statusdelivery', $fields ) ) : ?>
-						<td class="order-statusdelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $deliveryStatusList[$item->getDeliveryStatus()] ); ?></a></td>
+					<?php if (in_array('order.statusdelivery', $fields)) : ?>
+						<td class="order-statusdelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($deliveryStatusList[$item->getDeliveryStatus()]); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.datedelivery', $fields ) ) : ?>
-						<td class="order-datedelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDateDelivery() ); ?></a></td>
+					<?php if (in_array('order.datedelivery', $fields)) : ?>
+						<td class="order-datedelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDateDelivery()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.relatedid', $fields ) ) : ?>
-						<td class="order-relatedid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getRelatedId() ); ?></a></td>
+					<?php if (in_array('order.relatedid', $fields)) : ?>
+						<td class="order-relatedid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getRelatedId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.ctime', $fields ) ) : ?>
-						<td class="order-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('order.ctime', $fields)) : ?>
+						<td class="order-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.mtime', $fields ) ) : ?>
-						<td class="order-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('order.mtime', $fields)) : ?>
+						<td class="order-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.editor', $fields ) ) : ?>
-						<td class="order-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('order.editor', $fields)) : ?>
+						<td class="order-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
 					<?php endif; ?>
 
-					<?php $baseItem = ( isset( $baseItems[$item->getBaseId()] ) ? $baseItems[$item->getBaseId()] : null ); ?>
+					<?php $baseItem = (isset($baseItems[$item->getBaseId()]) ? $baseItems[$item->getBaseId()] : null); ?>
 
-					<?php if( in_array( 'order.base.customerid', $fields ) ) : ?>
-						<td class="order-base-customerid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getCustomerId() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.customerid', $fields)) : ?>
+						<td class="order-base-customerid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getCustomerId()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.sitecode', $fields ) ) : ?>
-						<td class="order-base-sitecode"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getSiteCode() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.sitecode', $fields)) : ?>
+						<td class="order-base-sitecode"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getSiteCode()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.languageid', $fields ) ) : ?>
-						<td class="order-base-languageid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getLocale()->getLanguageId() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.languageid', $fields)) : ?>
+						<td class="order-base-languageid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getLocale()->getLanguageId()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.currencyid', $fields ) ) : ?>
-						<td class="order-base-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getLocale()->getCurrencyId() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.currencyid', $fields)) : ?>
+						<td class="order-base-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getLocale()->getCurrencyId()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.price', $fields ) ) : ?>
-						<td class="order-base-price"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getValue() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.price', $fields)) : ?>
+						<td class="order-base-price"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getValue()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.costs', $fields ) ) : ?>
-						<td class="order-base-costs"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getCosts() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.costs', $fields)) : ?>
+						<td class="order-base-costs"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getCosts()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.rebate', $fields ) ) : ?>
-						<td class="order-base-rebate"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getRebate() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.rebate', $fields)) : ?>
+						<td class="order-base-rebate"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getRebate()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.taxvalue', $fields ) ) : ?>
-						<td class="order-base-taxvalue"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getTaxValue() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.taxvalue', $fields)) : ?>
+						<td class="order-base-taxvalue"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getTaxValue()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.taxflag', $fields ) ) : ?>
-						<td class="order-base-taxflag"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $statusList[$baseItem->getPrice()->getTaxFlag()] ) : ''; ?></a></td>
+					<?php if (in_array('order.base.taxflag', $fields)) : ?>
+						<td class="order-base-taxflag"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($statusList[$baseItem->getPrice()->getTaxFlag()]) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.comment', $fields ) ) : ?>
-						<td class="order-base-comment"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getComment() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.comment', $fields)) : ?>
+						<td class="order-base-comment"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getComment()) : ''; ?></a></td>
 					<?php endif; ?>
 
 					<?php $addrItem = null;
-						if( $baseItem && ( $addresses = $baseItem->getAddresses() ) && isset( $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT] ) ) {
+						if ($baseItem && ($addresses = $baseItem->getAddresses()) && isset($addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT])) {
 							$addrItem = $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT];
 						}
 					?>
 
-					<?php if( in_array( 'order.base.address.salutation', $fields ) ) : ?>
-						<td class="order-base-address-salutation"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getSalutation() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.salutation', $fields)) : ?>
+						<td class="order-base-address-salutation"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getSalutation()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.company', $fields ) ) : ?>
-						<td class="order-base-address-company"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCompany() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.company', $fields)) : ?>
+						<td class="order-base-address-company"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCompany()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.vatid', $fields ) ) : ?>
-						<td class="order-base-address-vatid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getVatID() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.vatid', $fields)) : ?>
+						<td class="order-base-address-vatid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getVatID()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.title', $fields ) ) : ?>
-						<td class="order-base-address-title"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTitle() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.title', $fields)) : ?>
+						<td class="order-base-address-title"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTitle()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.firstname', $fields ) ) : ?>
-						<td class="order-base-address-firstname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getFirstname() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.firstname', $fields)) : ?>
+						<td class="order-base-address-firstname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getFirstname()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.lastname', $fields ) ) : ?>
-						<td class="order-base-address-lastname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getLastname() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.lastname', $fields)) : ?>
+						<td class="order-base-address-lastname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getLastname()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.address1', $fields ) ) : ?>
-						<td class="order-base-address-address1"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress1() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.address1', $fields)) : ?>
+						<td class="order-base-address-address1"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress1()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.address2', $fields ) ) : ?>
-						<td class="order-base-address-address2"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress2() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.address2', $fields)) : ?>
+						<td class="order-base-address-address2"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress2()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.address3', $fields ) ) : ?>
-						<td class="order-base-address-address3"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress3() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.address3', $fields)) : ?>
+						<td class="order-base-address-address3"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress3()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.postal', $fields ) ) : ?>
-						<td class="order-base-address-postal"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getPostal() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.postal', $fields)) : ?>
+						<td class="order-base-address-postal"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getPostal()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.city', $fields ) ) : ?>
-						<td class="order-base-address-city"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCity() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.city', $fields)) : ?>
+						<td class="order-base-address-city"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCity()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.state', $fields ) ) : ?>
-						<td class="order-base-address-state"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getState() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.state', $fields)) : ?>
+						<td class="order-base-address-state"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getState()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.countryid', $fields ) ) : ?>
-						<td class="order-base-address-countryid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCountryId() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.countryid', $fields)) : ?>
+						<td class="order-base-address-countryid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCountryId()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.languageid', $fields ) ) : ?>
-						<td class="order-base-address-languageid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getLanguageId() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.languageid', $fields)) : ?>
+						<td class="order-base-address-languageid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getLanguageId()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.telephone', $fields ) ) : ?>
-						<td class="order-base-address-telephone"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTelephone() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.telephone', $fields)) : ?>
+						<td class="order-base-address-telephone"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTelephone()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.telefax', $fields ) ) : ?>
-						<td class="order-base-address-telefax"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTelefax() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.telefax', $fields)) : ?>
+						<td class="order-base-address-telefax"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTelefax()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.email', $fields ) ) : ?>
-						<td class="order-base-address-email"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getEmail() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.email', $fields)) : ?>
+						<td class="order-base-address-email"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getEmail()) : ''; ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.address.website', $fields ) ) : ?>
-						<td class="order-base-address-website"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getWebsite() ) : ''; ?></a></td>
+					<?php if (in_array('order.base.address.website', $fields)) : ?>
+						<td class="order-base-address-website"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getWebsite()) : ''; ?></a></td>
 					<?php endif; ?>
 
-					<?php $services = ( $baseItem ? $baseItem->getServices() : [] ); ?>
+					<?php $services = ($baseItem ? $baseItem->getServices() : []); ?>
 
-					<?php if( in_array( 'order.base.service.code', $fields ) ) : ?>
+					<?php if (in_array('order.base.service.code', $fields)) : ?>
 						<td class="order-base-service-code">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $services as $type => $list ) : ?>
-									<?php foreach( $list as $serviceItem ) : ?>
-										<span class="line"><?= $enc->html( $serviceItem->getCode() ); ?></span>
+								<?php foreach ($services as $type => $list) : ?>
+									<?php foreach ($list as $serviceItem) : ?>
+										<span class="line"><?= $enc->html($serviceItem->getCode()); ?></span>
 									<?php endforeach; ?>
 								<?php endforeach; ?>
 							</a>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.service.name', $fields ) ) : ?>
+					<?php if (in_array('order.base.service.name', $fields)) : ?>
 						<td class="order-base-service-name">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $services as $type => $list ) : ?>
-									<?php foreach( $list as $serviceItem ) : ?>
-										<span class="line"><?= $enc->html( $serviceItem->getName() ); ?></span>
+								<?php foreach ($services as $type => $list) : ?>
+									<?php foreach ($list as $serviceItem) : ?>
+										<span class="line"><?= $enc->html($serviceItem->getName()); ?></span>
 									<?php endforeach; ?>
 								<?php endforeach; ?>
 							</a>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.service.price', $fields ) ) : ?>
+					<?php if (in_array('order.base.service.price', $fields)) : ?>
 						<td class="order-base-service-price">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $services as $type => $list ) : ?>
-									<?php foreach( $list as $serviceItem ) : ?>
-										<span class="line"><?= $enc->html( $serviceItem->getPrice()->getValue() ); ?></span>
+								<?php foreach ($services as $type => $list) : ?>
+									<?php foreach ($list as $serviceItem) : ?>
+										<span class="line"><?= $enc->html($serviceItem->getPrice()->getValue()); ?></span>
 									<?php endforeach; ?>
 								<?php endforeach; ?>
 							</a>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.service.costs', $fields ) ) : ?>
+					<?php if (in_array('order.base.service.costs', $fields)) : ?>
 						<td class="order-base-service-costs">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $services as $type => $list ) : ?>
-									<?php foreach( $list as $serviceItem ) : ?>
-										<span class="line"><?= $enc->html( $serviceItem->getPrice()->getCosts() ); ?></span>
+								<?php foreach ($services as $type => $list) : ?>
+									<?php foreach ($list as $serviceItem) : ?>
+										<span class="line"><?= $enc->html($serviceItem->getPrice()->getCosts()); ?></span>
 									<?php endforeach; ?>
 								<?php endforeach; ?>
 							</a>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'order.base.service.rebate', $fields ) ) : ?>
+					<?php if (in_array('order.base.service.rebate', $fields)) : ?>
 						<td class="order-base-service-rebate">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $services as $type => $list ) : ?>
-									<?php foreach( $list as $serviceItem ) : ?>
-										<span class="line"><?= $enc->html( $serviceItem->getPrice()->getRebate() ); ?></span>
+								<?php foreach ($services as $type => $list) : ?>
+									<?php foreach ($list as $serviceItem) : ?>
+										<span class="line"><?= $enc->html($serviceItem->getPrice()->getRebate()); ?></span>
 									<?php endforeach; ?>
 								<?php endforeach; ?>
 							</a>
@@ -491,27 +491,27 @@ 
 
 					<td class="actions">
 						<a class="btn act-copy fa"
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $item->getBaseId()] + $params, [], $copyConfig ) ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $item->getBaseId()] + $params, [], $copyConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
 					</td>
 				</tr>
 			<?php endforeach; ?>
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
-		<?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?>
+	<?php if ($this->get('items', []) === []) : ?>
+		<?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?>
 	<?php endif; ?>
 </form>
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/order/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/order/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/dashboard/list-standard.php

Spacing +5 added lines, -5 removed lines

@@ -9,18 +9,18 @@
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 <nav class="main-navbar">
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'Dashboard' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Dashboard')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 	<div class="btn act-show fa" style="visibility: hidden"></div>
 </nav>
 
 <div class="dashboard">
-	<?= $this->get( 'listBody' ); ?>
+	<?= $this->get('listBody'); ?>
 </div>
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/locale/currency/item-standard.php

Spacing +50 added lines, -50 removed lines

@@ -5,37 +5,37 @@ 
  * @copyright Aimeos (aimeos.org), 2017-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/save/target' );
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$target = $this->config('admin/jqadm/url/save/target');
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/save/action', 'save');
+$config = $this->config('admin/jqadm/url/save/config', []);
 
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/locale.currency.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.id'))); ?>" value="<?= $enc->attr($this->get('itemData/locale.currency.id')); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<span class="navbar-brand">
-			<?= $enc->html( $this->translate( 'admin', 'Currency' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/locale.currency.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/locale.currency.label', $this->translate( 'admin', 'New' ) ) ); ?>
+			<?= $enc->html($this->translate('admin', 'Currency')); ?>:
+			<?= $enc->html($this->get('itemData/locale.currency.id')); ?> -
+			<?= $enc->html($this->get('itemData/locale.currency.label', $this->translate('admin', 'New'))); ?>
 		</span>
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</nav>
 
@@ -46,14 +46,14 @@ 
 
 				<li class="nav-item basic">
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
 					</a>
 				</li>
 
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -62,16 +62,16 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.editor')); ?></span>
 				</small>
 			</div>
 		</div>
@@ -81,62 +81,62 @@ 
 
 				<div class="col-xl-6 content-block">
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control custom-select item-status" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.status' ) ) ); ?>" >
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.status'))); ?>" >
 								<option value="">
-									<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('itemData/locale.currency.status', 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('itemData/locale.currency.status', 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('itemData/locale.currency.status', 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('itemData/locale.currency.status', 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-code" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.code' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'ISO currency code (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/locale.currency.code' ) ); ?>" />
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.code'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'ISO currency code (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/locale.currency.code')); ?>" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Three letter ISO currency code' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Three letter ISO currency code')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-label" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.label' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/locale.currency.label' ) ); ?>" />
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.label'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/locale.currency.label')); ?>" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Descritive name of the currency' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Descritive name of the currency')); ?>
 						</div>
 					</div>
 				</div>
 
 			</div>
 
-			<?= $this->get( 'itemBody' ); ?>
+			<?= $this->get('itemBody'); ?>
 
 		</div>
 
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</div>
 </form>
@@ -144,4 +144,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>