@@ -151,14 +151,12 @@ |
||
| 151 | 151 | |
| 152 | 152 | $manager->commit(); |
| 153 | 153 | return; |
| 154 | - } |
|
| 155 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 154 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 156 | 155 | { |
| 157 | 156 | $error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 158 | 157 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 159 | 158 | $manager->rollback(); |
| 160 | - } |
|
| 161 | - catch( \Exception $e ) |
|
| 159 | + } catch( \Exception $e ) |
|
| 162 | 160 | { |
| 163 | 161 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 164 | 162 | $error = array( 'product-item-category' => $e->getMessage() ); |
@@ -151,14 +151,12 @@ |
||
| 151 | 151 | |
| 152 | 152 | $manager->commit(); |
| 153 | 153 | return; |
| 154 | - } |
|
| 155 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 154 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 156 | 155 | { |
| 157 | 156 | $error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 158 | 157 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 159 | 158 | $manager->rollback(); |
| 160 | - } |
|
| 161 | - catch( \Exception $e ) |
|
| 159 | + } catch( \Exception $e ) |
|
| 162 | 160 | { |
| 163 | 161 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 164 | 162 | $error = array( 'product-item-category' => $e->getMessage() ); |
@@ -155,16 +155,14 @@ discard block |
||
| 155 | 155 | $textManager->commit(); |
| 156 | 156 | $manager->commit(); |
| 157 | 157 | return; |
| 158 | - } |
|
| 159 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 158 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 160 | 159 | { |
| 161 | 160 | $error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 162 | 161 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 163 | 162 | |
| 164 | 163 | $textManager->rollback(); |
| 165 | 164 | $manager->rollback(); |
| 166 | - } |
|
| 167 | - catch( \Exception $e ) |
|
| 165 | + } catch( \Exception $e ) |
|
| 168 | 166 | { |
| 169 | 167 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 170 | 168 | $error = array( 'product-item-price' => $e->getMessage() ); |
@@ -365,8 +363,7 @@ discard block |
||
| 365 | 363 | |
| 366 | 364 | $item = $priceItem; |
| 367 | 365 | $item->setId( null ); |
| 368 | - } |
|
| 369 | - else |
|
| 366 | + } else |
|
| 370 | 367 | { |
| 371 | 368 | $litem = $listItems[$listid]; |
| 372 | 369 | $item = $litem->getRefItem(); |
@@ -151,14 +151,12 @@ |
||
| 151 | 151 | |
| 152 | 152 | $manager->commit(); |
| 153 | 153 | return; |
| 154 | - } |
|
| 155 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 154 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 156 | 155 | { |
| 157 | 156 | $error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 158 | 157 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 159 | 158 | $manager->rollback(); |
| 160 | - } |
|
| 161 | - catch( \Exception $e ) |
|
| 159 | + } catch( \Exception $e ) |
|
| 162 | 160 | { |
| 163 | 161 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 164 | 162 | $error = array( 'product-item-category' => $e->getMessage() ); |
@@ -151,14 +151,12 @@ |
||
| 151 | 151 | |
| 152 | 152 | $manager->commit(); |
| 153 | 153 | return; |
| 154 | - } |
|
| 155 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 154 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 156 | 155 | { |
| 157 | 156 | $error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 158 | 157 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 159 | 158 | $manager->rollback(); |
| 160 | - } |
|
| 161 | - catch( \Exception $e ) |
|
| 159 | + } catch( \Exception $e ) |
|
| 162 | 160 | { |
| 163 | 161 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 164 | 162 | $error = array( 'product-item-category' => $e->getMessage() ); |
@@ -196,16 +196,14 @@ discard block |
||
| 196 | 196 | $attrManager->commit(); |
| 197 | 197 | $manager->commit(); |
| 198 | 198 | return; |
| 199 | - } |
|
| 200 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 199 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 201 | 200 | { |
| 202 | 201 | $error = array( 'product-item-download' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 203 | 202 | $view->errors = $view->get( 'errors', array() ) + $error; |
| 204 | 203 | |
| 205 | 204 | $attrManager->rollback(); |
| 206 | 205 | $manager->rollback(); |
| 207 | - } |
|
| 208 | - catch( \Exception $e ) |
|
| 206 | + } catch( \Exception $e ) |
|
| 209 | 207 | { |
| 210 | 208 | $context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() ); |
| 211 | 209 | $error = array( 'product-item-download' => $e->getMessage() ); |
@@ -482,8 +480,7 @@ discard block |
||
| 482 | 480 | |
| 483 | 481 | $data['time'] = $fs->time( $data['path'] ); |
| 484 | 482 | $data['size'] = $fs->size( $data['path'] ); |
| 485 | - } |
|
| 486 | - catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
| 483 | + } catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
| 487 | 484 | } |
| 488 | 485 | |
| 489 | 486 | $view->downloadData = $data; |