| @@ -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 | } | 
| @@ -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(); | 
| @@ -221,9 +221,12 @@ | ||
| 221 | 221 | $context = $this->context(); | 
| 222 | 222 | $cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' ); | 
| 223 | 223 | |
| 224 | -		try { | |
| 224 | + try | |
| 225 | +		{ | |
| 225 | 226 | $id = $cntl->find( $addr->getEmail() )->getId(); | 
| 226 | -		} catch( \Exception $e ) { | |
| 227 | + } | |
| 228 | + catch( \Exception $e ) | |
| 229 | +		{ | |
| 227 | 230 | $id = $new ? $cntl->add( $addr->toArray() )->store()->get()->getId() : null; | 
| 228 | 231 | } | 
| 229 | 232 | |
| @@ -268,28 +268,27 @@ | ||
| 268 | 268 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); | 
| 269 | 269 | |
| 270 | 270 | $context->session()->set( 'aimeos/orderid', $orderItem->getId() ); | 
| 271 | - } | |
| 272 | - elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) | |
| 271 | + } elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) | |
| 273 | 272 |  			{ | 
| 274 | 273 | $parts = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service']; | 
| 275 | 274 | $orderItem = $orderCntl->get( $orderid, false ); | 
| 276 | 275 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); | 
| 277 | - } | |
| 278 | - else | |
| 276 | + } else | |
| 279 | 277 |  			{ | 
| 280 | 278 | return; | 
| 281 | 279 | } | 
| 282 | 280 | |
| 283 | - if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) // no payment service available | |
| 281 | +			if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) { | |
| 282 | + // no payment service available | |
| 284 | 283 |  			{ | 
| 285 | 284 | $services = $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ); | 
| 285 | + } | |
| 286 | 286 | $args = ( $service = reset( $services ) ) ? ['code' => $service->getCode()] : []; | 
| 287 | 287 | |
| 288 | 288 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); | 
| 289 | 289 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); | 
| 290 | 290 | $view->standardMethod = 'POST'; | 
| 291 | - } | |
| 292 | - else | |
| 291 | + } else | |
| 293 | 292 |  			{ | 
| 294 | 293 | $view = $this->addFormData( $view, $form ); | 
| 295 | 294 | } | 
| @@ -145,8 +145,7 @@ discard block | ||
| 145 | 145 | |
| 146 | 146 | $html = $view->render( $view->config( $tplconf, $default ) ); | 
| 147 | 147 | $this->setBasketCached( $key, $html ); | 
| 148 | - } | |
| 149 | - else | |
| 148 | + } else | |
| 150 | 149 |  		{ | 
| 151 | 150 | $html = $this->modify( $html, $uid ); | 
| 152 | 151 | } | 
| @@ -215,8 +214,7 @@ discard block | ||
| 215 | 214 |  			{ | 
| 216 | 215 | $this->logException( $e ); | 
| 217 | 216 | } | 
| 218 | - } | |
| 219 | - else | |
| 217 | + } else | |
| 220 | 218 |  		{ | 
| 221 | 219 | $html = $this->modify( $html, $uid ); | 
| 222 | 220 | } | 
| @@ -37,14 +37,17 @@ | ||
| 37 | 37 | <span class="name"> | 
| 38 | 38 | <?php if( $attribute->getName() != '' ) : ?> | 
| 39 | 39 | <?= $enc->html( $attribute->getName() ) ?> | 
| 40 | - <?php else : ?> | |
| 40 | +							<?php else { | |
| 41 | + : ?> | |
| 41 | 42 | <?= $enc->html( $this->translate( 'client/code', $attribute->getCode() ) ) ?> | 
| 42 | 43 | <?php endif ?> | 
| 43 | 44 | </span> | 
| 44 | 45 | |
| 45 | 46 | <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> | 
| 46 | 47 | <span class="value"><?= $enc->html( join( ', ', (array) $attribute->getValue() ) ) ?></span> | 
| 47 | - <?php break; default: ?> | |
| 48 | + <?php break; | |
| 49 | +} | |
| 50 | +default: ?> | |
| 48 | 51 | <span class="value"><?= $enc->html( $attribute->getValue() ) ?></span> | 
| 49 | 52 | <?php endswitch ?> | 
| 50 | 53 | |