@@ -29,7 +29,8 @@ discard block |
||
| 29 | 29 | <span class="navbar-label"> |
| 30 | 30 | <?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
| 31 | 31 | <?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ) ?> |
| 32 | - <?php else : ?> |
|
| 32 | + <?php else { |
|
| 33 | + : ?> |
|
| 33 | 34 | <?= $enc->html( $this->translate( 'admin', 'New' ) ) ?> |
| 34 | 35 | <?php endif ?> |
| 35 | 36 | </span> |
@@ -188,6 +189,7 @@ discard block |
||
| 188 | 189 | <?php |
| 189 | 190 | /// Price format with price value (%1$s) and currency (%2$s) |
| 190 | 191 | $priceFormat = $this->translate( 'client/code', '%1$s %2$s' ); |
| 192 | +} |
|
| 191 | 193 | $currency = $this->translate( 'currency', $order->getPrice()->getCurrencyId() ); |
| 192 | 194 | ?> |
| 193 | 195 | |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2022 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 9 | -{ |
|
| 8 | +$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
| 10 | 9 | $price = 0; |
| 11 | 10 | |
| 12 | 11 | foreach( $item->getProducts() as $product ) |
@@ -20,8 +19,7 @@ discard block |
||
| 20 | 19 | }; |
| 21 | 20 | |
| 22 | 21 | |
| 23 | -$name = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 24 | -{ |
|
| 22 | +$name = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 25 | 23 | $type = \Aimeos\MShop\Order\Item\Address\Base::TYPE_PAYMENT; |
| 26 | 24 | |
| 27 | 25 | if( ( $address = current( $item->getAddress( $type ) ) ) === false ) { |
@@ -32,8 +30,7 @@ discard block |
||
| 32 | 30 | }; |
| 33 | 31 | |
| 34 | 32 | |
| 35 | -$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 36 | -{ |
|
| 33 | +$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 37 | 34 | $codes = []; |
| 38 | 35 | $type = \Aimeos\MShop\Order\Item\Service\Base::TYPE_PAYMENT; |
| 39 | 36 | |
@@ -45,8 +42,7 @@ discard block |
||
| 45 | 42 | }; |
| 46 | 43 | |
| 47 | 44 | |
| 48 | -$status = function( array $list, $key ) |
|
| 49 | -{ |
|
| 45 | +$status = function( array $list, $key ) { |
|
| 50 | 46 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
| 51 | 47 | }; |
| 52 | 48 | |
@@ -5,15 +5,13 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2022 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 9 | -{ |
|
| 8 | +$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
| 10 | 9 | $price = $item->getPrice(); |
| 11 | 10 | return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() ); |
| 12 | 11 | }; |
| 13 | 12 | |
| 14 | 13 | |
| 15 | -$name = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 16 | -{ |
|
| 14 | +$name = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 17 | 15 | $addresses = $item->getAddresses(); |
| 18 | 16 | |
| 19 | 17 | if( !isset( $addresses[\Aimeos\MShop\Order\Item\Address\Base::TYPE_PAYMENT] ) ) { |
@@ -30,8 +28,7 @@ discard block |
||
| 30 | 28 | }; |
| 31 | 29 | |
| 32 | 30 | |
| 33 | -$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 34 | -{ |
|
| 31 | +$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 35 | 32 | $services = $item->getServices(); |
| 36 | 33 | |
| 37 | 34 | if( isset( $services[\Aimeos\MShop\Order\Item\Service\Base::TYPE_PAYMENT] ) ) { |
@@ -40,8 +37,7 @@ discard block |
||
| 40 | 37 | }; |
| 41 | 38 | |
| 42 | 39 | |
| 43 | -$status = function( $list, $key ) |
|
| 44 | -{ |
|
| 40 | +$status = function( $list, $key ) { |
|
| 45 | 41 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
| 46 | 42 | }; |
| 47 | 43 | |
@@ -517,8 +517,7 @@ discard block |
||
| 517 | 517 | { |
| 518 | 518 | $attrItem = $attrItems[$array['order.service.attribute.id']]; |
| 519 | 519 | unset( $attrItems[$array['order.service.attribute.id']] ); |
| 520 | - } |
|
| 521 | - else |
|
| 520 | + } else |
|
| 522 | 521 | { |
| 523 | 522 | $attrItem = $attrManager->create(); |
| 524 | 523 | } |
@@ -553,9 +552,13 @@ discard block |
||
| 553 | 552 | { |
| 554 | 553 | $manager = \Aimeos\MShop::create( $this->context(), 'customer' ); |
| 555 | 554 | |
| 556 | - try { |
|
| 555 | + try |
|
| 556 | + { |
|
| 557 | 557 | $data += $manager->get( $item->getCustomerId() )->toArray(); |
| 558 | - } catch( \Exception $e ) {}; |
|
| 558 | + } |
|
| 559 | + catch( \Exception $e ) |
|
| 560 | + { |
|
| 561 | +}; |
|
| 559 | 562 | } |
| 560 | 563 | |
| 561 | 564 | |