aimeos / ai-client-html

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

Braces +3 added lines, -6 removed lines

@@ -268,14 +268,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;
 			}
@@ -285,8 +283,7 @@ 
 				$orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) );
 				$view->standardUrlNext = $this->getUrlConfirm( $view, [], [] );
 				$view->standardMethod = 'POST';
-			}
-			else // no payment service available
+			} else // no payment service available
 			{
 				$view = $this->addFormData( $view, $form );
 			}

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

Braces +5 added lines, -2 removed lines

@@ -83,8 +83,11 @@
 						$this->config( 'client/html/checkout/standard/summary/address', 'common/summary/address-standard' ),
 						['addresses' => $addresses, 'type' => 'delivery']
 					); ?>
-				<?php else : ?>
-					<?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?>
+				<?php else {
+	: ?>
+					<?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST );
+}
+?>
 				<?php endif; ?>
 			</div>
 		</div>

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

Braces +5 added lines, -2 removed lines

@@ -41,14 +41,17 @@
 									$this->translate( 'currency', $price->getCurrencyId() )
 								) ); ?>
 							</span>
-						<?php else : ?>
+						<?php else {
+	: ?>
 							<span class="price-value">
 								<?= $enc->html( sprintf(
 									/// Price format with price value (%1$s) and currency (%2$s)
 									$this->translate( 'client/code', 'price:default', null, 0, false ) ?: $this->translate( 'client', '%1$s %2$s' ),
 									$this->number( $price->getCosts() > 0 ? $price->getCosts() : 0, $price->getPrecision() ),
 									$this->translate( 'currency', $price->getCurrencyId() )
-								) ); ?>
+								) );
+}
+?>
 							</span>
 						<?php endif; ?>
 

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

Braces +5 added lines, -2 removed lines

@@ -219,9 +219,12 @@
 		$context = $this->getContext();
 		$cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' );
 
-		try {
+		try
+		{
 			$id = $cntl->find( $addr->getEmail() )->getId();
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$id = $new ? $cntl->add( $addr->toArray() )->store()->get()->getId() : null;
 		}
 

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

Braces +5 added lines, -5 removed lines

@@ -645,15 +645,16 @@ 
 		$disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false );
 		$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT;
 
-		if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address
+		if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) {
+			// new address
 		{
 			$params = $view->param( 'ca_billing', [] );
+		}
 
 			if( ( $view->addressBillingError = $this->checkFields( $params ) ) !== [] ) {
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one billing address part is missing or invalid' ) );
 			}
-		}
-		else // existing address
+		} else // existing address
 		{
 			$params = $view->param( 'ca_billing_' . $option, [] ) + $view->param( 'ca_extra', [] );
 
@@ -797,8 +798,7 @@ 
 					$invalid[$key] = $name;
 					unset( $params[$key] );
 				}
-			}
-			else
+			} else
 			{
 				unset( $params[$key] );
 			}

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

Braces +9 added lines, -9 removed lines

@@ -524,19 +524,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->addressDeliveryError = $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' ) ) !== 'like' ) // existing address
+		} else if( ( $option = $view->param( 'ca_deliveryoption' ) ) !== 'like' ) {
+			// existing address
 		{
 			$params = $view->param( 'ca_delivery_' . $option, [] );
+		}
 
 			if( !empty( $params ) && ( $view->addressDeliveryError = $this->checkFields( $params ) ) !== [] ) {
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
@@ -549,13 +552,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 );
 		}
@@ -787,8 +788,7 @@ 
 					$invalid[$key] = $name;
 					unset( $params[$key] );
 				}
-			}
-			else
+			} else
 			{
 				unset( $params[$key] );
 			}

client/html/templates/account/subscription/lists-body-standard.php

Braces +5 added lines, -2 removed lines

@@ -129,8 +129,11 @@
 									<span class="value col-7">
 										<?php if( $interval = $this->get( 'listsIntervalItems', map() )->get( $item->getInterval() ) ) : ?>
 											<?= $enc->html( $interval->getName(), $enc::TRUST ); ?>
-										<?php else : ?>
-											<?= $enc->html( $item->getInterval(), $enc::TRUST ); ?>
+										<?php else {
+	: ?>
+											<?= $enc->html( $item->getInterval(), $enc::TRUST );
+}
+?>
 										<?php endif; ?>
 									</span>
 								</div>

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

Braces +15 added lines, -6 removed lines

@@ -57,9 +57,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; ?>
 
@@ -72,8 +75,11 @@ 
 				<input type="hidden" id="process-<?= $id; ?>" value="<?= $enc->attr( $value ); ?>"
 					name="<?= $enc->attr( $this->formparam( [$item->getInternalCode(), $key], $prefix ) ); ?>"
 				/>
-			<?php else : ?>
-				<input type="hidden" id="process-<?= $id; ?>" value="<?= $enc->attr( $value ); ?>"
+			<?php else {
+	: ?>
+				<input type="hidden" id="process-<?= $id;
+}
+?>" value="<?= $enc->attr( $value ); ?>"
 					name="<?= $enc->attr( $this->formparam( $item->getInternalCode(), $prefix ) ); ?>"
 				/>
 			<?php endif; ?>
@@ -161,10 +167,13 @@ 
 				<?= $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/Catalog/Filter/Attribute/Standard.php

Braces +2 added lines, -4 removed lines

@@ -319,13 +319,11 @@
 			{
 				$item = $item->set( 'checked', true );
 				unset( $attrparams['f_attrid'][$key] );
-			}
-			elseif( ( $key = array_search( $id, $oneIds ) ) !== false )
+			} elseif( ( $key = array_search( $id, $oneIds ) ) !== false )
 			{
 				$item = $item->set( 'checked', true );
 				unset( $attrparams['f_oneid'][$key] );
-			}
-			elseif( ( $key = array_search( $id, $optIds ) ) !== false )
+			} elseif( ( $key = array_search( $id, $optIds ) ) !== false )
 			{
 				$item = $item->set( 'checked', true );
 				unset( $attrparams['f_optid'][$key] );