@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
| 63 | 63 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
| 64 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 64 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 65 | 65 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
| 66 | 66 | </a> |
| 67 | 67 | </li> |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | <th class="actions"> |
| 239 | 239 | <?php if( !$this->site()->readonly( $this->get( 'itemData/service.siteid' ) ) ) : ?> |
| 240 | 240 | <div class="btn act-add fa" tabindex="1" |
| 241 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
| 241 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
| 242 | 242 | </div> |
| 243 | 243 | <?php endif; ?> |
| 244 | 244 | </th> |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | <td class="actions"> |
| 266 | 266 | <?php if( !$this->site()->readonly( $this->get( 'itemData/service.siteid' ) ) ) : ?> |
| 267 | 267 | <div class="btn act-delete fa" tabindex="1" |
| 268 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 268 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 269 | 269 | </div> |
| 270 | 270 | <?php endif; ?> |
| 271 | 271 | </td> |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | <tr class="config-map-row prototype-map"> |
| 289 | 289 | <td class="config-map-actions"> |
| 290 | 290 | <div class="btn act-delete fa" tabindex="1" |
| 291 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 291 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 292 | 292 | </div> |
| 293 | 293 | </td> |
| 294 | 294 | <td class="config-map-row-key"> |
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | <tr class="config-map-actions"> |
| 302 | 302 | <td class="config-map-action-add"> |
| 303 | 303 | <div class="btn act-add fa" tabindex="1" |
| 304 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>"> |
|
| 304 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>"> |
|
| 305 | 305 | </div> |
| 306 | 306 | </td> |
| 307 | 307 | <td class="config-map-action-update" colspan="2"> |
| 308 | 308 | <div class="btn btn-primary act-update" tabindex="1"> |
| 309 | - <?= $enc->attr( $this->translate( 'admin', 'OK') ); ?> |
|
| 309 | + <?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?> |
|
| 310 | 310 | </div> |
| 311 | 311 | </td> |
| 312 | 312 | </tr> |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | </td> |
| 345 | 345 | <td class="actions"> |
| 346 | 346 | <div class="btn act-delete fa" tabindex="1" |
| 347 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 347 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 348 | 348 | </div> |
| 349 | 349 | </td> |
| 350 | 350 | </tr> |
@@ -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 | |
@@ -213,12 +213,12 @@ discard block |
||
| 213 | 213 | <td class="actions"> |
| 214 | 214 | <a class="btn act-copy fa" tabindex="1" |
| 215 | 215 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
| 216 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
| 216 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
| 217 | 217 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
| 218 | 218 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
| 219 | 219 | <a class="btn act-delete fa" tabindex="1" |
| 220 | 220 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'service', 'id' => $id] + $params, [], $delConfig ) ); ?>" |
| 221 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 221 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 222 | 222 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
| 223 | 223 | <?php endif; ?> |
| 224 | 224 | </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 | } |
@@ -279,7 +279,7 @@ |
||
| 279 | 279 | $manager = \Aimeos\MShop::create( $this->getContext(), 'attribute/property/type' ); |
| 280 | 280 | |
| 281 | 281 | $search = $manager->createSearch( true )->setSlice( 0, 10000 ); |
| 282 | - $search->setSortations( [$search->sort( '+', 'attribute.property.type.position')] ); |
|
| 282 | + $search->setSortations( [$search->sort( '+', 'attribute.property.type.position' )] ); |
|
| 283 | 283 | |
| 284 | 284 | return $manager->searchItems( $search ); |
| 285 | 285 | } |
@@ -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 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | $manager = \Aimeos\MAdmin::create( $context, 'log' ); |
| 41 | 41 | |
| 42 | 42 | $search = $manager->createSearch(); |
| 43 | - $search->setSortations( [$search->sort( '-', 'log.timestamp')] ); |
|
| 43 | + $search->setSortations( [$search->sort( '-', 'log.timestamp' )] ); |
|
| 44 | 44 | $search = $this->initCriteria( $search, $params ); |
| 45 | 45 | |
| 46 | 46 | $view->items = $manager->searchItems( $search, [], $total ); |
@@ -558,8 +558,7 @@ |
||
| 558 | 558 | { |
| 559 | 559 | $this->checkSite( $super, $data['locale.site.id'] ); |
| 560 | 560 | $item = $manager->getItem( $data['locale.site.id'] ); |
| 561 | - } |
|
| 562 | - else |
|
| 561 | + } else |
|
| 563 | 562 | { |
| 564 | 563 | $this->checkSite( $super ); |
| 565 | 564 | $item = $manager->createItem(); |
@@ -279,7 +279,7 @@ |
||
| 279 | 279 | $manager = \Aimeos\MShop::create( $context, 'locale/currency' ); |
| 280 | 280 | |
| 281 | 281 | $search = $manager->createSearch(); |
| 282 | - $search->setSortations( [$search->sort( '-', 'locale.currency.status'), $search->sort( '+', 'locale.currency.id')] ); |
|
| 282 | + $search->setSortations( [$search->sort( '-', 'locale.currency.status' ), $search->sort( '+', 'locale.currency.id' )] ); |
|
| 283 | 283 | $search = $this->initCriteria( $search, $params ); |
| 284 | 284 | |
| 285 | 285 | $view->items = $manager->searchItems( $search, [], $total ); |