Passed
Push — master ( 6f3baa...9e2f96 )
by Aimeos
18:50 queued 15:43
created
src/Client/Html/Checkout/Standard/Process/Account/Standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -221,9 +221,12 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Client/Html/Checkout/Standard/Process/Standard.php 1 patch
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -268,28 +268,27 @@
 block discarded – undo
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
 			}
Please login to merge, or discard this patch.
src/Client/Html/Checkout/Standard/Address/Billing/Standard.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -645,15 +645,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 			}
Please login to merge, or discard this patch.
src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php 1 patch
Braces   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -524,19 +524,22 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 			}
Please login to merge, or discard this patch.
src/Client/Html/Checkout/Confirm/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -322,8 +322,7 @@
 block discarded – undo
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 );
Please login to merge, or discard this patch.
src/Client/Html/Basket/Standard/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -181,8 +181,7 @@
 block discarded – undo
181 181
 				array_filter( (array) $view->param( 'b_attrcustid', [] ) ),
182 182
 				(string) $view->param( 'b_stocktype', 'default' )
183 183
 			);
184
-		}
185
-		else
184
+		} else
186 185
 		{
187 186
 			foreach( (array) $view->param( 'b_prod', [] ) as $values )
188 187
 			{
Please login to merge, or discard this patch.