@@ -88,14 +88,12 @@ discard block |
||
88 | 88 | $view->tabindex = ++$idx + 1; |
89 | 89 | $view->itemBody .= $client->copy(); |
90 | 90 | } |
91 | - } |
|
92 | - catch( \Aimeos\MShop\Exception $e ) |
|
91 | + } catch( \Aimeos\MShop\Exception $e ) |
|
93 | 92 | { |
94 | 93 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
95 | 94 | $view->errors = $view->get( 'errors', [] ) + $error; |
96 | 95 | $this->logException( $e ); |
97 | - } |
|
98 | - catch( \Exception $e ) |
|
96 | + } catch( \Exception $e ) |
|
99 | 97 | { |
100 | 98 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
101 | 99 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -137,14 +135,12 @@ discard block |
||
137 | 135 | $view->tabindex = ++$idx + 1; |
138 | 136 | $view->itemBody .= $client->create(); |
139 | 137 | } |
140 | - } |
|
141 | - catch( \Aimeos\MShop\Exception $e ) |
|
138 | + } catch( \Aimeos\MShop\Exception $e ) |
|
142 | 139 | { |
143 | 140 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
144 | 141 | $view->errors = $view->get( 'errors', [] ) + $error; |
145 | 142 | $this->logException( $e ); |
146 | - } |
|
147 | - catch( \Exception $e ) |
|
143 | + } catch( \Exception $e ) |
|
148 | 144 | { |
149 | 145 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
150 | 146 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -185,14 +181,12 @@ discard block |
||
185 | 181 | |
186 | 182 | $this->nextAction( $view, 'search', 'group', null, 'delete' ); |
187 | 183 | return; |
188 | - } |
|
189 | - catch( \Aimeos\MShop\Exception $e ) |
|
184 | + } catch( \Aimeos\MShop\Exception $e ) |
|
190 | 185 | { |
191 | 186 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
192 | 187 | $view->errors = $view->get( 'errors', [] ) + $error; |
193 | 188 | $this->logException( $e ); |
194 | - } |
|
195 | - catch( \Exception $e ) |
|
189 | + } catch( \Exception $e ) |
|
196 | 190 | { |
197 | 191 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
198 | 192 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -233,14 +227,12 @@ discard block |
||
233 | 227 | $view->tabindex = ++$idx + 1; |
234 | 228 | $view->itemBody .= $client->get(); |
235 | 229 | } |
236 | - } |
|
237 | - catch( \Aimeos\MShop\Exception $e ) |
|
230 | + } catch( \Aimeos\MShop\Exception $e ) |
|
238 | 231 | { |
239 | 232 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
240 | 233 | $view->errors = $view->get( 'errors', [] ) + $error; |
241 | 234 | $this->logException( $e ); |
242 | - } |
|
243 | - catch( \Exception $e ) |
|
235 | + } catch( \Exception $e ) |
|
244 | 236 | { |
245 | 237 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
246 | 238 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -277,18 +269,15 @@ discard block |
||
277 | 269 | |
278 | 270 | $this->nextAction( $view, $view->param( 'next' ), 'group', $view->item->getId(), 'save' ); |
279 | 271 | return; |
280 | - } |
|
281 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
272 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
282 | 273 | { |
283 | 274 | // fall through to create |
284 | - } |
|
285 | - catch( \Aimeos\MShop\Exception $e ) |
|
275 | + } catch( \Aimeos\MShop\Exception $e ) |
|
286 | 276 | { |
287 | 277 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
288 | 278 | $view->errors = $view->get( 'errors', [] ) + $error; |
289 | 279 | $this->logException( $e ); |
290 | - } |
|
291 | - catch( \Exception $e ) |
|
280 | + } catch( \Exception $e ) |
|
292 | 281 | { |
293 | 282 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
294 | 283 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -327,14 +316,12 @@ discard block |
||
327 | 316 | foreach( $this->getSubClients() as $client ) { |
328 | 317 | $view->itemBody .= $client->search(); |
329 | 318 | } |
330 | - } |
|
331 | - catch( \Aimeos\MShop\Exception $e ) |
|
319 | + } catch( \Aimeos\MShop\Exception $e ) |
|
332 | 320 | { |
333 | 321 | $error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
334 | 322 | $view->errors = $view->get( 'errors', [] ) + $error; |
335 | 323 | $this->logException( $e ); |
336 | - } |
|
337 | - catch( \Exception $e ) |
|
324 | + } catch( \Exception $e ) |
|
338 | 325 | { |
339 | 326 | $error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
340 | 327 | $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( 'attribute-item-text' => $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-text' => $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-text' => $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-text' => $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-text' => $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-text' => $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( 'catalog-item-text' => $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( 'catalog-item-text' => $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( 'supplier-item-text' => $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( 'supplier-item-text' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
173 | 171 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -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; |