@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2020 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 9 | -{ |
|
| 8 | +$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
| 10 | 9 | if( $order = $item->getBaseItem() ) |
| 11 | 10 | { |
| 12 | 11 | $price = 0; |
@@ -20,8 +19,7 @@ discard block |
||
| 20 | 19 | }; |
| 21 | 20 | |
| 22 | 21 | |
| 23 | -$name = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 24 | -{ |
|
| 22 | +$name = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 25 | 23 | if( $order = $item->getBaseItem() ) |
| 26 | 24 | { |
| 27 | 25 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -39,8 +37,7 @@ discard block |
||
| 39 | 37 | }; |
| 40 | 38 | |
| 41 | 39 | |
| 42 | -$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 43 | -{ |
|
| 40 | +$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 44 | 41 | if( $order = $item->getBaseItem() ) |
| 45 | 42 | { |
| 46 | 43 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -56,8 +53,7 @@ discard block |
||
| 56 | 53 | }; |
| 57 | 54 | |
| 58 | 55 | |
| 59 | -$status = function( array $list, $key ) |
|
| 60 | -{ |
|
| 56 | +$status = function( array $list, $key ) { |
|
| 61 | 57 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
| 62 | 58 | }; |
| 63 | 59 | |
@@ -35,8 +35,11 @@ |
||
| 35 | 35 | <span class="navbar-label"> |
| 36 | 36 | <?php if( $this->get( 'itemData/locale.id' ) ) : ?> |
| 37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
| 38 | - <?php else : ?> |
|
| 39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
| 38 | + <?php else { |
|
| 39 | + : ?> |
|
| 40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
| 41 | +} |
|
| 42 | +?> |
|
| 40 | 43 | <?php endif; ?> |
| 41 | 44 | </span> |
| 42 | 45 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?></span> |
@@ -45,8 +45,11 @@ |
||
| 45 | 45 | <span class="navbar-label"> |
| 46 | 46 | <?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
| 47 | 47 | <?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ); ?> |
| 48 | - <?php else : ?> |
|
| 49 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
| 48 | + <?php else { |
|
| 49 | + : ?> |
|
| 50 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
| 51 | +} |
|
| 52 | +?> |
|
| 50 | 53 | <?php endif; ?> |
| 51 | 54 | </span> |
| 52 | 55 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/subscription.siteid' ) ) ); ?></span> |
@@ -187,8 +187,11 @@ discard block |
||
| 187 | 187 | <?php foreach( $this->pageSiteList as $siteItem ) : ?> |
| 188 | 188 | <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> |
| 189 | 189 | <?php $siteFcn( $this->pageSiteTree ); ?> |
| 190 | - <?php else : ?> |
|
| 191 | - <?php $siteFcn( $siteItem ); ?> |
|
| 190 | + <?php else { |
|
| 191 | + : ?> |
|
| 192 | + <?php $siteFcn( $siteItem ); |
|
| 193 | +} |
|
| 194 | +?> |
|
| 192 | 195 | <?php endif; ?> |
| 193 | 196 | <?php endforeach; ?> |
| 194 | 197 | </ul> |
@@ -221,9 +224,12 @@ discard block |
||
| 221 | 224 | </li> |
| 222 | 225 | |
| 223 | 226 | <?php endif; ?> |
| 224 | - <?php else : ?> |
|
| 227 | + <?php else { |
|
| 228 | + : ?> |
|
| 225 | 229 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
| 226 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 230 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
| 231 | +} |
|
| 232 | +?> |
|
| 227 | 233 | |
| 228 | 234 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
| 229 | 235 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
@@ -271,9 +277,12 @@ discard block |
||
| 271 | 277 | </li> |
| 272 | 278 | |
| 273 | 279 | <?php endif; ?> |
| 274 | - <?php else : ?> |
|
| 280 | + <?php else { |
|
| 281 | + : ?> |
|
| 275 | 282 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
| 276 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 283 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
| 284 | +} |
|
| 285 | +?> |
|
| 277 | 286 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
| 278 | 287 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
| 279 | 288 | title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |
@@ -62,8 +62,11 @@ |
||
| 62 | 62 | name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>" |
| 63 | 63 | v-bind:value="'<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>'" |
| 64 | 64 | v-bind:config="Aimeos.flatpickr.daterange" /> |
| 65 | - <?php else : ?> |
|
| 66 | - <input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 65 | + <?php else { |
|
| 66 | + : ?> |
|
| 67 | + <input class="form-control" type="<?= $enc->attr( $type ); |
|
| 68 | +} |
|
| 69 | +?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 67 | 70 | name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>" |
| 68 | 71 | value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>" /> |
| 69 | 72 | <?php endif; ?> |
@@ -44,9 +44,12 @@ |
||
| 44 | 44 | { |
| 45 | 45 | $view = $this->getView(); |
| 46 | 46 | |
| 47 | - try { |
|
| 47 | + try |
|
| 48 | + { |
|
| 48 | 49 | $view->listBody = parent::search(); |
| 49 | - } catch( \Exception $e ) { |
|
| 50 | + } |
|
| 51 | + catch( \Exception $e ) |
|
| 52 | + { |
|
| 50 | 53 | $this->report( $e, 'search' ); |
| 51 | 54 | } |
| 52 | 55 | |