aimeos / ai-client-html

client/html/src/Client/Html/Checkout/Standard/Process/Standard.php

Braces +3 added lines, -6 removed lines

@@ -267,14 +267,12 @@ 
 				$orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store();
 
 				$context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
-			}
-			elseif( $view->param( 'cp_payment', null ) !== null )
+			} elseif( $view->param( 'cp_payment', null ) !== null )
 			{
 				$parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL;
 				$orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false );
 				$basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false );
-			}
-			else
+			} else
 			{
 				return;
 			}
@@ -286,8 +284,7 @@ 
 				$view->standardProcessParams = $form->getValues();
 				$view->standardUrlExternal = $form->getExternal();
 				$view->standardHtml = $form->getHtml();
-			}
-			else // no payment service available
+			} else // no payment service available
 			{
 				$orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) );
 				$view->standardUrlNext = $this->getUrlConfirm( $view, [], [] );

client/html/templates/basket/standard/body-standard.php

Braces +5 added lines, -2 removed lines

@@ -122,10 +122,13 @@
 						href="<?= $enc->attr( $this->url( $checkoutTarget, $checkoutController, $checkoutAction, [], [], $checkoutConfig ) ); ?>">
 						<?= $enc->html( $this->translate( 'client', 'Checkout' ), $enc::TRUST ); ?>
 					</a>
-				<?php else : ?>
+				<?php else {
+	: ?>
 					<input type="hidden" name="<?= $enc->attr( $this->formparam( 'b_action' ) ) ?>" value="1" />
 					<button class="btn btn-primary btn-lg btn-action" type="submit">
-						<?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST ); ?>
+						<?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST );
+}
+?>
 					</button>
 				<?php endif; ?>
 

client/html/src/Client/Html/Basket/Bulk/Standard.php

Braces +2 added lines, -4 removed lines

@@ -146,8 +146,7 @@ 
 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 			$this->setBasketCached( $key, $html );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyBody( $html, $uid );
 		}
@@ -216,8 +215,7 @@ 
 			{
 				$this->logException( $e );
 			}
-		}
-		else
+		} else
 		{
 			$html = $this->modifyHeader( $html, $uid );
 		}

client/html/src/Client/Html/Basket/Standard/Standard.php

Braces +2 added lines, -4 removed lines

@@ -399,8 +399,7 @@ 
 			$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
 			$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
 			$config = $view->config( 'client/html/catalog/detail/url/config', [] );
-		}
-		else
+		} else
 		{
 			$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last/' . $site, [] );
 
@@ -466,8 +465,7 @@ 
 				$view->param( 'b_supplier' ),
 				$view->param( 'b_siteid' )
 			);
-		}
-		else
+		} else
 		{
 			$list = [];
 			$entries = (array) $view->param( 'b_prod', [] );

client/html/templates/checkout/standard/process-body-standard.php

Braces +17 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
 
 		return $name;
 	};
-}
-else
+} else
 {
 	$namefcn = function( $view, $key ) {
 		return $view->formparam( (array) $key );
@@ -93,9 +92,12 @@ 
 		<p class="order-notice">
 			<?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?>
 		</p>
-	<?php else : ?>
+	<?php else {
+	: ?>
 		<p class="order-notice">
-			<?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?>
+			<?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST );
+}
+?>
 		</p>
 	<?php endif; ?>
 
@@ -111,8 +113,11 @@ 
 				/>
 			<?php endforeach; ?>
 
-		<?php else : ?>
-			<input type="hidden" id="process-<?= $key; ?>"
+		<?php else {
+	: ?>
+			<input type="hidden" id="process-<?= $key;
+}
+?>"
 				name="<?= $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); ?>"
 				value="<?= $enc->attr( $item->getDefault() ); ?>"
 			/>
@@ -205,8 +210,7 @@ 
 						foreach( (array) $item->getDefault() as $key2 => $value ) {
 							$urlParams[] = $namefcn( $this, array( $item->getInternalCode(), $key2 ) ) . '=' . urlencode( $value );
 						}
-					}
-					else
+					} else
 					{
 						$urlParams[] = $namefcn( $this, $item->getInternalCode() ) . '=' . urlencode( $item->getDefault() );
 					}
@@ -220,9 +224,12 @@ 
 				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?>
 			</a>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<button class="btn btn-primary btn-lg btn-action">
-				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?>
+				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST );
+}
+?>
 			</button>
 
 		<?php endif; ?>

client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php

Braces +9 added lines, -9 removed lines

@@ -471,19 +471,22 @@ 
 		$disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false );
 		$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY;
 
-		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address
+		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) {
+			// new address
 		{
 			$params = $view->param( 'ca_delivery', [] );
+		}
 
 			if( ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) {
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
 			}
 
 			$ctrl->addAddress( $type, $params, 0 );
-		}
-		else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) // existing address
+		} else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) {
+			// existing address
 		{
 			$params = $view->param( 'ca_delivery_' . $option, [] );
+		}
 
 			if( !empty( $params ) && ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) {
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
@@ -496,13 +499,11 @@ 
 				$params = array_replace( $address->toArray(), $params + ['order.base.address.addressid' => $option] );
 				$addr = $ctrl->addAddress( $type, $params, 0 )->get()->getAddress( $type, 0 ); // sanitize address first
 				$custCntl->addAddressItem( $address->copyFrom( $addr ), $option )->store(); // update existing address
-			}
-			else
+			} else
 			{
 				$ctrl->addAddress( $type, $params, 0 );
 			}
-		}
-		else
+		} else
 		{
 			$ctrl->deleteAddress( $type );
 		}
@@ -704,8 +705,7 @@ 
 					$invalid[$key] = $name;
 					unset( $params[$key] );
 				}
-			}
-			else
+			} else
 			{
 				unset( $params[$key] );
 			}