@@ -233,8 +233,7 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | $this->setAddress( $type, $item->toArray() ); |
| 235 | 235 | $basket->deleteAddress( $type ); |
| 236 | - } |
|
| 237 | - catch( \Exception $e ) |
|
| 236 | + } catch( \Exception $e ) |
|
| 238 | 237 | { |
| 239 | 238 | $logger = $this->getContext()->getLogger(); |
| 240 | 239 | $errors['address'][$type] = $e->getMessage(); |
@@ -264,8 +263,7 @@ discard block |
||
| 264 | 263 | { |
| 265 | 264 | $this->addCoupon( $code ); |
| 266 | 265 | $basket->deleteCoupon( $code, true ); |
| 267 | - } |
|
| 268 | - catch( \Exception $e ) |
|
| 266 | + } catch( \Exception $e ) |
|
| 269 | 267 | { |
| 270 | 268 | $logger = $this->getContext()->getLogger(); |
| 271 | 269 | $errors['coupon'][$code] = $e->getMessage(); |
@@ -314,8 +312,7 @@ discard block |
||
| 314 | 312 | ); |
| 315 | 313 | |
| 316 | 314 | $basket->deleteProduct( $pos ); |
| 317 | - } |
|
| 318 | - catch( \Exception $e ) |
|
| 315 | + } catch( \Exception $e ) |
|
| 319 | 316 | { |
| 320 | 317 | $code = $product->getProductCode(); |
| 321 | 318 | $logger = $this->getContext()->getLogger(); |
@@ -353,8 +350,7 @@ discard block |
||
| 353 | 350 | |
| 354 | 351 | $this->addService( $type, $item->getServiceId(), $attributes ); |
| 355 | 352 | $basket->deleteService( $type ); |
| 356 | - } |
|
| 357 | - catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 353 | + } catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 358 | 354 | } |
| 359 | 355 | } |
| 360 | 356 | |
@@ -47,8 +47,7 @@ |
||
| 47 | 47 | try |
| 48 | 48 | { |
| 49 | 49 | $item = $manager->findItem( $list['customer.code'], [], true ); |
| 50 | - } |
|
| 51 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 50 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 52 | 51 | { |
| 53 | 52 | $this->checkLimit( $list ); |
| 54 | 53 | |
@@ -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 | |
@@ -410,16 +410,13 @@ |
||
| 410 | 410 | if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface ) |
| 411 | 411 | { |
| 412 | 412 | $this->get()->setAddress( $address->copyFrom( $value ), $type ); |
| 413 | - } |
|
| 414 | - else if( is_array( $value ) ) |
|
| 413 | + } else if( is_array( $value ) ) |
|
| 415 | 414 | { |
| 416 | 415 | $this->get()->setAddress( $this->setAddressFromArray( $address, $value ), $type ); |
| 417 | - } |
|
| 418 | - else if( $value === null ) |
|
| 416 | + } else if( $value === null ) |
|
| 419 | 417 | { |
| 420 | 418 | $this->get()->deleteAddress( $type ); |
| 421 | - } |
|
| 422 | - else |
|
| 419 | + } else |
|
| 423 | 420 | { |
| 424 | 421 | $msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' ); |
| 425 | 422 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) ); |