@@ -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> |
@@ -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 | |
@@ -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> |
@@ -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; ?> |
@@ -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 | } |