@@ -263,9 +263,12 @@ discard block |
||
| 263 | 263 | { |
| 264 | 264 | foreach( $codes as $code ) |
| 265 | 265 | { |
| 266 | - try { |
|
| 266 | + try |
|
| 267 | + { |
|
| 267 | 268 | $newOrder->addCoupon( $code ); |
| 268 | - } catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) { |
|
| 269 | + } |
|
| 270 | + catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) |
|
| 271 | + { |
|
| 269 | 272 | $newOrder->deleteCoupon( $code ); |
| 270 | 273 | } |
| 271 | 274 | } |
@@ -381,7 +384,9 @@ discard block |
||
| 381 | 384 | $context->setUser( $customerItem ); |
| 382 | 385 | $context->setGroups( $customerItem->getGroups() ); |
| 383 | 386 | } |
| 384 | - catch( \Exception $e ) {} // Subscription without account |
|
| 387 | + catch( \Exception $e ) |
|
| 388 | + { |
|
| 389 | +} // Subscription without account |
|
| 385 | 390 | |
| 386 | 391 | return $context; |
| 387 | 392 | } |
@@ -567,9 +572,11 @@ discard block |
||
| 567 | 572 | } |
| 568 | 573 | catch( \Exception $e ) |
| 569 | 574 | { |
| 570 | - if( $e->getCode() < 1 ) // not a soft error |
|
| 575 | + if( $e->getCode() < 1 ) { |
|
| 576 | + // not a soft error |
|
| 571 | 577 | { |
| 572 | 578 | $item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT ); |
| 579 | + } |
|
| 573 | 580 | |
| 574 | 581 | if( $this->ends() ) { |
| 575 | 582 | $item->setDateEnd( date_create()->format( 'Y-m-d H:i:s' ) ); |
@@ -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 | } |
@@ -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 @@ |
||
| 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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -65,8 +65,7 @@ |
||
| 65 | 65 | { |
| 66 | 66 | $item = $propMap[$value][$type]; |
| 67 | 67 | $items->remove( $item->getId() ); |
| 68 | - } |
|
| 69 | - else |
|
| 68 | + } else |
|
| 70 | 69 | { |
| 71 | 70 | $item = $manager->create()->setType( $type ); |
| 72 | 71 | } |