@@ -90,20 +90,17 @@ discard block |
||
| 90 | 90 | $view->tabindex = ++$idx + 1; |
| 91 | 91 | $view->itemBody .= $client->copy(); |
| 92 | 92 | } |
| 93 | - } |
|
| 94 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 93 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 95 | 94 | { |
| 96 | 95 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'admin', $e->getMessage() ) ); |
| 97 | 96 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 98 | 97 | $this->logException( $e ); |
| 99 | - } |
|
| 100 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 98 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 101 | 99 | { |
| 102 | 100 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 103 | 101 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 104 | 102 | $this->logException( $e ); |
| 105 | - } |
|
| 106 | - catch( \Exception $e ) |
|
| 103 | + } catch( \Exception $e ) |
|
| 107 | 104 | { |
| 108 | 105 | $error = array( 'locale-site-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 109 | 106 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -145,20 +142,17 @@ discard block |
||
| 145 | 142 | $view->tabindex = ++$idx + 1; |
| 146 | 143 | $view->itemBody .= $client->create(); |
| 147 | 144 | } |
| 148 | - } |
|
| 149 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 145 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 150 | 146 | { |
| 151 | 147 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'admin', $e->getMessage() ) ); |
| 152 | 148 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 153 | 149 | $this->logException( $e ); |
| 154 | - } |
|
| 155 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 150 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 156 | 151 | { |
| 157 | 152 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 158 | 153 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 159 | 154 | $this->logException( $e ); |
| 160 | - } |
|
| 161 | - catch( \Exception $e ) |
|
| 155 | + } catch( \Exception $e ) |
|
| 162 | 156 | { |
| 163 | 157 | $error = array( 'locale-site-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 164 | 158 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -201,20 +195,17 @@ discard block |
||
| 201 | 195 | |
| 202 | 196 | $this->nextAction( $view, 'search', 'locale/site', null, 'delete' ); |
| 203 | 197 | return; |
| 204 | - } |
|
| 205 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 198 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 206 | 199 | { |
| 207 | 200 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'admin', $e->getMessage() ) ); |
| 208 | 201 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 209 | 202 | $this->logException( $e ); |
| 210 | - } |
|
| 211 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 203 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 212 | 204 | { |
| 213 | 205 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 214 | 206 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 215 | 207 | $this->logException( $e ); |
| 216 | - } |
|
| 217 | - catch( \Exception $e ) |
|
| 208 | + } catch( \Exception $e ) |
|
| 218 | 209 | { |
| 219 | 210 | $error = array( 'locale-site-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 220 | 211 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -257,20 +248,17 @@ discard block |
||
| 257 | 248 | $view->tabindex = ++$idx + 1; |
| 258 | 249 | $view->itemBody .= $client->get(); |
| 259 | 250 | } |
| 260 | - } |
|
| 261 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 251 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 262 | 252 | { |
| 263 | 253 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'admin', $e->getMessage() ) ); |
| 264 | 254 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 265 | 255 | $this->logException( $e ); |
| 266 | - } |
|
| 267 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 256 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 268 | 257 | { |
| 269 | 258 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 270 | 259 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 271 | 260 | $this->logException( $e ); |
| 272 | - } |
|
| 273 | - catch( \Exception $e ) |
|
| 261 | + } catch( \Exception $e ) |
|
| 274 | 262 | { |
| 275 | 263 | $error = array( 'locale-site-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 276 | 264 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -308,20 +296,17 @@ discard block |
||
| 308 | 296 | |
| 309 | 297 | $this->nextAction( $view, $view->param( 'next' ), 'locale/site', $view->item->getId(), 'save' ); |
| 310 | 298 | return; |
| 311 | - } |
|
| 312 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 299 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 313 | 300 | { |
| 314 | 301 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'admin', $e->getMessage() ) ); |
| 315 | 302 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 316 | 303 | $this->logException( $e ); |
| 317 | - } |
|
| 318 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 304 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 319 | 305 | { |
| 320 | 306 | $error = array( 'locale-site-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 321 | 307 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 322 | 308 | $this->logException( $e ); |
| 323 | - } |
|
| 324 | - catch( \Exception $e ) |
|
| 309 | + } catch( \Exception $e ) |
|
| 325 | 310 | { |
| 326 | 311 | $error = array( 'locale-site-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 327 | 312 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -368,14 +353,12 @@ discard block |
||
| 368 | 353 | foreach( $this->getSubClients() as $client ) { |
| 369 | 354 | $view->itemBody .= $client->search(); |
| 370 | 355 | } |
| 371 | - } |
|
| 372 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 356 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 373 | 357 | { |
| 374 | 358 | $error = array( 'locale-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 375 | 359 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 376 | 360 | $this->logException( $e ); |
| 377 | - } |
|
| 378 | - catch( \Exception $e ) |
|
| 361 | + } catch( \Exception $e ) |
|
| 379 | 362 | { |
| 380 | 363 | $error = array( 'locale-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 381 | 364 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -563,8 +546,7 @@ discard block |
||
| 563 | 546 | { |
| 564 | 547 | $this->checkSite( $super, $data['locale.site.id'] ); |
| 565 | 548 | $item = $manager->getItem( $data['locale.site.id'] ); |
| 566 | - } |
|
| 567 | - else |
|
| 549 | + } else |
|
| 568 | 550 | { |
| 569 | 551 | $this->checkSite( $super ); |
| 570 | 552 | $item = $manager->createItem(); |
@@ -160,14 +160,12 @@ |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | return; |
| 163 | - } |
|
| 164 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 163 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 165 | 164 | { |
| 166 | 165 | $error = array( 'attribute-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 167 | 166 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 168 | 167 | $this->logException( $e ); |
| 169 | - } |
|
| 170 | - catch( \Exception $e ) |
|
| 168 | + } catch( \Exception $e ) |
|
| 171 | 169 | { |
| 172 | 170 | $error = array( 'attribute-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 173 | 171 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -160,14 +160,12 @@ |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | return; |
| 163 | - } |
|
| 164 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 163 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 165 | 164 | { |
| 166 | 165 | $error = array( 'service-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 167 | 166 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 168 | 167 | $this->logException( $e ); |
| 169 | - } |
|
| 170 | - catch( \Exception $e ) |
|
| 168 | + } catch( \Exception $e ) |
|
| 171 | 169 | { |
| 172 | 170 | $error = array( 'service-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 173 | 171 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -160,14 +160,12 @@ |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | return; |
| 163 | - } |
|
| 164 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 163 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 165 | 164 | { |
| 166 | 165 | $error = array( 'product-item-price' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 167 | 166 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 168 | 167 | $this->logException( $e ); |
| 169 | - } |
|
| 170 | - catch( \Exception $e ) |
|
| 168 | + } catch( \Exception $e ) |
|
| 171 | 169 | { |
| 172 | 170 | $error = array( 'product-item-price' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 173 | 171 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -51,14 +51,12 @@ discard block |
||
| 51 | 51 | $view->tabindex = ++$idx + 1; |
| 52 | 52 | $view->itemBody .= $client->copy(); |
| 53 | 53 | } |
| 54 | - } |
|
| 55 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 54 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 56 | 55 | { |
| 57 | 56 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 58 | 57 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 59 | 58 | $this->logException( $e ); |
| 60 | - } |
|
| 61 | - catch( \Exception $e ) |
|
| 59 | + } catch( \Exception $e ) |
|
| 62 | 60 | { |
| 63 | 61 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 64 | 62 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -100,14 +98,12 @@ discard block |
||
| 100 | 98 | $view->tabindex = ++$idx + 1; |
| 101 | 99 | $view->itemBody .= $client->create(); |
| 102 | 100 | } |
| 103 | - } |
|
| 104 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 101 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 105 | 102 | { |
| 106 | 103 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 107 | 104 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 108 | 105 | $this->logException( $e ); |
| 109 | - } |
|
| 110 | - catch( \Exception $e ) |
|
| 106 | + } catch( \Exception $e ) |
|
| 111 | 107 | { |
| 112 | 108 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 113 | 109 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -148,14 +144,12 @@ discard block |
||
| 148 | 144 | |
| 149 | 145 | $this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' ); |
| 150 | 146 | return; |
| 151 | - } |
|
| 152 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 147 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 153 | 148 | { |
| 154 | 149 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 155 | 150 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 156 | 151 | $this->logException( $e ); |
| 157 | - } |
|
| 158 | - catch( \Exception $e ) |
|
| 152 | + } catch( \Exception $e ) |
|
| 159 | 153 | { |
| 160 | 154 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 161 | 155 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -196,14 +190,12 @@ discard block |
||
| 196 | 190 | $view->tabindex = ++$idx + 1; |
| 197 | 191 | $view->itemBody .= $client->get(); |
| 198 | 192 | } |
| 199 | - } |
|
| 200 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 193 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 201 | 194 | { |
| 202 | 195 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 203 | 196 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 204 | 197 | $this->logException( $e ); |
| 205 | - } |
|
| 206 | - catch( \Exception $e ) |
|
| 198 | + } catch( \Exception $e ) |
|
| 207 | 199 | { |
| 208 | 200 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 209 | 201 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -241,18 +233,15 @@ discard block |
||
| 241 | 233 | |
| 242 | 234 | $this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' ); |
| 243 | 235 | return; |
| 244 | - } |
|
| 245 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 236 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
| 246 | 237 | { |
| 247 | 238 | // fall through to create |
| 248 | - } |
|
| 249 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 239 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 250 | 240 | { |
| 251 | 241 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 252 | 242 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 253 | 243 | $this->logException( $e ); |
| 254 | - } |
|
| 255 | - catch( \Exception $e ) |
|
| 244 | + } catch( \Exception $e ) |
|
| 256 | 245 | { |
| 257 | 246 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 258 | 247 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -291,14 +280,12 @@ discard block |
||
| 291 | 280 | foreach( $this->getSubClients() as $client ) { |
| 292 | 281 | $view->itemBody .= $client->search(); |
| 293 | 282 | } |
| 294 | - } |
|
| 295 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 283 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 296 | 284 | { |
| 297 | 285 | $error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 298 | 286 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 299 | 287 | $this->logException( $e ); |
| 300 | - } |
|
| 301 | - catch( \Exception $e ) |
|
| 288 | + } catch( \Exception $e ) |
|
| 302 | 289 | { |
| 303 | 290 | $error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 304 | 291 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -138,14 +138,12 @@ |
||
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | return; |
| 141 | - } |
|
| 142 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 141 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 143 | 142 | { |
| 144 | 143 | $error = array( 'attribute-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 145 | 144 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 146 | 145 | $this->logException( $e ); |
| 147 | - } |
|
| 148 | - catch( \Exception $e ) |
|
| 146 | + } catch( \Exception $e ) |
|
| 149 | 147 | { |
| 150 | 148 | $error = array( 'attribute-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 151 | 149 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -145,14 +145,12 @@ |
||
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | return; |
| 148 | - } |
|
| 149 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 148 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 150 | 149 | { |
| 151 | 150 | $error = array( 'service-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 152 | 151 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 153 | 152 | $this->logException( $e ); |
| 154 | - } |
|
| 155 | - catch( \Exception $e ) |
|
| 153 | + } catch( \Exception $e ) |
|
| 156 | 154 | { |
| 157 | 155 | $error = array( 'service-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 158 | 156 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -145,14 +145,12 @@ |
||
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | return; |
| 148 | - } |
|
| 149 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 148 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 150 | 149 | { |
| 151 | 150 | $error = array( 'product-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 152 | 151 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 153 | 152 | $this->logException( $e ); |
| 154 | - } |
|
| 155 | - catch( \Exception $e ) |
|
| 153 | + } catch( \Exception $e ) |
|
| 156 | 154 | { |
| 157 | 155 | $error = array( 'product-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 158 | 156 | $view->errors = $view->get( 'errors', [] ) + $error; |