@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | <?php if( $this->access( 'super' ) ) : ?> |
112 | 112 | <a class="btn fa act-add" tabindex="1" |
113 | 113 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
114 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
114 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
115 | 115 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
116 | 116 | </a> |
117 | 117 | <?php endif; ?> |
@@ -187,11 +187,11 @@ discard block |
||
187 | 187 | <?php if( $this->access( 'super' ) ) : ?> |
188 | 188 | <a class="btn act-copy fa" tabindex="1" |
189 | 189 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
190 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
190 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
191 | 191 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
192 | 192 | <a class="btn act-delete fa" tabindex="1" |
193 | 193 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig ) ); ?>" |
194 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
194 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
195 | 195 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
196 | 196 | <?php endif; ?> |
197 | 197 | </td> |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
54 | 54 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
55 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
55 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
56 | 56 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
57 | 57 | </a> |
58 | 58 | </li> |
@@ -5,7 +5,8 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
6 | 6 | */ |
7 | 7 | |
8 | -$selected = function( $key, $code ) { |
|
8 | +$selected = function( $key, $code ) |
|
9 | +{ |
|
9 | 10 | return ( $key == $code ? 'selected="selected"' : '' ); |
10 | 11 | }; |
11 | 12 |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | <th class="actions"> |
110 | 110 | <a class="btn fa act-add" tabindex="1" |
111 | 111 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
112 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
112 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
113 | 113 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
114 | 114 | </a> |
115 | 115 | |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | <td class="actions"> |
172 | 172 | <a class="btn act-copy fa" tabindex="1" |
173 | 173 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
174 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
174 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
175 | 175 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
176 | 176 | <a class="btn act-delete fa" tabindex="1" |
177 | 177 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig ) ); ?>" |
178 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
178 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
179 | 179 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
180 | 180 | </td> |
181 | 181 | </tr> |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | <th class="actions"> |
112 | 112 | <a class="btn fa act-add" tabindex="1" |
113 | 113 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
114 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
114 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
115 | 115 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
116 | 116 | </a> |
117 | 117 | |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | <td class="actions"> |
178 | 178 | <a class="btn act-copy fa" tabindex="1" |
179 | 179 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
180 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
180 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
181 | 181 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
182 | 182 | <?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?> |
183 | 183 | <a class="btn act-delete fa" tabindex="1" |
184 | 184 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'locale', 'id' => $id] + $params, [], $delConfig ) ); ?>" |
185 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
185 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
186 | 186 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
187 | 187 | <?php endif; ?> |
188 | 188 | </td> |
@@ -84,7 +84,7 @@ |
||
84 | 84 | ); |
85 | 85 | ?> |
86 | 86 | <button type="submit" class="btn act-search fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
87 | - title="<?= $enc->attr( $this->translate( 'admin', 'Search') ); ?>" |
|
87 | + title="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>" |
|
88 | 88 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>"> |
89 | 89 | </button> |
90 | 90 | </th> |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | </span> |
120 | 120 | <div class="item-actions"> |
121 | 121 | <a class="btn btn-secondary act-cancel" |
122 | - title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list') ); ?>" |
|
122 | + title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list' ) ); ?>" |
|
123 | 123 | href="<?= $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $searchParams, [], $listConfig ) ); ?>"> |
124 | 124 | <?= $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?> |
125 | 125 | </a> |
126 | 126 | |
127 | 127 | <div class="btn-group"> |
128 | 128 | <button type="submit" class="btn btn-primary act-save" |
129 | - title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)') ); ?>"> |
|
129 | + title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)' ) ); ?>"> |
|
130 | 130 | <?= $enc->html( $this->translate( 'admin', 'Save' ) ); ?> |
131 | 131 | </button> |
132 | 132 | <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $type => $subpart ) : ?> |
155 | 155 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
156 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type+1; ?>"> |
|
156 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type + 1; ?>"> |
|
157 | 157 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
158 | 158 | </a> |
159 | 159 | </li> |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | <input class="form-control item-website" type="url" tabindex="1" data-field="website" |
586 | 586 | name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.website' ) ) ); ?>" |
587 | 587 | placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>" |
588 | - value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.website') ); ?>" |
|
588 | + value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.website' ) ); ?>" |
|
589 | 589 | <?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> /> |
590 | 590 | </div> |
591 | 591 | <div class="col-sm-12 form-text text-muted help-text"> |
@@ -640,7 +640,7 @@ discard block |
||
640 | 640 | </div> |
641 | 641 | </div> |
642 | 642 | |
643 | - <table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId ) ?>" |
|
643 | + <table class="service-attr table table-striped" data-id="<?= $enc->attr( $serviceId ) ?>" |
|
644 | 644 | data-codes="<?= $enc->attr( isset( $serviceAttrCodes[$type] ) ? implode( ',', $serviceAttrCodes[$type] ) : '' ); ?>"> |
645 | 645 | <thead> |
646 | 646 | <tr> |
@@ -656,7 +656,7 @@ discard block |
||
656 | 656 | <th class="actions"> |
657 | 657 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
658 | 658 | <div class="btn act-add fa" tabindex="1" |
659 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
659 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
660 | 660 | </div> |
661 | 661 | <?php endif; ?> |
662 | 662 | </th> |
@@ -695,7 +695,7 @@ discard block |
||
695 | 695 | <td class="actions"> |
696 | 696 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
697 | 697 | <div class="btn act-delete fa" tabindex="1" |
698 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
698 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
699 | 699 | </div> |
700 | 700 | <?php endif; ?> |
701 | 701 | </td> |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | <td class="actions"> |
725 | 725 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
726 | 726 | <div class="btn act-delete fa" tabindex="1" |
727 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
727 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
728 | 728 | </div> |
729 | 729 | <?php endif; ?> |
730 | 730 | </td> |
@@ -5,7 +5,8 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
6 | 6 | */ |
7 | 7 | |
8 | -$selected = function( $key, $code ) { |
|
8 | +$selected = function( $key, $code ) |
|
9 | +{ |
|
9 | 10 | return ( $key == $code ? 'selected="selected"' : '' ); |
10 | 11 | }; |
11 | 12 | |
@@ -334,8 +335,11 @@ discard block |
||
334 | 335 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div> |
335 | 336 | </div> |
336 | 337 | <?php endforeach; ?> |
337 | - <?php else : ?> |
|
338 | - <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?> |
|
338 | + <?php else { |
|
339 | + : ?> |
|
340 | + <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); |
|
341 | +} |
|
342 | +?> |
|
339 | 343 | <?php endif; ?> |
340 | 344 | </div> |
341 | 345 | |
@@ -758,8 +762,11 @@ discard block |
||
758 | 762 | <div class="col-6 name"> |
759 | 763 | <?php if( $basket->getPrice()->getTaxFlag() ) : ?> |
760 | 764 | <?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?> |
761 | - <?php else : ?> |
|
762 | - <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?> |
|
765 | + <?php else { |
|
766 | + : ?> |
|
767 | + <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); |
|
768 | +} |
|
769 | +?> |
|
763 | 770 | <?php endif; ?> |
764 | 771 | </div> |
765 | 772 | <div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div> |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | <th class="actions"> |
109 | 109 | <a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
110 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
110 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
111 | 111 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
112 | 112 | </a> |
113 | 113 | |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | </td> |
245 | 245 | <td class="actions"> |
246 | 246 | <a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
247 | - title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>" |
|
247 | + title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>" |
|
248 | 248 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"> |
249 | 249 | </a> |
250 | 250 | </td> |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | <td class="actions"> |
346 | 346 | <?php if( !$this->site()->readonly( $siteId ) ) : ?> |
347 | 347 | <a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#" |
348 | - title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>" |
|
348 | + title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>" |
|
349 | 349 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a> |
350 | 350 | <?php endif; ?> |
351 | 351 | </td> |
@@ -6,7 +6,8 @@ |
||
6 | 6 | */ |
7 | 7 | |
8 | 8 | |
9 | -$selected = function( $key, $code ) { |
|
9 | +$selected = function( $key, $code ) |
|
10 | +{ |
|
10 | 11 | return ( $key == $code ? 'selected="selected"' : '' ); |
11 | 12 | }; |
12 | 13 |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | <th class="actions"> |
237 | 237 | <a class="btn fa act-download" tabindex="1" |
238 | 238 | href="<?= $enc->attr( $this->url( $expTarget, $expCntl, $expAction, $params, [], $expConfig ) ); ?>" |
239 | - title="<?= $enc->attr( $this->translate( 'admin', 'Download') ); ?>" |
|
239 | + title="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>" |
|
240 | 240 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>"> |
241 | 241 | </a> |
242 | 242 | |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | <td class="actions"> |
493 | 493 | <a class="btn act-copy fa" |
494 | 494 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $item->getBaseId()] + $params, [], $copyConfig ) ); ?>" |
495 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
495 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
496 | 496 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
497 | 497 | </td> |
498 | 498 | </tr> |
@@ -53,7 +53,7 @@ |
||
53 | 53 | |
54 | 54 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
55 | 55 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
56 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
56 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
57 | 57 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
58 | 58 | </a> |
59 | 59 | </li> |
@@ -5,7 +5,8 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
6 | 6 | */ |
7 | 7 | |
8 | -$selected = function( $key, $code ) { |
|
8 | +$selected = function( $key, $code ) |
|
9 | +{ |
|
9 | 10 | return ( $key == $code ? 'selected="selected"' : '' ); |
10 | 11 | }; |
11 | 12 |