@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
62 | 62 | </a> |
63 | 63 | </li> |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2016-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 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -34,8 +32,7 @@ discard block |
||
34 | 32 | }; |
35 | 33 | |
36 | 34 | |
37 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
38 | -{ |
|
35 | +$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
39 | 36 | if( isset( $orders[$item->getBaseId()] ) ) |
40 | 37 | { |
41 | 38 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -51,8 +48,7 @@ discard block |
||
51 | 48 | }; |
52 | 49 | |
53 | 50 | |
54 | -$status = function( $list, $key ) |
|
55 | -{ |
|
51 | +$status = function( $list, $key ) { |
|
56 | 52 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
57 | 53 | }; |
58 | 54 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
62 | 62 | </a> |
63 | 63 | </li> |
@@ -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> |
@@ -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,14 +110,14 @@ discard block |
||
110 | 110 | </span> |
111 | 111 | <div class="item-actions"> |
112 | 112 | <a class="btn btn-secondary act-cancel" |
113 | - title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list') ); ?>" |
|
113 | + title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list' ) ); ?>" |
|
114 | 114 | href="<?= $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $searchParams, [], $listConfig ) ); ?>"> |
115 | 115 | <?= $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?> |
116 | 116 | </a> |
117 | 117 | |
118 | 118 | <div class="btn-group"> |
119 | 119 | <button type="submit" class="btn btn-primary act-save" |
120 | - title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)') ); ?>"> |
|
120 | + title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)' ) ); ?>"> |
|
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Save' ) ); ?> |
122 | 122 | </button> |
123 | 123 | <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $type => $subpart ) : ?> |
146 | 146 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
147 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type+1; ?>"> |
|
147 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type + 1; ?>"> |
|
148 | 148 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
149 | 149 | </a> |
150 | 150 | </li> |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | <input class="form-control item-website" type="url" tabindex="1" data-field="website" |
579 | 579 | name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, $pos, 'order.base.address.website' ) ) ); ?>" |
580 | 580 | placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>" |
581 | - value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/' . $pos . '/order.base.address.website') ); ?>" |
|
581 | + value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/' . $pos . '/order.base.address.website' ) ); ?>" |
|
582 | 582 | <?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> /> |
583 | 583 | </div> |
584 | 584 | <div class="col-sm-12 form-text text-muted help-text"> |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | </div> |
636 | 636 | </div> |
637 | 637 | |
638 | - <table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId ) ?>" |
|
638 | + <table class="service-attr table table-striped" data-id="<?= $enc->attr( $serviceId ) ?>" |
|
639 | 639 | data-codes="<?= $enc->attr( isset( $serviceAttrCodes[$type] ) ? implode( ',', $serviceAttrCodes[$type] ) : '' ); ?>"> |
640 | 640 | <thead> |
641 | 641 | <tr> |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | <th class="actions"> |
652 | 652 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
653 | 653 | <div class="btn act-add fa" tabindex="1" |
654 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
654 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
655 | 655 | </div> |
656 | 656 | <?php endif; ?> |
657 | 657 | </th> |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | <td class="actions"> |
691 | 691 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
692 | 692 | <div class="btn act-delete fa" tabindex="1" |
693 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
693 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
694 | 694 | </div> |
695 | 695 | <?php endif; ?> |
696 | 696 | </td> |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | <td class="actions"> |
720 | 720 | <?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?> |
721 | 721 | <div class="btn act-delete fa" tabindex="1" |
722 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
722 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
723 | 723 | </div> |
724 | 724 | <?php endif; ?> |
725 | 725 | </td> |
@@ -9,8 +9,7 @@ discard block |
||
9 | 9 | return ( $key == $code ? 'selected="selected"' : '' ); |
10 | 10 | }; |
11 | 11 | |
12 | -$sortItems = function( array $items ) |
|
13 | -{ |
|
12 | +$sortItems = function( array $items ) { |
|
14 | 13 | krsort( $items ); |
15 | 14 | return $items; |
16 | 15 | }; |
@@ -325,8 +324,11 @@ discard block |
||
325 | 324 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div> |
326 | 325 | </div> |
327 | 326 | <?php endforeach; ?> |
328 | - <?php else : ?> |
|
329 | - <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?> |
|
327 | + <?php else { |
|
328 | + : ?> |
|
329 | + <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); |
|
330 | +} |
|
331 | +?> |
|
330 | 332 | <?php endif; ?> |
331 | 333 | </div> |
332 | 334 | |
@@ -753,8 +755,11 @@ discard block |
||
753 | 755 | <div class="col-6 name"> |
754 | 756 | <?php if( $basket->getPrice()->getTaxFlag() ) : ?> |
755 | 757 | <?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?> |
756 | - <?php else : ?> |
|
757 | - <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?> |
|
758 | + <?php else { |
|
759 | + : ?> |
|
760 | + <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); |
|
761 | +} |
|
762 | +?> |
|
758 | 763 | <?php endif; ?> |
759 | 764 | </div> |
760 | 765 | <div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div> |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
62 | 62 | </a> |
63 | 63 | </li> |
@@ -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 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) ); |
63 | 63 | } |
64 | 64 | |
65 | - return $client->setAimeos( $aimeos )->setView( $view );; |
|
65 | + return $client->setAimeos( $aimeos )->setView( $view ); ; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | } |