@@ -363,16 +363,13 @@ |
||
363 | 363 | if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface ) |
364 | 364 | { |
365 | 365 | $this->baskets[$this->type] = $this->get()->addAddress( $address->copyFrom( $value ), $type, 0 ); |
366 | - } |
|
367 | - else if( is_array( $value ) ) |
|
366 | + } else if( is_array( $value ) ) |
|
368 | 367 | { |
369 | 368 | $this->baskets[$this->type] = $this->get()->addAddress( $this->setAddressFromArray( $address, $value ), $type, 0 ); |
370 | - } |
|
371 | - else if( $value === null ) |
|
369 | + } else if( $value === null ) |
|
372 | 370 | { |
373 | 371 | $this->baskets[$this->type] = $this->get()->deleteAddress( $type ); |
374 | - } |
|
375 | - else |
|
372 | + } else |
|
376 | 373 | { |
377 | 374 | $msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' ); |
378 | 375 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) ); |
@@ -142,9 +142,11 @@ |
||
142 | 142 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
143 | 143 | } |
144 | 144 | |
145 | - if( empty( $items ) && $requireVariant != false ) // count == 0 |
|
145 | + if( empty( $items ) && $requireVariant != false ) { |
|
146 | + // count == 0 |
|
146 | 147 | { |
147 | 148 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' ); |
149 | + } |
|
148 | 150 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
149 | 151 | } |
150 | 152 |