@@ -37,7 +37,7 @@ |
||
37 | 37 | /** |
38 | 38 | * Returns the site view helper |
39 | 39 | * |
40 | - * @return Aimeos\MW\View\Helper\Site\Iface Site view helper |
|
40 | + * @return Standard Site view helper |
|
41 | 41 | */ |
42 | 42 | public function transform() |
43 | 43 | { |
@@ -498,7 +498,7 @@ |
||
498 | 498 | /** |
499 | 499 | * Constructs the data array for the view from the given item |
500 | 500 | * |
501 | - * @param \Aimeos\MShop\Locale\Item\Iface $item Locale item object |
|
501 | + * @param \Aimeos\MShop\Locale\Item\Site\Iface $item Locale item object |
|
502 | 502 | * @return string[] Multi-dimensional associative list of item data |
503 | 503 | */ |
504 | 504 | protected function toArray( \Aimeos\MShop\Locale\Item\Site\Iface $item, $copy = false ) |
@@ -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(); |
@@ -476,7 +476,7 @@ |
||
476 | 476 | /** |
477 | 477 | * Constructs the data array for the view from the given item |
478 | 478 | * |
479 | - * @param \Aimeos\MShop\Locale\Item\Iface $item Locale item object |
|
479 | + * @param \Aimeos\MShop\Locale\Item\Language\Iface $item Locale item object |
|
480 | 480 | * @return string[] Multi-dimensional associative list of item data |
481 | 481 | */ |
482 | 482 | protected function toArray( \Aimeos\MShop\Locale\Item\Language\Iface $item, $copy = false ) |
@@ -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( 'locale-language-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( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
64 | 62 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -96,14 +94,12 @@ discard block |
||
96 | 94 | $view->tabindex = ++$idx + 1; |
97 | 95 | $view->itemBody .= $client->create(); |
98 | 96 | } |
99 | - } |
|
100 | - catch( \Aimeos\MShop\Exception $e ) |
|
97 | + } catch( \Aimeos\MShop\Exception $e ) |
|
101 | 98 | { |
102 | 99 | $error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
103 | 100 | $view->errors = $view->get( 'errors', [] ) + $error; |
104 | 101 | $this->logException( $e ); |
105 | - } |
|
106 | - catch( \Exception $e ) |
|
102 | + } catch( \Exception $e ) |
|
107 | 103 | { |
108 | 104 | $error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
109 | 105 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -144,14 +140,12 @@ discard block |
||
144 | 140 | |
145 | 141 | $this->nextAction( $view, 'search', 'locale/language', null, 'delete' ); |
146 | 142 | return; |
147 | - } |
|
148 | - catch( \Aimeos\MShop\Exception $e ) |
|
143 | + } catch( \Aimeos\MShop\Exception $e ) |
|
149 | 144 | { |
150 | 145 | $error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
151 | 146 | $view->errors = $view->get( 'errors', [] ) + $error; |
152 | 147 | $this->logException( $e ); |
153 | - } |
|
154 | - catch( \Exception $e ) |
|
148 | + } catch( \Exception $e ) |
|
155 | 149 | { |
156 | 150 | $error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
157 | 151 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -192,14 +186,12 @@ discard block |
||
192 | 186 | $view->tabindex = ++$idx + 1; |
193 | 187 | $view->itemBody .= $client->get(); |
194 | 188 | } |
195 | - } |
|
196 | - catch( \Aimeos\MShop\Exception $e ) |
|
189 | + } catch( \Aimeos\MShop\Exception $e ) |
|
197 | 190 | { |
198 | 191 | $error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
199 | 192 | $view->errors = $view->get( 'errors', [] ) + $error; |
200 | 193 | $this->logException( $e ); |
201 | - } |
|
202 | - catch( \Exception $e ) |
|
194 | + } catch( \Exception $e ) |
|
203 | 195 | { |
204 | 196 | $error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
205 | 197 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -238,18 +230,15 @@ discard block |
||
238 | 230 | |
239 | 231 | $this->nextAction( $view, $view->param( 'next' ), 'locale/language', $view->item->getId(), 'save' ); |
240 | 232 | return; |
241 | - } |
|
242 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
233 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
243 | 234 | { |
244 | 235 | // fall through to create |
245 | - } |
|
246 | - catch( \Aimeos\MShop\Exception $e ) |
|
236 | + } catch( \Aimeos\MShop\Exception $e ) |
|
247 | 237 | { |
248 | 238 | $error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
249 | 239 | $view->errors = $view->get( 'errors', [] ) + $error; |
250 | 240 | $this->logException( $e ); |
251 | - } |
|
252 | - catch( \Exception $e ) |
|
241 | + } catch( \Exception $e ) |
|
253 | 242 | { |
254 | 243 | $error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
255 | 244 | $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( 'locale-language-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( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
304 | 291 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -479,7 +479,7 @@ |
||
479 | 479 | /** |
480 | 480 | * Constructs the data array for the view from the given item |
481 | 481 | * |
482 | - * @param \Aimeos\MShop\Locale\Item\Iface $item Locale item object |
|
482 | + * @param \Aimeos\MShop\Locale\Item\Currency\Iface $item Locale item object |
|
483 | 483 | * @return string[] Multi-dimensional associative list of item data |
484 | 484 | */ |
485 | 485 | protected function toArray( \Aimeos\MShop\Locale\Item\Currency\Iface $item, $copy = false ) |
@@ -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( 'locale-currency-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( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
101 | 99 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -135,14 +133,12 @@ discard block |
||
135 | 133 | $view->tabindex = ++$idx + 1; |
136 | 134 | $view->itemBody .= $client->create(); |
137 | 135 | } |
138 | - } |
|
139 | - catch( \Aimeos\MShop\Exception $e ) |
|
136 | + } catch( \Aimeos\MShop\Exception $e ) |
|
140 | 137 | { |
141 | 138 | $error = array( 'locale-currency-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
142 | 139 | $view->errors = $view->get( 'errors', [] ) + $error; |
143 | 140 | $this->logException( $e ); |
144 | - } |
|
145 | - catch( \Exception $e ) |
|
141 | + } catch( \Exception $e ) |
|
146 | 142 | { |
147 | 143 | $error = array( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
148 | 144 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -183,14 +179,12 @@ discard block |
||
183 | 179 | |
184 | 180 | $this->nextAction( $view, 'search', 'locale/currency', null, 'delete' ); |
185 | 181 | return; |
186 | - } |
|
187 | - catch( \Aimeos\MShop\Exception $e ) |
|
182 | + } catch( \Aimeos\MShop\Exception $e ) |
|
188 | 183 | { |
189 | 184 | $error = array( 'locale-currency-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
190 | 185 | $view->errors = $view->get( 'errors', [] ) + $error; |
191 | 186 | $this->logException( $e ); |
192 | - } |
|
193 | - catch( \Exception $e ) |
|
187 | + } catch( \Exception $e ) |
|
194 | 188 | { |
195 | 189 | $error = array( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
196 | 190 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -231,14 +225,12 @@ discard block |
||
231 | 225 | $view->tabindex = ++$idx + 1; |
232 | 226 | $view->itemBody .= $client->get(); |
233 | 227 | } |
234 | - } |
|
235 | - catch( \Aimeos\MShop\Exception $e ) |
|
228 | + } catch( \Aimeos\MShop\Exception $e ) |
|
236 | 229 | { |
237 | 230 | $error = array( 'locale-currency-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
238 | 231 | $view->errors = $view->get( 'errors', [] ) + $error; |
239 | 232 | $this->logException( $e ); |
240 | - } |
|
241 | - catch( \Exception $e ) |
|
233 | + } catch( \Exception $e ) |
|
242 | 234 | { |
243 | 235 | $error = array( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
244 | 236 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -275,18 +267,15 @@ discard block |
||
275 | 267 | |
276 | 268 | $this->nextAction( $view, $view->param( 'next' ), 'locale/currency', $view->item->getId(), 'save' ); |
277 | 269 | return; |
278 | - } |
|
279 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
270 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
280 | 271 | { |
281 | 272 | // fall through to create |
282 | - } |
|
283 | - catch( \Aimeos\MShop\Exception $e ) |
|
273 | + } catch( \Aimeos\MShop\Exception $e ) |
|
284 | 274 | { |
285 | 275 | $error = array( 'locale-currency-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
286 | 276 | $view->errors = $view->get( 'errors', [] ) + $error; |
287 | 277 | $this->logException( $e ); |
288 | - } |
|
289 | - catch( \Exception $e ) |
|
278 | + } catch( \Exception $e ) |
|
290 | 279 | { |
291 | 280 | $error = array( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
292 | 281 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -328,14 +317,12 @@ discard block |
||
328 | 317 | foreach( $this->getSubClients() as $client ) { |
329 | 318 | $view->itemBody .= $client->search(); |
330 | 319 | } |
331 | - } |
|
332 | - catch( \Aimeos\MShop\Exception $e ) |
|
320 | + } catch( \Aimeos\MShop\Exception $e ) |
|
333 | 321 | { |
334 | 322 | $error = array( 'locale-currency-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
335 | 323 | $view->errors = $view->get( 'errors', [] ) + $error; |
336 | 324 | $this->logException( $e ); |
337 | - } |
|
338 | - catch( \Exception $e ) |
|
325 | + } catch( \Exception $e ) |
|
339 | 326 | { |
340 | 327 | $error = array( 'locale-currency-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
341 | 328 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -35,8 +35,11 @@ |
||
35 | 35 | <?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> - |
36 | 36 | <?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?> |
37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
38 | - <?php else : ?> |
|
39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
41 | +} |
|
42 | +?> |
|
40 | 43 | <?php endif; ?> |
41 | 44 | <span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span> |
42 | 45 | </span> |
@@ -133,8 +133,11 @@ |
||
133 | 133 | </option> |
134 | 134 | <?php endforeach; ?> |
135 | 135 | </select> |
136 | - <?php else : ?> |
|
137 | - <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?> |
|
136 | + <?php else { |
|
137 | + : ?> |
|
138 | + <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); |
|
139 | +} |
|
140 | +?> |
|
138 | 141 | <input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" /> |
139 | 142 | <?php endif; ?> |
140 | 143 | </div> |
@@ -374,8 +374,11 @@ |
||
374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
376 | 376 | </a> |
377 | - <?php else : ?> |
|
378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
377 | + <?php else { |
|
378 | + : ?> |
|
379 | + <?= $enc->html( $refId ); |
|
380 | +} |
|
381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
379 | 382 | <?php endif; ?> |
380 | 383 | </td> |
381 | 384 | <?php endif; ?> |
@@ -374,8 +374,11 @@ |
||
374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
376 | 376 | </a> |
377 | - <?php else : ?> |
|
378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
377 | + <?php else { |
|
378 | + : ?> |
|
379 | + <?= $enc->html( $refId ); |
|
380 | +} |
|
381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
379 | 382 | <?php endif; ?> |
380 | 383 | </td> |
381 | 384 | <?php endif; ?> |
@@ -39,8 +39,7 @@ |
||
39 | 39 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
40 | 40 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
41 | 41 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
42 | -} |
|
43 | -else |
|
42 | +} else |
|
44 | 43 | { |
45 | 44 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
46 | 45 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |