@@ -218,7 +218,7 @@ |
||
| 218 | 218 | |
| 219 | 219 | foreach( $map as $pos => $data ) |
| 220 | 220 | { |
| 221 | - $addrItem = ( !isset( $addrItems[$pos] ) ? $cntl->createAddressItem() : $addrItems[$pos] ); |
|
| 221 | + $addrItem = ( !isset( $addrItems[$pos] ) ? $cntl->createAddressItem() : $addrItems[$pos] ); |
|
| 222 | 222 | $cntl->addAddressItem( $addrItem->fromArray( $data ), $pos ); |
| 223 | 223 | unset( $addrItems[$pos] ); |
| 224 | 224 | } |
@@ -471,19 +471,22 @@ discard block |
||
| 471 | 471 | $disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false ); |
| 472 | 472 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY; |
| 473 | 473 | |
| 474 | - if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
| 474 | + if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) { |
|
| 475 | + // new address |
|
| 475 | 476 | { |
| 476 | 477 | $params = $view->param( 'ca_delivery', [] ); |
| 478 | + } |
|
| 477 | 479 | |
| 478 | 480 | if( ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) { |
| 479 | 481 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
| 480 | 482 | } |
| 481 | 483 | |
| 482 | 484 | $basketCtrl->addAddress( $type, $params, 0 ); |
| 483 | - } |
|
| 484 | - else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) // existing address |
|
| 485 | + } else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) { |
|
| 486 | + // existing address |
|
| 485 | 487 | { |
| 486 | 488 | $params = $view->param( 'ca_delivery_' . $option, [] ); |
| 489 | + } |
|
| 487 | 490 | |
| 488 | 491 | if( !empty( $params ) && ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) { |
| 489 | 492 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
@@ -498,8 +501,7 @@ discard block |
||
| 498 | 501 | } |
| 499 | 502 | |
| 500 | 503 | $basketCtrl->addAddress( $type, $params, 0 ); |
| 501 | - } |
|
| 502 | - else |
|
| 504 | + } else |
|
| 503 | 505 | { |
| 504 | 506 | $basketCtrl->deleteAddress( $type ); |
| 505 | 507 | } |
@@ -701,8 +703,7 @@ discard block |
||
| 701 | 703 | $invalid[$key] = $name; |
| 702 | 704 | unset( $params[$key] ); |
| 703 | 705 | } |
| 704 | - } |
|
| 705 | - else |
|
| 706 | + } else |
|
| 706 | 707 | { |
| 707 | 708 | unset( $params[$key] ); |
| 708 | 709 | } |