@@ -278,8 +278,7 @@ |
||
278 | 278 | { |
279 | 279 | $propItem = $propItems[$entry['media.property.id']]; |
280 | 280 | unset( $propItems[$entry['media.property.id']] ); |
281 | - } |
|
282 | - else |
|
281 | + } else |
|
283 | 282 | { |
284 | 283 | $propItem = $propManager->create(); |
285 | 284 | } |
@@ -278,8 +278,7 @@ |
||
278 | 278 | { |
279 | 279 | $propItem = $propItems[$entry['price.property.id']]; |
280 | 280 | unset( $propItems[$entry['price.property.id']] ); |
281 | - } |
|
282 | - else |
|
281 | + } else |
|
283 | 282 | { |
284 | 283 | $propItem = $propManager->create(); |
285 | 284 | } |
@@ -375,9 +375,12 @@ |
||
375 | 375 | { |
376 | 376 | $manager = \Aimeos\MShop::create( $this->context(), 'service' ); |
377 | 377 | |
378 | - try { |
|
378 | + try |
|
379 | + { |
|
379 | 380 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
380 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
381 | + } |
|
382 | + catch( \Aimeos\MShop\Exception $e ) |
|
383 | + { |
|
381 | 384 | return []; |
382 | 385 | } |
383 | 386 | } |
@@ -522,7 +522,7 @@ |
||
522 | 522 | foreach( (array) $this->val( $data, 'config', [] ) as $entry ) |
523 | 523 | { |
524 | 524 | if( ( $key = trim( $entry['key'] ?? '' ) ) !== '' && ( $val = trim( $entry['val'] ?? '' ) ) !== '' ) { |
525 | - $conf[$key] = json_decode( $val, true ) ?? $val; |
|
525 | + $conf[$key] = json_decode( $val, true ) ?? $val; |
|
526 | 526 | } |
527 | 527 | } |
528 | 528 |
@@ -374,9 +374,12 @@ |
||
374 | 374 | { |
375 | 375 | $manager = \Aimeos\MShop::create( $this->context(), 'plugin' ); |
376 | 376 | |
377 | - try { |
|
377 | + try |
|
378 | + { |
|
378 | 379 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
379 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
380 | + } |
|
381 | + catch( \Aimeos\MShop\Exception $e ) |
|
382 | + { |
|
380 | 383 | return []; |
381 | 384 | } |
382 | 385 | } |
@@ -502,7 +502,7 @@ |
||
502 | 502 | foreach( (array) $this->val( $data, 'config', [] ) as $entry ) |
503 | 503 | { |
504 | 504 | if( ( $key = trim( $entry['key'] ?? '' ) ) !== '' && ( $val = trim( $entry['val'] ?? '' ) ) !== '' ) { |
505 | - $conf[$key] = json_decode( $val, true ) ?? $val; |
|
505 | + $conf[$key] = json_decode( $val, true ) ?? $val; |
|
506 | 506 | } |
507 | 507 | } |
508 | 508 |
@@ -374,9 +374,12 @@ |
||
374 | 374 | { |
375 | 375 | $manager = \Aimeos\MShop::create( $this->context(), 'rule' ); |
376 | 376 | |
377 | - try { |
|
377 | + try |
|
378 | + { |
|
378 | 379 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
379 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
380 | + } |
|
381 | + catch( \Aimeos\MShop\Exception $e ) |
|
382 | + { |
|
380 | 383 | return []; |
381 | 384 | } |
382 | 385 | } |
@@ -500,7 +500,7 @@ |
||
500 | 500 | foreach( (array) $this->val( $data, 'config', [] ) as $entry ) |
501 | 501 | { |
502 | 502 | if( ( $key = trim( $entry['key'] ?? '' ) ) !== '' && ( $val = trim( $entry['val'] ?? '' ) ) !== '' ) { |
503 | - $conf[$key] = json_decode( $val, true ) ?? $val; |
|
503 | + $conf[$key] = json_decode( $val, true ) ?? $val; |
|
504 | 504 | } |
505 | 505 | } |
506 | 506 |
@@ -271,8 +271,7 @@ |
||
271 | 271 | { |
272 | 272 | $propItem = $propItems[$entry['customer.property.id']]; |
273 | 273 | unset( $propItems[$entry['customer.property.id']] ); |
274 | - } |
|
275 | - else |
|
274 | + } else |
|
276 | 275 | { |
277 | 276 | $propItem = $manager->create(); |
278 | 277 | } |
@@ -278,8 +278,7 @@ |
||
278 | 278 | { |
279 | 279 | $propItem = $propItems[$entry['media.property.id']]; |
280 | 280 | unset( $propItems[$entry['media.property.id']] ); |
281 | - } |
|
282 | - else |
|
281 | + } else |
|
283 | 282 | { |
284 | 283 | $propItem = $propManager->create(); |
285 | 284 | } |
@@ -44,9 +44,12 @@ |
||
44 | 44 | { |
45 | 45 | $view = $this->view(); |
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 |
@@ -365,9 +365,12 @@ |
||
365 | 365 | { |
366 | 366 | $manager = \Aimeos\MShop::create( $this->context(), 'coupon' ); |
367 | 367 | |
368 | - try { |
|
368 | + try |
|
369 | + { |
|
369 | 370 | return $manager->getProvider( $item, '' )->getConfigBE(); |
370 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
371 | + } |
|
372 | + catch( \Aimeos\MShop\Exception $e ) |
|
373 | + { |
|
371 | 374 | return []; |
372 | 375 | } |
373 | 376 | } |
@@ -468,7 +468,7 @@ |
||
468 | 468 | foreach( (array) $this->val( $data, 'config', [] ) as $entry ) |
469 | 469 | { |
470 | 470 | if( ( $key = trim( $entry['key'] ?? '' ) ) !== '' && ( $val = trim( $entry['val'] ?? '' ) ) !== '' ) { |
471 | - $conf[$key] = json_decode( $val, true ) ?? $val; |
|
471 | + $conf[$key] = json_decode( $val, true ) ?? $val; |
|
472 | 472 | } |
473 | 473 | } |
474 | 474 |