@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $first = ( $offset > 0 ? 0 : null ); |
| 43 | 43 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
| 44 | 44 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
| 45 | -$last = ( floor(($total - 1) / $limit) * $limit > $offset ? floor(($total - 1) / $limit) * $limit : null ); |
|
| 45 | +$last = ( floor( ( $total - 1 ) / $limit ) * $limit > $offset ? floor( ( $total - 1 ) / $limit ) * $limit : null ); |
|
| 46 | 46 | |
| 47 | 47 | $pageCurrent = floor( $offset / $limit ) + 1; |
| 48 | 48 | $pageTotal = ( $total != 0 ? ceil( $total / $limit ) : 1 ); |
@@ -21,8 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | |
| 24 | -$pgroup = function( array $params, $group ) |
|
| 25 | -{ |
|
| 24 | +$pgroup = function( array $params, $group ) { |
|
| 26 | 25 | if( $group != null ) { |
| 27 | 26 | return [$group => ['page' => $params]]; |
| 28 | 27 | } |
@@ -56,16 +55,14 @@ discard block |
||
| 56 | 55 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
| 57 | 56 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
| 58 | 57 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
| 59 | - } |
|
| 60 | - else |
|
| 58 | + } else |
|
| 61 | 59 | { |
| 62 | 60 | $target = $this->config( 'admin/jqadm/url/create/target' ); |
| 63 | 61 | $controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' ); |
| 64 | 62 | $action = $this->config( 'admin/jqadm/url/create/action', 'create' ); |
| 65 | 63 | $config = $this->config( 'admin/jqadm/url/create/config', [] ); |
| 66 | 64 | } |
| 67 | -} |
|
| 68 | -else |
|
| 65 | +} else |
|
| 69 | 66 | { |
| 70 | 67 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
| 71 | 68 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
| 156 | 156 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
| 157 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 157 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 158 | 158 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
| 159 | 159 | </a> |
| 160 | 160 | </li> |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | <th class="actions"> |
| 322 | 322 | <?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?> |
| 323 | 323 | <div class="btn act-add fa" tabindex="1" |
| 324 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
| 324 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
| 325 | 325 | </div> |
| 326 | 326 | <?php endif; ?> |
| 327 | 327 | </th> |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | <td class="actions"> |
| 347 | 347 | <?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?> |
| 348 | 348 | <div class="btn act-delete fa" tabindex="1" |
| 349 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 349 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 350 | 350 | </div> |
| 351 | 351 | <?php endif; ?> |
| 352 | 352 | </td> |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | <td class="actions"> |
| 366 | 366 | <?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?> |
| 367 | 367 | <div class="btn act-delete fa" tabindex="1" |
| 368 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 368 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 369 | 369 | </div> |
| 370 | 370 | <?php endif; ?> |
| 371 | 371 | </td> |
@@ -442,9 +442,12 @@ |
||
| 442 | 442 | { |
| 443 | 443 | $manager = \Aimeos\MShop::create( $this->getContext(), 'service' ); |
| 444 | 444 | |
| 445 | - try { |
|
| 445 | + try |
|
| 446 | + { |
|
| 446 | 447 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
| 447 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 448 | + } |
|
| 449 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 450 | + { |
|
| 448 | 451 | return []; |
| 449 | 452 | } |
| 450 | 453 | } |
@@ -434,9 +434,12 @@ |
||
| 434 | 434 | { |
| 435 | 435 | $manager = \Aimeos\MShop::create( $this->getContext(), 'coupon' ); |
| 436 | 436 | |
| 437 | - try { |
|
| 437 | + try |
|
| 438 | + { |
|
| 438 | 439 | return $manager->getProvider( $item, '' )->getConfigBE(); |
| 439 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 440 | + } |
|
| 441 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 442 | + { |
|
| 440 | 443 | return []; |
| 441 | 444 | } |
| 442 | 445 | } |