@@ -121,9 +121,12 @@ discard block |
||
| 121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
| 122 | 122 | </div> |
| 123 | 123 | </div> |
| 124 | - <?php else : ?> |
|
| 124 | + <?php else { |
|
| 125 | + : ?> |
|
| 125 | 126 | <input class="item-type" type="hidden" |
| 126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
| 127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
| 128 | +} |
|
| 129 | +?>'.replace( 'idx', idx )" |
|
| 127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
| 128 | 131 | <?php endif; ?> |
| 129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
| 201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
| 202 | 205 | </div> |
| 203 | 206 | </div> |
| 204 | - <?php else : ?> |
|
| 207 | + <?php else { |
|
| 208 | + : ?> |
|
| 205 | 209 | <input class="listitem-type" type="hidden" |
| 206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'service.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
| 210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'service.lists.type' ) ) ); |
|
| 211 | +} |
|
| 212 | +?>'.replace( 'idx', idx )" |
|
| 207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
| 208 | 214 | v-model="items[idx]['service.lists.type']" /> |
| 209 | 215 | <?php endif; ?> |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | <th class="actions"> |
| 120 | 120 | <a class="btn fa act-add" tabindex="1" |
| 121 | 121 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
| 122 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 122 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 123 | 123 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
| 124 | 124 | </a> |
| 125 | 125 | |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | <td class="actions"> |
| 200 | 200 | <a class="btn act-copy fa" tabindex="1" |
| 201 | 201 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
| 202 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
| 202 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
| 203 | 203 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
| 204 | 204 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
| 205 | 205 | <a class="btn act-delete fa" tabindex="1" |
| 206 | 206 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig ) ); ?>" |
| 207 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 207 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 208 | 208 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
| 209 | 209 | <?php endif; ?> |
| 210 | 210 | </td> |
@@ -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> |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | </th> |
| 33 | 33 | <th class="actions"> |
| 34 | 34 | <div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 35 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 35 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 36 | 36 | v-on:click="addItem('product.lists.')"> |
| 37 | 37 | </th> |
| 38 | 38 | </tr> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | </td> |
| 67 | 67 | <td class="actions"> |
| 68 | 68 | <div v-if="!checkSite('product.lists.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 69 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 69 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 70 | 70 | v-on:click.stop="removeItem(idx)"> |
| 71 | 71 | </td> |
| 72 | 72 | |
@@ -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 | } |
@@ -303,8 +303,7 @@ |
||
| 303 | 303 | { |
| 304 | 304 | $propItem = $propItems[$entry['attribute.property.id']]; |
| 305 | 305 | unset( $propItems[$entry['attribute.property.id']] ); |
| 306 | - } |
|
| 307 | - else |
|
| 306 | + } else |
|
| 308 | 307 | { |
| 309 | 308 | $propItem = $manager->createItem(); |
| 310 | 309 | } |
@@ -441,9 +441,12 @@ |
||
| 441 | 441 | { |
| 442 | 442 | $manager = \Aimeos\MShop::create( $this->getContext(), 'plugin' ); |
| 443 | 443 | |
| 444 | - try { |
|
| 444 | + try |
|
| 445 | + { |
|
| 445 | 446 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
| 446 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 447 | + } |
|
| 448 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 449 | + { |
|
| 447 | 450 | return []; |
| 448 | 451 | } |
| 449 | 452 | } |