@@ -160,8 +160,7 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | $this->setAddress( $type, $item->toArray() ); |
| 162 | 162 | $basket->deleteAddress( $type ); |
| 163 | - } |
|
| 164 | - catch( \Exception $e ) |
|
| 163 | + } catch( \Exception $e ) |
|
| 165 | 164 | { |
| 166 | 165 | $logger = $this->getContext()->getLogger(); |
| 167 | 166 | $str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s'; |
@@ -190,8 +189,7 @@ discard block |
||
| 190 | 189 | { |
| 191 | 190 | $this->addCoupon( $code ); |
| 192 | 191 | $basket->deleteCoupon( $code, true ); |
| 193 | - } |
|
| 194 | - catch( \Exception $e ) |
|
| 192 | + } catch( \Exception $e ) |
|
| 195 | 193 | { |
| 196 | 194 | $logger = $this->getContext()->getLogger(); |
| 197 | 195 | $str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s'; |
@@ -240,8 +238,7 @@ discard block |
||
| 240 | 238 | ); |
| 241 | 239 | |
| 242 | 240 | $basket->deleteProduct( $pos ); |
| 243 | - } |
|
| 244 | - catch( \Exception $e ) |
|
| 241 | + } catch( \Exception $e ) |
|
| 245 | 242 | { |
| 246 | 243 | $code = $product->getProductCode(); |
| 247 | 244 | $logger = $this->getContext()->getLogger(); |
@@ -276,8 +273,7 @@ discard block |
||
| 276 | 273 | |
| 277 | 274 | $this->setService( $type, $item->getServiceId(), $attributes ); |
| 278 | 275 | $basket->deleteService( $type ); |
| 279 | - } |
|
| 280 | - catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 276 | + } catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 281 | 277 | } |
| 282 | 278 | |
| 283 | 279 | return $errors; |
@@ -104,10 +104,11 @@ discard block |
||
| 104 | 104 | { |
| 105 | 105 | $msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() ); |
| 106 | 106 | throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
| 107 | - } |
|
| 108 | - else if( ( $result = reset( $productItems ) ) !== false ) // count == 1 |
|
| 107 | + } else if( ( $result = reset( $productItems ) ) !== false ) { |
|
| 108 | + // count == 1 |
|
| 109 | 109 | { |
| 110 | 110 | $productItem = $result; |
| 111 | + } |
|
| 111 | 112 | $orderBaseProductItem->setProductCode( $productItem->getCode() ); |
| 112 | 113 | |
| 113 | 114 | $subprices = $productItem->getRefItems( 'price', 'default', 'default' ); |
@@ -133,10 +134,11 @@ discard block |
||
| 133 | 134 | |
| 134 | 135 | $attr[] = $orderAttributeItem; |
| 135 | 136 | } |
| 136 | - } |
|
| 137 | - else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0 |
|
| 137 | + } else if( !isset( $options['variant'] ) || $options['variant'] != false ) { |
|
| 138 | + // count == 0 |
|
| 138 | 139 | { |
| 139 | 140 | $msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() ); |
| 141 | + } |
|
| 140 | 142 | throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
| 141 | 143 | } |
| 142 | 144 | |
@@ -268,6 +268,7 @@ discard block |
||
| 268 | 268 | * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions |
| 269 | 269 | * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too |
| 270 | 270 | * @param integer &$total Parameter where the total number of found products will be stored in |
| 271 | + * @param integer $total |
|
| 271 | 272 | * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface |
| 272 | 273 | * @since 2017.03 |
| 273 | 274 | */ |
@@ -293,7 +294,7 @@ discard block |
||
| 293 | 294 | * Returns the list of catalog IDs for the given catalog tree |
| 294 | 295 | * |
| 295 | 296 | * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children |
| 296 | - * @return array List of catalog IDs |
|
| 297 | + * @return integer[] List of catalog IDs |
|
| 297 | 298 | */ |
| 298 | 299 | protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item ) |
| 299 | 300 | { |
@@ -278,7 +278,7 @@ |
||
| 278 | 278 | /** |
| 279 | 279 | * Returns the frontend controller |
| 280 | 280 | * |
| 281 | - * @return \Aimeos\Controller\Frontend\Catalog\Iface Frontend controller object |
|
| 281 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 282 | 282 | */ |
| 283 | 283 | protected function getController() |
| 284 | 284 | { |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | /** |
| 153 | 153 | * Returns the frontend controller |
| 154 | 154 | * |
| 155 | - * @return \Aimeos\Controller\Frontend\Order\Iface Frontend controller object |
|
| 155 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 156 | 156 | */ |
| 157 | 157 | protected function getController() |
| 158 | 158 | { |
@@ -191,7 +191,7 @@ |
||
| 191 | 191 | /** |
| 192 | 192 | * Returns the frontend controller |
| 193 | 193 | * |
| 194 | - * @return \Aimeos\Controller\Frontend\Product\Iface Frontend controller object |
|
| 194 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 195 | 195 | */ |
| 196 | 196 | protected function getController() |
| 197 | 197 | { |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | /** |
| 129 | 129 | * Returns the frontend controller |
| 130 | 130 | * |
| 131 | - * @return \Aimeos\Controller\Frontend\Service\Iface Frontend controller object |
|
| 131 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 132 | 132 | */ |
| 133 | 133 | protected function getController() |
| 134 | 134 | { |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | /** |
| 129 | 129 | * Returns the frontend controller |
| 130 | 130 | * |
| 131 | - * @return \Aimeos\Controller\Frontend\Attribute\Iface Frontend controller object |
|
| 131 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 132 | 132 | */ |
| 133 | 133 | protected function getController() |
| 134 | 134 | { |
@@ -140,7 +140,7 @@ |
||
| 140 | 140 | /** |
| 141 | 141 | * Returns the frontend controller |
| 142 | 142 | * |
| 143 | - * @return \Aimeos\Controller\Frontend\Stock\Iface Frontend controller object |
|
| 143 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 144 | 144 | */ |
| 145 | 145 | protected function getController() |
| 146 | 146 | { |