@@ -265,9 +265,12 @@ discard block |
||
| 265 | 265 | { |
| 266 | 266 | foreach( $codes as $code ) |
| 267 | 267 | { |
| 268 | - try { |
|
| 268 | + try |
|
| 269 | + { |
|
| 269 | 270 | $newOrder->addCoupon( $code ); |
| 270 | - } catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) { |
|
| 271 | + } |
|
| 272 | + catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) |
|
| 273 | + { |
|
| 271 | 274 | $newOrder->deleteCoupon( $code ); |
| 272 | 275 | } |
| 273 | 276 | } |
@@ -383,7 +386,9 @@ discard block |
||
| 383 | 386 | $context->setUserId( $order->getCustomerId() ); |
| 384 | 387 | $context->setGroupIds( $customerItem->getGroups() ); |
| 385 | 388 | } |
| 386 | - catch( \Exception $e ) {} // Subscription without account |
|
| 389 | + catch( \Exception $e ) |
|
| 390 | + { |
|
| 391 | +} // Subscription without account |
|
| 387 | 392 | |
| 388 | 393 | return $context; |
| 389 | 394 | } |
@@ -569,9 +574,11 @@ discard block |
||
| 569 | 574 | } |
| 570 | 575 | catch( \Exception $e ) |
| 571 | 576 | { |
| 572 | - if( $e->getCode() < 1 ) // not a soft error |
|
| 577 | + if( $e->getCode() < 1 ) { |
|
| 578 | + // not a soft error |
|
| 573 | 579 | { |
| 574 | 580 | $item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT ); |
| 581 | + } |
|
| 575 | 582 | |
| 576 | 583 | if( $this->ends() ) { |
| 577 | 584 | $item->setDateEnd( date_create()->format( 'Y-m-d' ) ); |
@@ -327,7 +327,9 @@ discard block |
||
| 327 | 327 | |
| 328 | 328 | return $currentid; |
| 329 | 329 | } |
| 330 | - catch( \Aimeos\MShop\Exception $e ) {} // not found, create new |
|
| 330 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 331 | + { |
|
| 332 | +} // not found, create new |
|
| 331 | 333 | } |
| 332 | 334 | |
| 333 | 335 | $item = $this->process( $manager->create(), $node ); |
@@ -365,13 +367,11 @@ discard block |
||
| 365 | 367 | |
| 366 | 368 | $currentid = $this->importNode( $node, $domains, $parentid, $childMap ); |
| 367 | 369 | $total++; |
| 368 | - } |
|
| 369 | - elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 370 | + } elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 370 | 371 | { |
| 371 | 372 | $this->importTree( $xml, $domains, $currentid, $childMap ); |
| 372 | 373 | $childMap = []; |
| 373 | - } |
|
| 374 | - elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 374 | + } elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 375 | 375 | { |
| 376 | 376 | \Aimeos\MShop::create( $this->context(), 'catalog' )->delete( $map ); |
| 377 | 377 | break; |
@@ -362,10 +362,18 @@ |
||
| 362 | 362 | private ?\Closure $headerFcn = null; |
| 363 | 363 | private ?\Closure $footerFcn = null; |
| 364 | 364 | |
| 365 | - public function Footer() { return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; } |
|
| 366 | - public function Header() { return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; } |
|
| 367 | - public function setFooterFunction( \Closure $fcn ) { $this->footerFcn = $fcn; } |
|
| 368 | - public function setHeaderFunction( \Closure $fcn ) { $this->headerFcn = $fcn; } |
|
| 365 | + public function Footer() |
|
| 366 | + { |
|
| 367 | +return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; } |
|
| 368 | + public function Header() |
|
| 369 | + { |
|
| 370 | +return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; } |
|
| 371 | + public function setFooterFunction( \Closure $fcn ) |
|
| 372 | + { |
|
| 373 | +$this->footerFcn = $fcn; } |
|
| 374 | + public function setHeaderFunction( \Closure $fcn ) |
|
| 375 | + { |
|
| 376 | +$this->headerFcn = $fcn; } |
|
| 369 | 377 | }; |
| 370 | 378 | $pdf->setCreator( PDF_CREATOR ); |
| 371 | 379 | $pdf->setAuthor( 'Aimeos' ); |
@@ -362,10 +362,18 @@ |
||
| 362 | 362 | private ?\Closure $headerFcn = null; |
| 363 | 363 | private ?\Closure $footerFcn = null; |
| 364 | 364 | |
| 365 | - public function Footer() { return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; } |
|
| 366 | - public function Header() { return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; } |
|
| 367 | - public function setFooterFunction( \Closure $fcn ) { $this->footerFcn = $fcn; } |
|
| 368 | - public function setHeaderFunction( \Closure $fcn ) { $this->headerFcn = $fcn; } |
|
| 365 | + public function Footer() |
|
| 366 | + { |
|
| 367 | +return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; } |
|
| 368 | + public function Header() |
|
| 369 | + { |
|
| 370 | +return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; } |
|
| 371 | + public function setFooterFunction( \Closure $fcn ) |
|
| 372 | + { |
|
| 373 | +$this->footerFcn = $fcn; } |
|
| 374 | + public function setHeaderFunction( \Closure $fcn ) |
|
| 375 | + { |
|
| 376 | +$this->headerFcn = $fcn; } |
|
| 369 | 377 | }; |
| 370 | 378 | $pdf->setCreator( PDF_CREATOR ); |
| 371 | 379 | $pdf->setAuthor( 'Aimeos' ); |
@@ -78,8 +78,7 @@ discard block |
||
| 78 | 78 | foreach( $manager->search( $search ) as $item ) { |
| 79 | 79 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 80 | 80 | } |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->listTypes = array_combine( $this->listTypes, $this->listTypes ); |
| 85 | 84 | } |
@@ -141,8 +140,7 @@ discard block |
||
| 141 | 140 | $listItem = $listMap[$content][$language][$type][$listtype]; |
| 142 | 141 | $refItem = $listItem->getRefItem(); |
| 143 | 142 | unset( $listItems[$listItem->getId()] ); |
| 144 | - } |
|
| 145 | - else |
|
| 143 | + } else |
|
| 146 | 144 | { |
| 147 | 145 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 148 | 146 | $refItem = $refManager->create()->setType( $type ); |
@@ -78,8 +78,7 @@ |
||
| 78 | 78 | foreach( $manager->search( $search ) as $item ) { |
| 79 | 79 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 80 | 80 | } |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->listTypes = array_combine( $this->listTypes, $this->listTypes ); |
| 85 | 84 | } |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->search( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_combine( $this->listTypes, $this->listTypes ); |
| 88 | 87 | } |
@@ -151,8 +150,7 @@ discard block |
||
| 151 | 150 | $listItem = $listMap[$url][$type][$langId][$listtype]; |
| 152 | 151 | $refItem = $listItem->getRefItem(); |
| 153 | 152 | unset( $listItems[$listItem->getId()] ); |
| 154 | - } |
|
| 155 | - else |
|
| 153 | + } else |
|
| 156 | 154 | { |
| 157 | 155 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 158 | 156 | $refItem = $refManager->create()->setType( $type ); |
@@ -78,8 +78,7 @@ discard block |
||
| 78 | 78 | foreach( $manager->search( $search ) as $item ) { |
| 79 | 79 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 80 | 80 | } |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->listTypes = array_combine( $this->listTypes, $this->listTypes ); |
| 85 | 84 | } |
@@ -137,8 +136,7 @@ discard block |
||
| 137 | 136 | $listItem = $listMap[$content][$type][$listtype]; |
| 138 | 137 | $refItem = $listItem->getRefItem(); |
| 139 | 138 | unset( $listItems[$listItem->getId()] ); |
| 140 | - } |
|
| 141 | - else |
|
| 139 | + } else |
|
| 142 | 140 | { |
| 143 | 141 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 144 | 142 | $refItem = $refManager->create()->setType( $type ); |
@@ -78,8 +78,7 @@ discard block |
||
| 78 | 78 | foreach( $manager->search( $search ) as $item ) { |
| 79 | 79 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 80 | 80 | } |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->listTypes = array_combine( $this->listTypes, $this->listTypes ); |
| 85 | 84 | } |
@@ -157,8 +156,7 @@ discard block |
||
| 157 | 156 | $listItem = $listMap[$url][$type][$listtype]; |
| 158 | 157 | $refItem = $listItem->getRefItem(); |
| 159 | 158 | unset( $listItems[$listItem->getId()] ); |
| 160 | - } |
|
| 161 | - else |
|
| 159 | + } else |
|
| 162 | 160 | { |
| 163 | 161 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 164 | 162 | $refItem = $refManager->create()->setType( $type ); |