@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
6 | 6 | */ |
7 | 7 | |
8 | -$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
9 | -{ |
|
8 | +$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
10 | 9 | if( isset( $orders[$item->getBaseId()] ) ) |
11 | 10 | { |
12 | 11 | $price = $orders[$item->getBaseId()]->getPrice(); |
@@ -15,8 +14,7 @@ discard block |
||
15 | 14 | }; |
16 | 15 | |
17 | 16 | |
18 | -$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
19 | -{ |
|
17 | +$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
20 | 18 | if( isset( $orders[$item->getBaseId()] ) ) |
21 | 19 | { |
22 | 20 | $addresses = $orders[$item->getBaseId()]->getAddresses(); |
@@ -36,8 +34,7 @@ discard block |
||
36 | 34 | }; |
37 | 35 | |
38 | 36 | |
39 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
40 | -{ |
|
37 | +$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
41 | 38 | if( isset( $orders[$item->getBaseId()] ) ) |
42 | 39 | { |
43 | 40 | $services = $orders[$item->getBaseId()]->getServices(); |
@@ -49,8 +46,7 @@ discard block |
||
49 | 46 | }; |
50 | 47 | |
51 | 48 | |
52 | -$status = function( $list, $key ) |
|
53 | -{ |
|
49 | +$status = function( $list, $key ) { |
|
54 | 50 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
55 | 51 | }; |
56 | 52 |
@@ -291,8 +291,7 @@ |
||
291 | 291 | $propItem->setValue( $value ); |
292 | 292 | |
293 | 293 | $item->addPropertyItem( $propItem ); |
294 | - } |
|
295 | - else |
|
294 | + } else |
|
296 | 295 | { |
297 | 296 | $item->deletePropertyItems( $propItems ); |
298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
291 | 291 | { |
292 | 292 | $propItem = $propItems[$entry['price.property.id']]; |
293 | 293 | unset( $propItems[$entry['price.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['price.property.id']]; |
293 | 293 | unset( $propItems[$entry['price.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['price.property.id']]; |
293 | 293 | unset( $propItems[$entry['price.property.id']] ); |
294 | - } |
|
295 | - else |
|
294 | + } else |
|
296 | 295 | { |
297 | 296 | $propItem = $propManager->createItem(); |
298 | 297 | } |
@@ -87,9 +87,12 @@ |
||
87 | 87 | </select> |
88 | 88 | </div> |
89 | 89 | </div> |
90 | - <?php else : ?> |
|
90 | + <?php else { |
|
91 | + : ?> |
|
91 | 92 | <input class="item-languageid" type="hidden" |
92 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
93 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); |
|
94 | +} |
|
95 | +?>'.replace('idx', idx)" |
|
93 | 96 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
94 | 97 | <?php endif; ?> |
95 | 98 | <div class="form-group row optional"> |
@@ -87,9 +87,12 @@ |
||
87 | 87 | </select> |
88 | 88 | </div> |
89 | 89 | </div> |
90 | - <?php else : ?> |
|
90 | + <?php else { |
|
91 | + : ?> |
|
91 | 92 | <input class="item-languageid" type="hidden" |
92 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
93 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); |
|
94 | +} |
|
95 | +?>'.replace('idx', idx)" |
|
93 | 96 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
94 | 97 | <?php endif; ?> |
95 | 98 | <div class="form-group row optional"> |
@@ -52,8 +52,11 @@ |
||
52 | 52 | </option> |
53 | 53 | <?php endforeach; ?> |
54 | 54 | </select> |
55 | - <?php else : ?> |
|
56 | - <input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
55 | + <?php else { |
|
56 | + : ?> |
|
57 | + <input class="form-control" type="<?= $enc->attr( $type ); |
|
58 | +} |
|
59 | +?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
57 | 60 | name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>" |
58 | 61 | value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>" /> |
59 | 62 | <?php endif; ?> |
@@ -123,9 +123,12 @@ discard block |
||
123 | 123 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
124 | 124 | </div> |
125 | 125 | </div> |
126 | - <?php else : ?> |
|
126 | + <?php else { |
|
127 | + : ?> |
|
127 | 128 | <input class="item-type" type="hidden" |
128 | - v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); ?>'.replace('_idx_', idx)" |
|
129 | + v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); |
|
130 | +} |
|
131 | +?>'.replace('_idx_', idx)" |
|
129 | 132 | value="<?= $enc->attr( key( $mediaTypes ) ) ?>" /> |
130 | 133 | <?php endif; ?> |
131 | 134 | |
@@ -188,9 +191,12 @@ discard block |
||
188 | 191 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
189 | 192 | </div> |
190 | 193 | </div> |
191 | - <?php else : ?> |
|
194 | + <?php else { |
|
195 | + : ?> |
|
192 | 196 | <input class="listitem-type" type="hidden" |
193 | - v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'catalog.lists.type'] ) ); ?>'.replace('_idx_', idx)" |
|
197 | + v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'catalog.lists.type'] ) ); |
|
198 | +} |
|
199 | +?>'.replace('_idx_', idx)" |
|
194 | 200 | value="<?= $enc->attr( key( $listTypes ) ) ?>" /> |
195 | 201 | <?php endif; ?> |
196 | 202 | <div class="form-group row optional"> |