@@ -464,15 +464,16 @@ discard block |
||
| 464 | 464 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
| 465 | 465 | $type = \Aimeos\MShop\Order\Item\Address\Base::TYPE_PAYMENT; |
| 466 | 466 | |
| 467 | - if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
| 467 | + if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) { |
|
| 468 | + // new address |
|
| 468 | 469 | { |
| 469 | 470 | $params = $view->param( 'ca_billing', [] ); |
| 471 | + } |
|
| 470 | 472 | |
| 471 | 473 | if( ( $view->addressBillingError = $this->checkFields( $params ) ) !== [] ) { |
| 472 | 474 | return false; |
| 473 | 475 | } |
| 474 | - } |
|
| 475 | - else // existing address |
|
| 476 | + } else // existing address |
|
| 476 | 477 | { |
| 477 | 478 | $params = $view->param( 'ca_billing_' . $option, [] ) + $view->param( 'ca_extra', [] ); |
| 478 | 479 | |
@@ -616,8 +617,7 @@ discard block |
||
| 616 | 617 | $invalid[$key] = $name; |
| 617 | 618 | unset( $params[$key] ); |
| 618 | 619 | } |
| 619 | - } |
|
| 620 | - else |
|
| 620 | + } else |
|
| 621 | 621 | { |
| 622 | 622 | unset( $params[$key] ); |
| 623 | 623 | } |