@@ -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( 'catalog-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( 'catalog-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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -121,14 +121,12 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | return; |
| 124 | - } |
|
| 125 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 124 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 126 | 125 | { |
| 127 | 126 | $error = array( 'attribute-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 128 | 127 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 129 | 128 | $this->logException( $e ); |
| 130 | - } |
|
| 131 | - catch( \Exception $e ) |
|
| 129 | + } catch( \Exception $e ) |
|
| 132 | 130 | { |
| 133 | 131 | $error = array( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 134 | 132 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -320,8 +318,7 @@ discard block |
||
| 320 | 318 | { |
| 321 | 319 | $propItem = $propItems[$entry['attribute.property.id']]; |
| 322 | 320 | unset( $propItems[$entry['attribute.property.id']] ); |
| 323 | - } |
|
| 324 | - else |
|
| 321 | + } else |
|
| 325 | 322 | { |
| 326 | 323 | $propItem = $manager->createItem(); |
| 327 | 324 | } |
@@ -305,8 +305,7 @@ |
||
| 305 | 305 | { |
| 306 | 306 | $propItem = $propItems[$entry['product.property.id']]; |
| 307 | 307 | unset( $propItems[$entry['product.property.id']] ); |
| 308 | - } |
|
| 309 | - else |
|
| 308 | + } else |
|
| 310 | 309 | { |
| 311 | 310 | $propItem = $manager->createItem(); |
| 312 | 311 | } |
@@ -121,14 +121,12 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | return; |
| 124 | - } |
|
| 125 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 124 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 126 | 125 | { |
| 127 | 126 | $error = array( 'customer-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 128 | 127 | $view->errors = $view->get( 'errors', [] ) + $error; |
| 129 | 128 | $this->logException( $e ); |
| 130 | - } |
|
| 131 | - catch( \Exception $e ) |
|
| 129 | + } catch( \Exception $e ) |
|
| 132 | 130 | { |
| 133 | 131 | $error = array( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
| 134 | 132 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -299,8 +297,7 @@ discard block |
||
| 299 | 297 | { |
| 300 | 298 | $propItem = $propItems[$entry['customer.property.id']]; |
| 301 | 299 | unset( $propItems[$entry['customer.property.id']] ); |
| 302 | - } |
|
| 303 | - else |
|
| 300 | + } else |
|
| 304 | 301 | { |
| 305 | 302 | $propItem = $manager->createItem(); |
| 306 | 303 | } |
@@ -81,9 +81,12 @@ |
||
| 81 | 81 | </select> |
| 82 | 82 | </div> |
| 83 | 83 | </div> |
| 84 | - <?php else : ?> |
|
| 84 | + <?php else { |
|
| 85 | + : ?> |
|
| 85 | 86 | <input class="item-languageid" type="hidden" |
| 86 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
| 87 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); |
|
| 88 | +} |
|
| 89 | +?>'.replace('idx', idx)" |
|
| 87 | 90 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
| 88 | 91 | <?php endif; ?> |
| 89 | 92 | <div class="form-group row optional"> |