@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @category Developer |
| 56 | 56 | */ |
| 57 | 57 | private $subPartPath = 'admin/jqadm/dashboard/order/standard/subparts'; |
| 58 | - private $subPartNames = array( 'latest', 'paymentstatus' ); |
|
| 58 | + private $subPartNames = array('latest', 'paymentstatus'); |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function copy() |
| 67 | 67 | { |
| 68 | - throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be copied' ); |
|
| 68 | + throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be copied'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function create() |
| 78 | 78 | { |
| 79 | - throw new \Aimeos\Admin\JQAdm\Exception( 'New resources can not be created' ); |
|
| 79 | + throw new \Aimeos\Admin\JQAdm\Exception('New resources can not be created'); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | public function delete() |
| 89 | 89 | { |
| 90 | - throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be deleted' ); |
|
| 90 | + throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be deleted'); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | public function get() |
| 100 | 100 | { |
| 101 | - throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be retrieved' ); |
|
| 101 | + throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be retrieved'); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function save() |
| 111 | 111 | { |
| 112 | - throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be modified' ); |
|
| 112 | + throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be modified'); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
@@ -123,14 +123,14 @@ discard block |
||
| 123 | 123 | $view = $this->getView(); |
| 124 | 124 | $view->orderBody = ''; |
| 125 | 125 | |
| 126 | - foreach( $this->getSubClients() as $client ) { |
|
| 126 | + foreach ($this->getSubClients() as $client) { |
|
| 127 | 127 | $view->orderBody .= $client->search(); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | $tplconf = 'admin/jqadm/dashboard/order/template-list'; |
| 131 | 131 | $default = 'dashboard/list-order-default.php'; |
| 132 | 132 | |
| 133 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 133 | + return $view->render($view->config($tplconf, $default)); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | * @param string|null $name Name of the sub-client (Default if null) |
| 142 | 142 | * @return \Aimeos\Admin\JQAdm\Iface Sub-client object |
| 143 | 143 | */ |
| 144 | - public function getSubClient( $type, $name = null ) |
|
| 144 | + public function getSubClient($type, $name = null) |
|
| 145 | 145 | { |
| 146 | 146 | /** admin/jqadm/dashboard/order/decorators/excludes |
| 147 | 147 | * Excludes decorators added by the "common" option from the dashboard JQAdm client |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | * @see admin/jqadm/dashboard/order/decorators/excludes |
| 217 | 217 | * @see admin/jqadm/dashboard/order/decorators/global |
| 218 | 218 | */ |
| 219 | - return $this->createSubClient( 'dashboard/order/' . $type, $name ); |
|
| 219 | + return $this->createSubClient('dashboard/order/' . $type, $name); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -227,6 +227,6 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | protected function getSubClientNames() |
| 229 | 229 | { |
| 230 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 230 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 231 | 231 | } |
| 232 | 232 | } |
@@ -8,19 +8,19 @@ discard block |
||
| 8 | 8 | $enc = $this->encoder(); |
| 9 | 9 | |
| 10 | 10 | $target = $this->request()->getTarget(); |
| 11 | -$cntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
|
| 12 | -$action = $this->config( 'admin/jqadm/url/search/action', 'search' ); |
|
| 13 | -$config = $this->config( 'admin/jqadm/url/search/config', array() ); |
|
| 11 | +$cntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm'); |
|
| 12 | +$action = $this->config('admin/jqadm/url/search/action', 'search'); |
|
| 13 | +$config = $this->config('admin/jqadm/url/search/config', array()); |
|
| 14 | 14 | |
| 15 | -$jsonTarget = $this->config( 'admin/jsonadm/url/options/target' ); |
|
| 16 | -$jsonCntl = $this->config( 'admin/jsonadm/url/options/controller', 'Jsonadm' ); |
|
| 17 | -$jsonAction = $this->config( 'admin/jsonadm/url/options/action', 'options' ); |
|
| 18 | -$jsonConfig = $this->config( 'admin/jsonadm/url/options/config', array() ); |
|
| 15 | +$jsonTarget = $this->config('admin/jsonadm/url/options/target'); |
|
| 16 | +$jsonCntl = $this->config('admin/jsonadm/url/options/controller', 'Jsonadm'); |
|
| 17 | +$jsonAction = $this->config('admin/jsonadm/url/options/action', 'options'); |
|
| 18 | +$jsonConfig = $this->config('admin/jsonadm/url/options/config', array()); |
|
| 19 | 19 | |
| 20 | -$extTarget = $this->config( 'admin/extjs/url/target' ); |
|
| 21 | -$extCntl = $this->config( 'admin/extjs/url/controller', 'Extadm' ); |
|
| 22 | -$extAction = $this->config( 'admin/extjs/url/action', 'index' ); |
|
| 23 | -$extConfig = $this->config( 'admin/extjs/url/config', array() ); |
|
| 20 | +$extTarget = $this->config('admin/extjs/url/target'); |
|
| 21 | +$extCntl = $this->config('admin/extjs/url/controller', 'Extadm'); |
|
| 22 | +$extAction = $this->config('admin/extjs/url/action', 'index'); |
|
| 23 | +$extConfig = $this->config('admin/extjs/url/config', array()); |
|
| 24 | 24 | |
| 25 | 25 | /** admin/jqadm/resources |
| 26 | 26 | * List of available resource clients in the JQAdm interface |
@@ -32,18 +32,18 @@ discard block |
||
| 32 | 32 | * @since 2016.07 |
| 33 | 33 | * @category Developer |
| 34 | 34 | */ |
| 35 | -$resourceList = $this->config( 'admin/jqadm/resources', array( 'dashboard', 'product' ) ); |
|
| 35 | +$resourceList = $this->config('admin/jqadm/resources', array('dashboard', 'product')); |
|
| 36 | 36 | |
| 37 | -$site = $this->param( 'site' ); |
|
| 38 | -$extParams = array( 'site' => $site, 'lang' => $this->param( 'lang' ) ); |
|
| 37 | +$site = $this->param('site'); |
|
| 38 | +$extParams = array('site' => $site, 'lang' => $this->param('lang')); |
|
| 39 | 39 | |
| 40 | -$params = $this->get( 'pageParams', array() ); |
|
| 41 | -$params['resource'] = $this->param( 'resource', 'dashboard' ); |
|
| 42 | -$params['site'] = $this->param( 'site', 'default' ); |
|
| 43 | -$params['id'] = $this->param( 'id', '' ); |
|
| 40 | +$params = $this->get('pageParams', array()); |
|
| 41 | +$params['resource'] = $this->param('resource', 'dashboard'); |
|
| 42 | +$params['site'] = $this->param('site', 'default'); |
|
| 43 | +$params['id'] = $this->param('id', ''); |
|
| 44 | 44 | |
| 45 | 45 | ?> |
| 46 | -<div class="aimeos" data-url="<?php echo $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, array( 'site' => $site, 'resource' => '', 'id' => '' ), array(), $jsonConfig ) ); ?>"> |
|
| 46 | +<div class="aimeos" data-url="<?php echo $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, array('site' => $site, 'resource' => '', 'id' => ''), array(), $jsonConfig)); ?>"> |
|
| 47 | 47 | |
| 48 | 48 | <nav class="navbar navbar-full"> |
| 49 | 49 | <a class="navbar-brand" href="https://aimeos.org/update/?type={type}&version={version}"> |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | <div class="collapse navbar-toggleable-xs" id="collapse-navbar"> |
| 56 | 56 | <ul class="nav navbar-nav"> |
| 57 | 57 | |
| 58 | -<?php if( $this->access( 'admin' ) ) : ?> |
|
| 58 | +<?php if ($this->access('admin')) : ?> |
|
| 59 | 59 | <li class="nav-item mode active"> |
| 60 | - <a class="nav-link" href="<?php echo $enc->attr( $this->url( $extTarget, $extCntl, $extAction, $extParams, array(), $extConfig ) ); ?>"> |
|
| 61 | - <?php echo $enc->html( $this->translate( 'admin', 'Expert mode' ) ); ?> |
|
| 60 | + <a class="nav-link" href="<?php echo $enc->attr($this->url($extTarget, $extCntl, $extAction, $extParams, array(), $extConfig)); ?>"> |
|
| 61 | + <?php echo $enc->html($this->translate('admin', 'Expert mode')); ?> |
|
| 62 | 62 | </a> |
| 63 | 63 | </li> |
| 64 | 64 | <?php endif; ?> |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | <li class="nav-item resource"> |
| 67 | 67 | <div class="btn-group"> |
| 68 | 68 | <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 69 | - <?php echo $enc->attr( $this->translate( 'admin', $this->param( 'resource' ) ) ); ?> |
|
| 69 | + <?php echo $enc->attr($this->translate('admin', $this->param('resource'))); ?> |
|
| 70 | 70 | </button> |
| 71 | 71 | <div class="dropdown-menu"> |
| 72 | -<?php foreach( $resourceList as $code ) : ?> |
|
| 72 | +<?php foreach ($resourceList as $code) : ?> |
|
| 73 | 73 | <a class="dropdown-item" |
| 74 | - href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'resource' => $code ) + $params, array(), $config ) ); ?>"> |
|
| 75 | - <?php echo $enc->html( $this->translate( 'admin', $code ) ); ?> |
|
| 74 | + href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('resource' => $code) + $params, array(), $config)); ?>"> |
|
| 75 | + <?php echo $enc->html($this->translate('admin', $code)); ?> |
|
| 76 | 76 | </a> |
| 77 | 77 | <?php endforeach; ?> |
| 78 | 78 | </div> |
@@ -82,31 +82,31 @@ discard block |
||
| 82 | 82 | <li class="nav-item language"> |
| 83 | 83 | <div class="btn-group"> |
| 84 | 84 | <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 85 | - <?php echo $enc->attr( $this->param( 'lang', $this->translate( 'admin', 'Language' ) ) ); ?> |
|
| 85 | + <?php echo $enc->attr($this->param('lang', $this->translate('admin', 'Language'))); ?> |
|
| 86 | 86 | </button> |
| 87 | 87 | <div class="dropdown-menu"> |
| 88 | -<?php foreach( $this->get( 'languagesList', array() ) as $langid ) : ?> |
|
| 88 | +<?php foreach ($this->get('languagesList', array()) as $langid) : ?> |
|
| 89 | 89 | <a class="dropdown-item" |
| 90 | - href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'lang' => $langid ) + $params, array(), $config ) ); ?>"> |
|
| 91 | - <?php echo $enc->html( $langid ); ?> |
|
| 90 | + href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('lang' => $langid) + $params, array(), $config)); ?>"> |
|
| 91 | + <?php echo $enc->html($langid); ?> |
|
| 92 | 92 | </a> |
| 93 | 93 | <?php endforeach; ?> |
| 94 | 94 | </div> |
| 95 | 95 | </div> |
| 96 | 96 | </li> |
| 97 | 97 | |
| 98 | -<?php if( $this->access( 'admin' ) ) : ?> |
|
| 99 | -<?php $sites = $this->get( 'sitesList', array() ); ?> |
|
| 98 | +<?php if ($this->access('admin')) : ?> |
|
| 99 | +<?php $sites = $this->get('sitesList', array()); ?> |
|
| 100 | 100 | <li class="nav-item site"> |
| 101 | 101 | <div class="btn-group"> |
| 102 | 102 | <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 103 | - <?php echo $enc->attr( $this->value( $sites, $site, $this->translate( 'admin', 'Site' ) ) ); ?> |
|
| 103 | + <?php echo $enc->attr($this->value($sites, $site, $this->translate('admin', 'Site'))); ?> |
|
| 104 | 104 | </button> |
| 105 | 105 | <div class="dropdown-menu"> |
| 106 | -<?php foreach( $sites as $code => $label ) : ?> |
|
| 106 | +<?php foreach ($sites as $code => $label) : ?> |
|
| 107 | 107 | <a class="dropdown-item" |
| 108 | - href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'site' => $code ) + $params, array(), $config ) ); ?>"> |
|
| 109 | - <?php echo $enc->html( $label ); ?> |
|
| 108 | + href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('site' => $code) + $params, array(), $config)); ?>"> |
|
| 109 | + <?php echo $enc->html($label); ?> |
|
| 110 | 110 | </a> |
| 111 | 111 | <?php endforeach; ?> |
| 112 | 112 | </div> |
@@ -121,12 +121,12 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | <div class="container"> |
| 123 | 123 | |
| 124 | -<?php echo $this->partial( $this->config( 'admin/jqadm/partial/error', 'common/partials/error-default.php' ), array( 'errors' => $this->get( 'errors', array() ) ) ); ?> |
|
| 124 | +<?php echo $this->partial($this->config('admin/jqadm/partial/error', 'common/partials/error-default.php'), array('errors' => $this->get('errors', array()))); ?> |
|
| 125 | 125 | |
| 126 | -<?php echo $this->block()->get( 'jqadm_content' ); ?> |
|
| 126 | +<?php echo $this->block()->get('jqadm_content'); ?> |
|
| 127 | 127 | |
| 128 | 128 | </div> |
| 129 | 129 | |
| 130 | -<?php echo $this->partial( $this->config( 'admin/jqadm/partial/confirm', 'common/partials/confirm-default.php' ) ); ?> |
|
| 130 | +<?php echo $this->partial($this->config('admin/jqadm/partial/confirm', 'common/partials/confirm-default.php')); ?> |
|
| 131 | 131 | |
| 132 | 132 | </div> |
@@ -5,53 +5,53 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2015 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 8 | +$price = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat) |
|
| 9 | 9 | { |
| 10 | - if( isset( $orders[$item->getBaseId()] ) ) |
|
| 10 | + if (isset($orders[$item->getBaseId()])) |
|
| 11 | 11 | { |
| 12 | 12 | $price = $orders[$item->getBaseId()]->getPrice(); |
| 13 | - return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() ); |
|
| 13 | + return sprintf($priceFormat, $price->getValue(), $price->getCurrencyId()); |
|
| 14 | 14 | } |
| 15 | 15 | }; |
| 16 | 16 | |
| 17 | -$status = function( $list, $key ) |
|
| 17 | +$status = function($list, $key) |
|
| 18 | 18 | { |
| 19 | - return ( isset( $list[$key] ) ? $list[$key] : '' ); |
|
| 19 | + return (isset($list[$key]) ? $list[$key] : ''); |
|
| 20 | 20 | }; |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | $enc = $this->encoder(); |
| 24 | -$orders = $this->get( 'orderlatestOrders', array() ); |
|
| 24 | +$orders = $this->get('orderlatestOrders', array()); |
|
| 25 | 25 | /// price format with value (%1$s) and currency (%2$s) |
| 26 | -$priceFormat = $this->translate( 'admin', '%1$s %2$s' ); |
|
| 26 | +$priceFormat = $this->translate('admin', '%1$s %2$s'); |
|
| 27 | 27 | |
| 28 | 28 | $statuslist = array( |
| 29 | - Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED => $this->translate( 'admin', 'pay:unfinished' ), |
|
| 30 | - Aimeos\MShop\Order\Item\Base::PAY_DELETED => $this->translate( 'admin', 'pay:deleted' ), |
|
| 31 | - Aimeos\MShop\Order\Item\Base::PAY_CANCELED => $this->translate( 'admin', 'pay:canceled' ), |
|
| 32 | - Aimeos\MShop\Order\Item\Base::PAY_REFUSED => $this->translate( 'admin', 'pay:refused' ), |
|
| 33 | - Aimeos\MShop\Order\Item\Base::PAY_REFUND => $this->translate( 'admin', 'pay:refund' ), |
|
| 34 | - Aimeos\MShop\Order\Item\Base::PAY_PENDING => $this->translate( 'admin', 'pay:pending' ), |
|
| 35 | - Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED => $this->translate( 'admin', 'pay:authorized' ), |
|
| 36 | - Aimeos\MShop\Order\Item\Base::PAY_RECEIVED => $this->translate( 'admin', 'pay:received' ), |
|
| 29 | + Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED => $this->translate('admin', 'pay:unfinished'), |
|
| 30 | + Aimeos\MShop\Order\Item\Base::PAY_DELETED => $this->translate('admin', 'pay:deleted'), |
|
| 31 | + Aimeos\MShop\Order\Item\Base::PAY_CANCELED => $this->translate('admin', 'pay:canceled'), |
|
| 32 | + Aimeos\MShop\Order\Item\Base::PAY_REFUSED => $this->translate('admin', 'pay:refused'), |
|
| 33 | + Aimeos\MShop\Order\Item\Base::PAY_REFUND => $this->translate('admin', 'pay:refund'), |
|
| 34 | + Aimeos\MShop\Order\Item\Base::PAY_PENDING => $this->translate('admin', 'pay:pending'), |
|
| 35 | + Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED => $this->translate('admin', 'pay:authorized'), |
|
| 36 | + Aimeos\MShop\Order\Item\Base::PAY_RECEIVED => $this->translate('admin', 'pay:received'), |
|
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | 39 | ?> |
| 40 | 40 | <div class="order-latest card panel"> |
| 41 | 41 | <div id="order-latest-head" class="header card-header"> |
| 42 | - <?php echo $enc->html( $this->translate( 'admin', 'Latest orders' ) ); ?> |
|
| 42 | + <?php echo $enc->html($this->translate('admin', 'Latest orders')); ?> |
|
| 43 | 43 | </div> |
| 44 | 44 | <div id="order-latest-data" class="content card-block"> |
| 45 | 45 | <div class="table-responsive"> |
| 46 | 46 | <table class="list-items table table-hover"> |
| 47 | 47 | <tbody> |
| 48 | - <?php foreach( $this->get( 'orderlatestItems', array() ) as $id => $item ) : ?> |
|
| 48 | + <?php foreach ($this->get('orderlatestItems', array()) as $id => $item) : ?> |
|
| 49 | 49 | <tr> |
| 50 | - <td class="order.id"><?php echo $enc->html( $item->getId() ); ?></td> |
|
| 51 | - <td class="order.type"><?php echo $enc->html( $item->getType() ); ?></td> |
|
| 52 | - <td class="order.datepayment"><?php echo $enc->html( $item->getDatePayment() ); ?></td> |
|
| 53 | - <td class="order.statuspayment"><?php echo $enc->html( $status( $statuslist, $item->getPaymentStatus() ) ); ?></td> |
|
| 54 | - <td class="order.base.price"><?php echo $enc->html( $price( $orders, $item, $priceFormat ) ); ?></td> |
|
| 50 | + <td class="order.id"><?php echo $enc->html($item->getId()); ?></td> |
|
| 51 | + <td class="order.type"><?php echo $enc->html($item->getType()); ?></td> |
|
| 52 | + <td class="order.datepayment"><?php echo $enc->html($item->getDatePayment()); ?></td> |
|
| 53 | + <td class="order.statuspayment"><?php echo $enc->html($status($statuslist, $item->getPaymentStatus())); ?></td> |
|
| 54 | + <td class="order.base.price"><?php echo $enc->html($price($orders, $item, $priceFormat)); ?></td> |
|
| 55 | 55 | </tr> |
| 56 | 56 | <?php endforeach; ?> |
| 57 | 57 | </tbody> |
@@ -59,4 +59,4 @@ discard block |
||
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | 61 | </div> |
| 62 | -<?php echo $this->get( 'orderlatestBody' ); ?> |
|
| 62 | +<?php echo $this->get('orderlatestBody'); ?> |
|