| @@ -121,10 +121,11 @@ discard block | ||
| 121 | 121 |  		{ | 
| 122 | 122 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' ); | 
| 123 | 123 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); | 
| 124 | - } | |
| 125 | - else if( ( $result = reset( $productItems ) ) !== false ) // count == 1 | |
| 124 | +		} else if( ( $result = reset( $productItems ) ) !== false ) { | |
| 125 | + // count == 1 | |
| 126 | 126 |  		{ | 
| 127 | 127 | $productItem = $result; | 
| 128 | + } | |
| 128 | 129 | $orderBaseProductItem->setProductCode( $productItem->getCode() ); | 
| 129 | 130 | |
| 130 | 131 | $subprices = $productItem->getRefItems( 'price', 'default', 'default' ); | 
| @@ -150,10 +151,11 @@ discard block | ||
| 150 | 151 | |
| 151 | 152 | $attr[] = $orderAttributeItem; | 
| 152 | 153 | } | 
| 153 | - } | |
| 154 | - else if( $requireVariant != false ) // count == 0 | |
| 154 | +		} else if( $requireVariant != false ) { | |
| 155 | + // count == 0 | |
| 155 | 156 |  		{ | 
| 156 | 157 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' ); | 
| 158 | + } | |
| 157 | 159 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); | 
| 158 | 160 | } | 
| 159 | 161 | |
| @@ -208,7 +208,7 @@ | ||
| 208 | 208 | * @category User | 
| 209 | 209 | * @category Developer | 
| 210 | 210 | * @see controller/frontend/catalog/levels-only | 
| 211 | - */ | |
| 211 | + */ | |
| 212 | 212 |  		if( ( $levels = $config->get( 'controller/frontend/catalog/levels-always' ) ) != null ) { | 
| 213 | 213 | $expr[] = $this->filter->compare( '<=', 'catalog.level', $levels ); | 
| 214 | 214 | } | 
| @@ -305,7 +305,9 @@ | ||
| 305 | 305 | $this->addService( $type, $item->getServiceId(), $attributes ); | 
| 306 | 306 | $basket->deleteService( $type ); | 
| 307 | 307 | } | 
| 308 | -				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically | |
| 308 | + catch( \Exception $e ) | |
| 309 | +				{ | |
| 310 | +; } // Don't notify the user as appropriate services can be added automatically | |
| 309 | 311 | } | 
| 310 | 312 | } | 
| 311 | 313 | |
| @@ -365,16 +365,13 @@ | ||
| 365 | 365 | if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface ) | 
| 366 | 366 |  		{ | 
| 367 | 367 | $this->get()->addAddress( $address->copyFrom( $value ), $type, 0 ); | 
| 368 | - } | |
| 369 | - else if( is_array( $value ) ) | |
| 368 | + } else if( is_array( $value ) ) | |
| 370 | 369 |  		{ | 
| 371 | 370 | $this->get()->addAddress( $this->setAddressFromArray( $address, $value ), $type, 0 ); | 
| 372 | - } | |
| 373 | - else if( $value === null ) | |
| 371 | + } else if( $value === null ) | |
| 374 | 372 |  		{ | 
| 375 | 373 | $this->get()->deleteAddress( $type ); | 
| 376 | - } | |
| 377 | - else | |
| 374 | + } else | |
| 378 | 375 |  		{ | 
| 379 | 376 | $msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' ); | 
| 380 | 377 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) ); |