@@ -63,7 +63,7 @@ |
||
| 63 | 63 | |
| 64 | 64 | $this->object->run(); |
| 65 | 65 | |
| 66 | - $expected = dirname( __DIR__, 4) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log'; |
|
| 66 | + $expected = dirname( __DIR__, 4 ) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log'; |
|
| 67 | 67 | $this->assertFileExists( $expected ); |
| 68 | 68 | |
| 69 | 69 | unlink( $expected ); |
@@ -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' ) ); |