@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | </th> |
25 | 25 | <th class="actions"> |
26 | 26 | <div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
27 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
27 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
28 | 28 | v-on:click="addPropertyItem(idx)"> |
29 | 29 | </div> |
30 | 30 | </th> |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | <td class="actions"> |
79 | 79 | <div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
80 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
80 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
81 | 81 | v-on:click.stop="removePropertyItem(idx, propidx)"> |
82 | 82 | </div> |
83 | 83 | </td> |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | <th class="actions"> |
111 | 111 | <a class="btn fa act-add" tabindex="1" |
112 | 112 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
113 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
113 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
114 | 114 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
115 | 115 | </a> |
116 | 116 | |
@@ -172,12 +172,12 @@ discard block |
||
172 | 172 | <td class="actions"> |
173 | 173 | <a class="btn act-copy fa" tabindex="1" |
174 | 174 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
175 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
175 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
176 | 176 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
177 | 177 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
178 | 178 | <a class="btn act-delete fa" tabindex="1" |
179 | 179 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'supplier', 'id' => $id] + $params, [], $delConfig ) ); ?>" |
180 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
180 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
181 | 181 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
182 | 182 | <?php endif; ?> |
183 | 183 | </td> |
@@ -46,12 +46,12 @@ |
||
46 | 46 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
47 | 47 | <a class="btn act-delete fa" tabindex="1" |
48 | 48 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $delConfig ) ); ?>" |
49 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
49 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
50 | 50 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
51 | 51 | <?php endif; ?> |
52 | 52 | <a class="btn act-download fa" tabindex="1" |
53 | 53 | href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $getConfig ) ); ?>" |
54 | - title="<?= $enc->attr( $this->translate( 'admin', 'Download this file') ); ?>" |
|
54 | + title="<?= $enc->attr( $this->translate( 'admin', 'Download this file' ) ); ?>" |
|
55 | 55 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>"></a> |
56 | 56 | </td> |
57 | 57 | </tr> |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | </th> |
33 | 33 | <th class="actions"> |
34 | 34 | <div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
35 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
35 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
36 | 36 | v-on:click="addItem('customer.property.')"> |
37 | 37 | </div> |
38 | 38 | </th> |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | <td class="actions"> |
90 | 90 | <div v-if="!checkSite('customer.property.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
91 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
91 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
92 | 92 | v-on:click.stop="removeItem(idx)"> |
93 | 93 | </div> |
94 | 94 | </td> |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | <th class="actions"> |
161 | 161 | <!-- a class="btn fa act-add" tabindex="<?= $this->get( 'tabindex' ); ?>" |
162 | 162 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, ['resource' => 'order'] + $params, [], $newConfig ) ); ?>" |
163 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
163 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
164 | 164 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
165 | 165 | </a --> |
166 | 166 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | <td class="actions"> |
264 | 264 | <a class="btn act-view fa" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank" |
265 | 265 | href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?>" |
266 | - title="<?= $enc->attr( $this->translate( 'admin', 'View details') ); ?>"></a> |
|
266 | + title="<?= $enc->attr( $this->translate( 'admin', 'View details' ) ); ?>"></a> |
|
267 | 267 | </td> |
268 | 268 | </tr> |
269 | 269 | <?php endforeach; ?> |
@@ -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 |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | <th class="actions"> |
135 | 135 | <a class="btn fa act-add" tabindex="1" |
136 | 136 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
137 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
137 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
138 | 138 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
139 | 139 | </a> |
140 | 140 | |
@@ -275,12 +275,12 @@ discard block |
||
275 | 275 | <td class="actions"> |
276 | 276 | <a class="btn act-copy fa" tabindex="1" |
277 | 277 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
278 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
278 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
279 | 279 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
280 | 280 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
281 | 281 | <a class="btn act-delete fa" tabindex="1" |
282 | 282 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'customer', 'id' => $id] + $params, [], $delConfig ) ); ?>" |
283 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
283 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
284 | 284 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
285 | 285 | <?php endif; ?> |
286 | 286 | </td> |
@@ -31,7 +31,7 @@ |
||
31 | 31 | <button class="btn act-columns fa" type="button" id="dropdownMenuButton-<?= $this->get( 'group' ) ?>" |
32 | 32 | data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
33 | 33 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Columns' ) ); ?>" |
34 | - title="<?= $enc->attr( $this->translate( 'admin', 'Columns') ); ?>"> |
|
34 | + title="<?= $enc->attr( $this->translate( 'admin', 'Columns' ) ); ?>"> |
|
35 | 35 | </button> |
36 | 36 | <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?= $this->get( 'group' ) ?>"> |
37 | 37 | <?php foreach( $this->get( 'data', [] ) as $key => $name ) : ?> |
@@ -62,11 +62,11 @@ |
||
62 | 62 | |
63 | 63 | <td class="actions"> |
64 | 64 | <button type="submit" class="btn act-search fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
65 | - title="<?= $enc->attr( $this->translate( 'admin', 'Search') ); ?>" |
|
65 | + title="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>" |
|
66 | 66 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>"> |
67 | 67 | </button> |
68 | 68 | <a class="btn act-reset fa" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
69 | - title="<?= $enc->attr( $this->translate( 'admin', 'Reset') ); ?>" |
|
69 | + title="<?= $enc->attr( $this->translate( 'admin', 'Reset' ) ); ?>" |
|
70 | 70 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Reset' ) ); ?>"></a> |
71 | 71 | </td> |
72 | 72 | </tr> |
@@ -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; ?> |
@@ -25,14 +25,14 @@ |
||
25 | 25 | |
26 | 26 | ?> |
27 | 27 | <a class="btn btn-secondary act-cancel" |
28 | - title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list') ); ?>" |
|
28 | + title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list' ) ); ?>" |
|
29 | 29 | href="<?= $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $params, [], $listConfig ) ); ?>"> |
30 | 30 | <?= $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?> |
31 | 31 | </a> |
32 | 32 | |
33 | 33 | <div class="btn-group"> |
34 | 34 | <button type="submit" class="btn btn-primary act-save" |
35 | - title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)') ); ?>"> |
|
35 | + title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)' ) ); ?>"> |
|
36 | 36 | <?= $enc->html( $this->translate( 'admin', 'Save' ) ); ?> |
37 | 37 | </button> |
38 | 38 | <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" |