@@ -77,25 +77,21 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $this->controller->deleteAddressItem( $entry->id ); |
| 79 | 79 | } |
| 80 | - } |
|
| 81 | - else |
|
| 80 | + } else |
|
| 82 | 81 | { |
| 83 | 82 | $this->controller->deleteAddressItem( $relId ); |
| 84 | 83 | } |
| 85 | 84 | |
| 86 | 85 | $status = 200; |
| 87 | - } |
|
| 88 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 86 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 89 | 87 | { |
| 90 | 88 | $status = 403; |
| 91 | 89 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 92 | - } |
|
| 93 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 90 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 94 | 91 | { |
| 95 | 92 | $status = 404; |
| 96 | 93 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 97 | - } |
|
| 98 | - catch( \Exception $e ) |
|
| 94 | + } catch( \Exception $e ) |
|
| 99 | 95 | { |
| 100 | 96 | $status = 500; |
| 101 | 97 | $view->errors = $this->getErrorDetails( $e ); |
@@ -125,26 +121,22 @@ discard block |
||
| 125 | 121 | { |
| 126 | 122 | $view->items = $cntl->getItem( $view->param( 'id' ), ['customer/address'] )->getAddressItems(); |
| 127 | 123 | $view->total = count( $view->items ); |
| 128 | - } |
|
| 129 | - else |
|
| 124 | + } else |
|
| 130 | 125 | { |
| 131 | 126 | $view->items = $cntl->getAddressItem( $relId ); |
| 132 | 127 | $view->total = 1; |
| 133 | 128 | } |
| 134 | 129 | |
| 135 | 130 | $status = 200; |
| 136 | - } |
|
| 137 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 131 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 138 | 132 | { |
| 139 | 133 | $status = 403; |
| 140 | 134 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 141 | - } |
|
| 142 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 135 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 143 | 136 | { |
| 144 | 137 | $status = 404; |
| 145 | 138 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 146 | - } |
|
| 147 | - catch( \Exception $e ) |
|
| 139 | + } catch( \Exception $e ) |
|
| 148 | 140 | { |
| 149 | 141 | $status = 500; |
| 150 | 142 | $view->errors = $this->getErrorDetails( $e ); |
@@ -178,18 +170,15 @@ discard block |
||
| 178 | 170 | $view->items = $cntl->editAddressItem( $view->param( 'relatedid' ), (array) $payload->data->attributes ); |
| 179 | 171 | $view->total = 1; |
| 180 | 172 | $status = 200; |
| 181 | - } |
|
| 182 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 173 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 183 | 174 | { |
| 184 | 175 | $status = 403; |
| 185 | 176 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 186 | - } |
|
| 187 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 177 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 188 | 178 | { |
| 189 | 179 | $status = 404; |
| 190 | 180 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 191 | - } |
|
| 192 | - catch( \Exception $e ) |
|
| 181 | + } catch( \Exception $e ) |
|
| 193 | 182 | { |
| 194 | 183 | $status = 500; |
| 195 | 184 | $view->errors = $this->getErrorDetails( $e ); |
@@ -236,18 +225,15 @@ discard block |
||
| 236 | 225 | $view->total = count( $list ); |
| 237 | 226 | $view->items = $list; |
| 238 | 227 | $status = 201; |
| 239 | - } |
|
| 240 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 228 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 241 | 229 | { |
| 242 | 230 | $status = 403; |
| 243 | 231 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 244 | - } |
|
| 245 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 232 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 246 | 233 | { |
| 247 | 234 | $status = 404; |
| 248 | 235 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 249 | - } |
|
| 250 | - catch( \Exception $e ) |
|
| 236 | + } catch( \Exception $e ) |
|
| 251 | 237 | { |
| 252 | 238 | $status = 500; |
| 253 | 239 | $view->errors = $this->getErrorDetails( $e ); |
@@ -99,8 +99,7 @@ |
||
| 99 | 99 | $decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', [] ); |
| 100 | 100 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
| 101 | 101 | } |
| 102 | - } |
|
| 103 | - else |
|
| 102 | + } else |
|
| 104 | 103 | { |
| 105 | 104 | $classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\'; |
| 106 | 105 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
@@ -101,8 +101,7 @@ |
||
| 101 | 101 | foreach( $items as $item ) { |
| 102 | 102 | $data[] = $entryFcn( $item ); |
| 103 | 103 | } |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | { |
| 107 | 106 | $data = $entryFcn( $items ); |
| 108 | 107 | } |
@@ -44,13 +44,11 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $status = 200; |
| 47 | - } |
|
| 48 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | 48 | { |
| 50 | 49 | $status = 404; |
| 51 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 52 | - } |
|
| 53 | - catch( \Exception $e ) |
|
| 51 | + } catch( \Exception $e ) |
|
| 54 | 52 | { |
| 55 | 53 | $status = 500; |
| 56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -295,8 +295,7 @@ |
||
| 295 | 295 | $data[] = $entryFcn( $item ); |
| 296 | 296 | $included = array_merge( $included, $flatFcn( $inclFcn( $item, [] ) ) ); |
| 297 | 297 | } |
| 298 | - } |
|
| 299 | - else |
|
| 298 | + } else |
|
| 300 | 299 | { |
| 301 | 300 | $data = $entryFcn( $items ); |
| 302 | 301 | $included = $flatFcn( $inclFcn( $items, [] ) ); |
@@ -211,8 +211,7 @@ |
||
| 211 | 211 | $data[] = $entryFcn( $item, $prices, $feConfig ); |
| 212 | 212 | $included = array_merge( $included, $flatFcn( $inclFcn( $item ) ) ); |
| 213 | 213 | } |
| 214 | - } |
|
| 215 | - else |
|
| 214 | + } else |
|
| 216 | 215 | { |
| 217 | 216 | $data = $entryFcn( $this->items, $prices, $feConfig ); |
| 218 | 217 | $included = $flatFcn( $inclFcn( $this->items ) ); |
@@ -222,8 +222,7 @@ |
||
| 222 | 222 | $data[] = $entryFcn( $attrItem ); |
| 223 | 223 | $included = array_merge( $included, $flatFcn( $inclFcn( $attrItem ) ) ); |
| 224 | 224 | } |
| 225 | - } |
|
| 226 | - else |
|
| 225 | + } else |
|
| 227 | 226 | { |
| 228 | 227 | $data = $entryFcn( $items ); |
| 229 | 228 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -285,8 +285,7 @@ |
||
| 285 | 285 | $data[] = $entryFcn( $item ); |
| 286 | 286 | $included = array_merge( $included, $flatFcn( $inclFcn( $item ) ) ); |
| 287 | 287 | } |
| 288 | - } |
|
| 289 | - else |
|
| 288 | + } else |
|
| 290 | 289 | { |
| 291 | 290 | $data = $entryFcn( $items ); |
| 292 | 291 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -46,13 +46,11 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $status = 200; |
| 49 | - } |
|
| 50 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 51 | 50 | { |
| 52 | 51 | $status = 404; |
| 53 | 52 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 54 | - } |
|
| 55 | - catch( \Exception $e ) |
|
| 53 | + } catch( \Exception $e ) |
|
| 56 | 54 | { |
| 57 | 55 | $status = 500; |
| 58 | 56 | $view->errors = $this->getErrorDetails( $e ); |
@@ -81,8 +79,7 @@ discard block |
||
| 81 | 79 | */ |
| 82 | 80 | $tplconf = 'client/jsonapi/product/standard/template-aggregate'; |
| 83 | 81 | $default = 'aggregate-standard'; |
| 84 | - } |
|
| 85 | - else |
|
| 82 | + } else |
|
| 86 | 83 | { |
| 87 | 84 | /** client/jsonapi/product/standard/template |
| 88 | 85 | * Relative path to the product JSON API template |