@@ -283,17 +283,14 @@ discard block |
||
283 | 283 | { |
284 | 284 | $address->copyFrom( $value ); |
285 | 285 | $this->basket->setAddress( $address, $type ); |
286 | - } |
|
287 | - else if( is_array( $value ) ) |
|
286 | + } else if( is_array( $value ) ) |
|
288 | 287 | { |
289 | 288 | $this->setAddressFromArray( $address, $value ); |
290 | 289 | $this->basket->setAddress( $address, $type ); |
291 | - } |
|
292 | - else if( $value === null ) |
|
290 | + } else if( $value === null ) |
|
293 | 291 | { |
294 | 292 | $this->basket->deleteAddress( $type ); |
295 | - } |
|
296 | - else |
|
293 | + } else |
|
297 | 294 | { |
298 | 295 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) ); |
299 | 296 | } |
@@ -519,10 +516,11 @@ discard block |
||
519 | 516 | { |
520 | 517 | $msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() ); |
521 | 518 | throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
522 | - } |
|
523 | - else if( ( $result = reset( $productItems ) ) !== false ) // count == 1 |
|
519 | + } else if( ( $result = reset( $productItems ) ) !== false ) { |
|
520 | + // count == 1 |
|
524 | 521 | { |
525 | 522 | $productItem = $result; |
523 | + } |
|
526 | 524 | $orderBaseProductItem->setProductCode( $productItem->getCode() ); |
527 | 525 | |
528 | 526 | $subprices = $productItem->getRefItems( 'price', 'default', 'default' ); |
@@ -542,10 +540,11 @@ discard block |
||
542 | 540 | |
543 | 541 | $attr[] = $orderAttributeItem; |
544 | 542 | } |
545 | - } |
|
546 | - else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0 |
|
543 | + } else if( !isset( $options['variant'] ) || $options['variant'] != false ) { |
|
544 | + // count == 0 |
|
547 | 545 | { |
548 | 546 | $msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() ); |
547 | + } |
|
549 | 548 | throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
550 | 549 | } |
551 | 550 |