Completed
Push — master ( 8b8334...2005c2 )
by Aimeos
07:11
created
client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php 1 patch
Braces   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -286,8 +286,7 @@  discard block
 block discarded – undo
286 286
 			$this->setAddress( $view );
287 287
 
288 288
 			parent::process();
289
-		}
290
-		catch( \Aimeos\Controller\Frontend\Exception $e )
289
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
291 290
 		{
292 291
 			$view->deliveryError = $e->getErrorList();
293 292
 			throw $e;
@@ -481,9 +480,11 @@  discard block
 block discarded – undo
481 480
 		$disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false );
482 481
 		$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY;
483 482
 
484
-		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address
483
+		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) {
484
+		    // new address
485 485
 		{
486 486
 			$params = $view->param( 'ca_delivery', array() );
487
+		}
487 488
 			$invalid = $this->checkFields( $params );
488 489
 
489 490
 			if( count( $invalid ) > 0 )
@@ -493,10 +494,11 @@  discard block
 block discarded – undo
493 494
 			}
494 495
 
495 496
 			$basketCtrl->setAddress( $type, $params );
496
-		}
497
-		else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) // existing address
497
+		} else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) {
498
+		    // existing address
498 499
 		{
499 500
 			$customerAddressManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
501
+		}
500 502
 			$address = $customerAddressManager->getItem( $option );
501 503
 
502 504
 			if( $address->getParentId() != $context->getUserId() ) {
@@ -526,8 +528,7 @@  discard block
 block discarded – undo
526 528
 			}
527 529
 
528 530
 			$basketCtrl->setAddress( $type, $address );
529
-		}
530
-		else
531
+		} else
531 532
 		{
532 533
 			$basketCtrl->setAddress( $type, null );
533 534
 		}
@@ -773,8 +774,7 @@  discard block
 block discarded – undo
773 774
 					$invalid[$key] = $name;
774 775
 					unset( $params[$key] );
775 776
 				}
776
-			}
777
-			else
777
+			} else
778 778
 			{
779 779
 				unset( $params[$key] );
780 780
 			}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Address/Billing/Standard.php 1 patch
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -274,8 +274,7 @@  discard block
 block discarded – undo
274 274
 			$this->setAddress( $view );
275 275
 
276 276
 			parent::process();
277
-		}
278
-		catch( \Aimeos\Controller\Frontend\Exception $e )
277
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
279 278
 		{
280 279
 			$view->billingError = $e->getErrorList();
281 280
 			throw $e;
@@ -550,9 +549,11 @@  discard block
 block discarded – undo
550 549
 		$disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false );
551 550
 		$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT;
552 551
 
553
-		if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address
552
+		if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) {
553
+		    // new address
554 554
 		{
555 555
 			$params = $view->param( 'ca_billing', array() );
556
+		}
556 557
 			$invalid = $this->checkFields( $params );
557 558
 
558 559
 			if( count( $invalid ) > 0 )
@@ -562,8 +563,7 @@  discard block
 block discarded – undo
562 563
 			}
563 564
 
564 565
 			$basketCtrl->setAddress( $type, $params );
565
-		}
566
-		else // existing address
566
+		} else // existing address
567 567
 		{
568 568
 			$item = $this->getCustomerItem( $option );
569 569
 			$customerManager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
@@ -837,8 +837,7 @@  discard block
 block discarded – undo
837 837
 					$invalid[$key] = $name;
838 838
 					unset( $params[$key] );
839 839
 				}
840
-			}
841
-			else
840
+			} else
842 841
 			{
843 842
 				unset( $params[$key] );
844 843
 			}
Please login to merge, or discard this patch.