aimeos / ai-admin-jqadm

admin/jqadm/templates/common/partials/filter-default.php

Braces +5 added lines, -2 removed lines

@@ -36,8 +36,11 @@
 		<td>
 <?php	if( $pos < $cnt - 1 ) : ?>
 			<div class="fa fa-minus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Remove filter' ) ); ?>"></div>
-<?php	else : ?>
-			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) ); ?>"></div>
+<?php	else {
+	: ?>
+			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) );
+}
+?>"></div>
 <?php	endif; ?>
 		</td>
 		<td>

admin/jqadm/templates/product/item-stock-default.php

Braces +5 added lines, -2 removed lines

@@ -33,8 +33,11 @@
 <?php	foreach( $this->get( 'stockWarehouses', array() ) as $whid => $warehouse ) : ?>
 <?php		if( $whid == $this->get( 'stockData/product.stock.warehouseid/' . $idx ) ) : ?>
 							<option value="<?php echo $enc->attr( $whid ); ?>" selected="selected"><?php echo $enc->html( $warehouse->getLabel() ) ?></option>
-<?php		else : ?>
-							<option value="<?php echo $enc->attr( $whid ); ?>"><?php echo $enc->html( $warehouse->getLabel() ) ?></option>
+<?php		else {
+	: ?>
+							<option value="<?php echo $enc->attr( $whid );
+}
+?>"><?php echo $enc->html( $warehouse->getLabel() ) ?></option>
 <?php		endif; ?>
 <?php	endforeach; ?>
 						</select>

admin/jqadm/templates/product/item-price-default.php

Braces +5 added lines, -2 removed lines

@@ -42,8 +42,11 @@
 <?php	foreach( (array) $this->get( 'priceTypes', array() ) as $typeId => $typeItem ) : ?>
 <?php		if( $typeId == $this->get( 'priceData/price.typeid/' . $idx ) ) : ?>
 									<option value="<?php echo $enc->attr( $typeId ); ?>" selected="selected"><?php echo $enc->html( $typeItem->getLabel() ); ?></option>
-<?php		else : ?>
-									<option value="<?php echo $enc->attr( $typeId ); ?>"><?php echo $enc->html( $typeItem->getLabel() ); ?></option>
+<?php		else {
+	: ?>
+									<option value="<?php echo $enc->attr( $typeId );
+}
+?>"><?php echo $enc->html( $typeItem->getLabel() ); ?></option>
 <?php		endif; ?>
 <?php	endforeach; ?>
 								</select>

admin/jqadm/src/Admin/JQAdm/Product/Price/Standard.php

Braces +3 added lines, -6 removed lines

@@ -155,16 +155,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-price' => $e->getMessage() );
@@ -365,8 +363,7 @@ 
 
 				$item = $priceItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

admin/jqadm/src/Admin/JQAdm/Product/Text/Standard.php

Braces +3 added lines, -6 removed lines

@@ -157,16 +157,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-text' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-text' => $e->getMessage() );
@@ -401,8 +399,7 @@ 
 
 					$item = $textItem;
 					$item->setId( null );
-				}
-				else
+				} else
 				{
 					$litem = $listItems[$listid];
 					$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

admin/jqadm/src/Admin/JQAdm/Product/Selection/Standard.php

Braces +4 added lines, -8 removed lines

@@ -151,14 +151,12 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-selection' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-selection' => $e->getMessage() );
@@ -391,8 +389,7 @@ 
 				$code = $refItem->getCode();
 				$data[$code]['product.lists.id'] = $listid;
 				$data[$code]['product.id'] = $listItem->getRefId();
-			}
-			else
+			} else
 			{
 				$code = $refItem->getCode() . '_copy';
 				$data[$code]['product.lists.id'] = '';
@@ -523,8 +520,7 @@ 
 
 				$item = $prodItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

admin/jqadm/src/Admin/JQAdm/Product/Image/Standard.php

Braces +5 added lines, -10 removed lines

@@ -155,16 +155,14 @@ 
 			$mediaManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-image' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$mediaManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-image' => $e->getMessage() );
@@ -451,21 +449,18 @@ 
 				if( $mediaId !== '' && isset( $mediaItems[$mediaId] ) )
 				{
 					$item = $mediaItems[$mediaId];
-				}
-				else if( ( $file = $view->value( $files, $num ) ) !== null )
+				} else if( ( $file = $view->value( $files, $num ) ) !== null )
 				{
 					$item = $mediaItem;
 					$item->setId( null );
 
 					$cntl->add( $item, $file );
 					$num++;
-				}
-				else
+				} else
 				{
 					throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'No file uploaded for %1$d. new image', $num+1 ) );
 				}
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

admin/jqadm/src/Admin/JQAdm/Product/Category/Standard.php

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-category' => $e->getMessage() );

admin/jqadm/src/Admin/JQAdm/Product/Standard.php

Braces +13 added lines, -26 removed lines

@@ -87,13 +87,11 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;
@@ -124,13 +122,11 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;
@@ -166,14 +162,12 @@ 
 			$manager->commit();
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;
@@ -200,13 +194,11 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;
@@ -249,18 +241,15 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create()
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;
@@ -296,13 +285,11 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', array() ) + $error;

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{