@@ -249,13 +249,11 @@ |
||
| 249 | 249 | $response->withHeader( 'Expires', '0' ); |
| 250 | 250 | |
| 251 | 251 | $response->withBody( $response->createStream( $fs->reads( $value ) ) ); |
| 252 | - } |
|
| 253 | - elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
| 252 | + } elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
| 254 | 253 | { |
| 255 | 254 | $response->withHeader( 'Location', $value ); |
| 256 | 255 | $response->withStatus( 303 ); |
| 257 | - } |
|
| 258 | - else |
|
| 256 | + } else |
|
| 259 | 257 | { |
| 260 | 258 | $response->withStatus( 404 ); |
| 261 | 259 | } |
@@ -522,12 +522,10 @@ |
||
| 522 | 522 | { |
| 523 | 523 | throw new \Aimeos\Client\Html\Exception( $e->getMessage() ); |
| 524 | 524 | } |
| 525 | - } |
|
| 526 | - else if( function_exists( 'mime_content_type' ) ) |
|
| 525 | + } else if( function_exists( 'mime_content_type' ) ) |
|
| 527 | 526 | { |
| 528 | 527 | $mimetype = mime_content_type( $filename ); |
| 529 | - } |
|
| 530 | - else |
|
| 528 | + } else |
|
| 531 | 529 | { |
| 532 | 530 | $mimetype = 'application/binary'; |
| 533 | 531 | } |
@@ -241,7 +241,9 @@ |
||
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | - catch( \Exception $e ) { ; } // no price available |
|
| 244 | + catch( \Exception $e ) |
|
| 245 | + { |
|
| 246 | +; } // no price available |
|
| 245 | 247 | } |
| 246 | 248 | |
| 247 | 249 | return $result; |
@@ -145,7 +145,7 @@ |
||
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | - catch( \Exception $e ) { ; } // no price available |
|
| 148 | + catch( \Exception $e ) {; } // no price available |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | return $result; |
@@ -522,12 +522,10 @@ |
||
| 522 | 522 | { |
| 523 | 523 | throw new \Aimeos\Client\Html\Exception( $e->getMessage() ); |
| 524 | 524 | } |
| 525 | - } |
|
| 526 | - else if( function_exists( 'mime_content_type' ) ) |
|
| 525 | + } else if( function_exists( 'mime_content_type' ) ) |
|
| 527 | 526 | { |
| 528 | 527 | $mimetype = mime_content_type( $filename ); |
| 529 | - } |
|
| 530 | - else |
|
| 528 | + } else |
|
| 531 | 529 | { |
| 532 | 530 | $mimetype = 'application/binary'; |
| 533 | 531 | } |
@@ -322,8 +322,7 @@ |
||
| 322 | 322 | { |
| 323 | 323 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
| 324 | 324 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
| 325 | - } |
|
| 326 | - else |
|
| 325 | + } else |
|
| 327 | 326 | { |
| 328 | 327 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
| 329 | 328 | $orderItem = $orderCntl->get( $orderid, false ); |
@@ -645,15 +645,16 @@ discard block |
||
| 645 | 645 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
| 646 | 646 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
| 647 | 647 | |
| 648 | - if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
| 648 | + if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) { |
|
| 649 | + // new address |
|
| 649 | 650 | { |
| 650 | 651 | $params = $view->param( 'ca_billing', [] ); |
| 652 | + } |
|
| 651 | 653 | |
| 652 | 654 | if( ( $view->addressBillingError = $this->checkFields( $params ) ) !== [] ) { |
| 653 | 655 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one billing address part is missing or invalid' ) ); |
| 654 | 656 | } |
| 655 | - } |
|
| 656 | - else // existing address |
|
| 657 | + } else // existing address |
|
| 657 | 658 | { |
| 658 | 659 | $params = $view->param( 'ca_billing_' . $option, [] ) + $view->param( 'ca_extra', [] ); |
| 659 | 660 | |
@@ -797,8 +798,7 @@ discard block |
||
| 797 | 798 | $invalid[$key] = $name; |
| 798 | 799 | unset( $params[$key] ); |
| 799 | 800 | } |
| 800 | - } |
|
| 801 | - else |
|
| 801 | + } else |
|
| 802 | 802 | { |
| 803 | 803 | unset( $params[$key] ); |
| 804 | 804 | } |
@@ -524,19 +524,22 @@ discard block |
||
| 524 | 524 | $disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false ); |
| 525 | 525 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY; |
| 526 | 526 | |
| 527 | - if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
| 527 | + if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) { |
|
| 528 | + // new address |
|
| 528 | 529 | { |
| 529 | 530 | $params = $view->param( 'ca_delivery', [] ); |
| 531 | + } |
|
| 530 | 532 | |
| 531 | 533 | if( ( $view->addressDeliveryError = $this->checkFields( $params ) ) !== [] ) { |
| 532 | 534 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
| 533 | 535 | } |
| 534 | 536 | |
| 535 | 537 | $ctrl->addAddress( $type, $params, 0 ); |
| 536 | - } |
|
| 537 | - else if( ( $option = $view->param( 'ca_deliveryoption' ) ) !== 'like' ) // existing address |
|
| 538 | + } else if( ( $option = $view->param( 'ca_deliveryoption' ) ) !== 'like' ) { |
|
| 539 | + // existing address |
|
| 538 | 540 | { |
| 539 | 541 | $params = $view->param( 'ca_delivery_' . $option, [] ); |
| 542 | + } |
|
| 540 | 543 | |
| 541 | 544 | if( !empty( $params ) && ( $view->addressDeliveryError = $this->checkFields( $params ) ) !== [] ) { |
| 542 | 545 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
@@ -549,13 +552,11 @@ discard block |
||
| 549 | 552 | $params = array_replace( $address->toArray(), $params + ['order.base.address.addressid' => $option] ); |
| 550 | 553 | $addr = $ctrl->addAddress( $type, $params, 0 )->get()->getAddress( $type, 0 ); // sanitize address first |
| 551 | 554 | $custCntl->addAddressItem( $address->copyFrom( $addr ), $option )->store(); // update existing address |
| 552 | - } |
|
| 553 | - else |
|
| 555 | + } else |
|
| 554 | 556 | { |
| 555 | 557 | $ctrl->addAddress( $type, $params, 0 ); |
| 556 | 558 | } |
| 557 | - } |
|
| 558 | - else |
|
| 559 | + } else |
|
| 559 | 560 | { |
| 560 | 561 | $ctrl->deleteAddress( $type ); |
| 561 | 562 | } |
@@ -787,8 +788,7 @@ discard block |
||
| 787 | 788 | $invalid[$key] = $name; |
| 788 | 789 | unset( $params[$key] ); |
| 789 | 790 | } |
| 790 | - } |
|
| 791 | - else |
|
| 791 | + } else |
|
| 792 | 792 | { |
| 793 | 793 | unset( $params[$key] ); |
| 794 | 794 | } |
@@ -443,7 +443,7 @@ |
||
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | $tree = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses( $domains ) |
| 446 | - ->getTree( \Aimeos\Controller\Frontend\Catalog\Iface::LIST ); |
|
| 446 | + ->getTree( \Aimeos\Controller\Frontend\Catalog\Iface::list ); |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | 449 | $articles = map(); |
@@ -54,7 +54,8 @@ discard block |
||
| 54 | 54 | array( 'addresses' => $addrItems, 'separator' => "\n" ) |
| 55 | 55 | ) |
| 56 | 56 | ?> |
| 57 | -<?php else : ?> |
|
| 57 | +<?php else { |
|
| 58 | + : ?> |
|
| 58 | 59 | <?= $this->translate( 'client', 'like billing address' ) ?> |
| 59 | 60 | <?php endif ?> |
| 60 | 61 | |
@@ -69,6 +70,7 @@ discard block |
||
| 69 | 70 | <?php foreach( $service->getAttributeItems() as $attribute ) |
| 70 | 71 | { |
| 71 | 72 | $name = ( $attribute->getName() != '' ? $attribute->getName() : $this->translate( 'client/code', $attribute->getCode() ) ); |
| 73 | +} |
|
| 72 | 74 | |
| 73 | 75 | switch( $attribute->getValue() ) |
| 74 | 76 | { |