Completed
Push — master ( 6e8b10...d2a4bf )
by Aimeos
04:17
created
admin/jqadm/src/Admin/JQAdm/Supplier/Address/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -118,14 +118,12 @@  discard block
 block discarded – undo
118 118
 			}
119 119
 
120 120
 			return;
121
-		}
122
-		catch( \Aimeos\MShop\Exception $e )
121
+		} catch( \Aimeos\MShop\Exception $e )
123 122
 		{
124 123
 			$error = array( 'supplier-item-address' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
125 124
 			$view->errors = $view->get( 'errors', [] ) + $error;
126 125
 			$this->logException( $e );
127
-		}
128
-		catch( \Exception $e )
126
+		} catch( \Exception $e )
129 127
 		{
130 128
 			$error = array( 'supplier-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
131 129
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -284,8 +282,7 @@  discard block
 block discarded – undo
284 282
 			{
285 283
 				$addrItem = $addrItems[$entry['supplier.address.id']];
286 284
 				unset( $addrItems[$entry['supplier.address.id']] );
287
-			}
288
-			else
285
+			} else
289 286
 			{
290 287
 				$addrItem = $manager->createItem();
291 288
 			}
Please login to merge, or discard this patch.
admin/jqadm/templates/supplier/item-address-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,9 +81,12 @@
 block discarded – undo
81 81
 								</select>
82 82
 							</div>
83 83
 						</div>
84
-					<?php else : ?>
84
+					<?php else {
85
+	: ?>
85 86
 						<input class="item-languageid" type="hidden"
86
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); ?>'.replace('idx', idx)"
87
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) );
88
+}
89
+?>'.replace('idx', idx)"
87 90
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
88 91
 					<?php endif; ?>
89 92
 					<div class="form-group row optional">
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Selection/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -135,14 +135,12 @@
 block discarded – undo
135 135
 			}
136 136
 
137 137
 			return;
138
-		}
139
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
140 139
 		{
141 140
 			$error = array( 'product-item-selection' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
142 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
143 142
 			$this->logException( $e );
144
-		}
145
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
146 144
 		{
147 145
 			$error = array( 'product-item-selection' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
148 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Bundle/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,14 +121,12 @@
 block discarded – undo
121 121
 			}
122 122
 
123 123
 			return;
124
-		}
125
-		catch( \Aimeos\MShop\Exception $e )
124
+		} catch( \Aimeos\MShop\Exception $e )
126 125
 		{
127 126
 			$error = array( 'product-item-bundle' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
128 127
 			$view->errors = $view->get( 'errors', [] ) + $error;
129 128
 			$this->logException( $e );
130
-		}
131
-		catch( \Exception $e )
129
+		} catch( \Exception $e )
132 130
 		{
133 131
 			$error = array( 'product-item-bundle' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
134 132
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Physical/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -118,14 +118,12 @@  discard block
 block discarded – undo
118 118
 			}
119 119
 
120 120
 			return;
121
-		}
122
-		catch( \Aimeos\MShop\Exception $e )
121
+		} catch( \Aimeos\MShop\Exception $e )
123 122
 		{
124 123
 			$error = array( 'product-item-physical' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
125 124
 			$view->errors = $view->get( 'errors', [] ) + $error;
126 125
 			$this->logException( $e );
127
-		}
128
-		catch( \Exception $e )
126
+		} catch( \Exception $e )
129 127
 		{
130 128
 			$error = array( 'product-item-physical' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
131 129
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -293,8 +291,7 @@  discard block
 block discarded – undo
293 291
 
294 292
 				$item->addPropertyItem( $propItem );
295 293
 
296
-			}
297
-			else
294
+			} else
298 295
 			{
299 296
 				$item->deletePropertyItems( $propItems );
300 297
 			}
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Download/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -137,14 +137,12 @@  discard block
 block discarded – undo
137 137
 			}
138 138
 
139 139
 			return;
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
140
+		} catch( \Aimeos\MShop\Exception $e )
142 141
 		{
143 142
 			$error = array( 'product-item-download' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 143
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 144
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
145
+		} catch( \Exception $e )
148 146
 		{
149 147
 			$error = array( 'product-item-download' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 148
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -402,8 +400,7 @@  discard block
 block discarded – undo
402 400
 
403 401
 				$data['time'] = $fs->time( $data['attribute.code'] );
404 402
 				$data['size'] = $fs->size( $data['attribute.code'] );
405
-			}
406
-			catch( \Exception $e ) { ; } // Show product even if file isn't available any more
403
+			} catch( \Exception $e ) { ; } // Show product even if file isn't available any more
407 404
 		}
408 405
 
409 406
 		return $data;
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Subscription/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -118,14 +118,12 @@  discard block
 block discarded – undo
118 118
 			}
119 119
 
120 120
 			return;
121
-		}
122
-		catch( \Aimeos\MShop\Exception $e )
121
+		} catch( \Aimeos\MShop\Exception $e )
123 122
 		{
124 123
 			$error = array( 'product-item-subscription' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
125 124
 			$view->errors = $view->get( 'errors', [] ) + $error;
126 125
 			$this->logException( $e );
127
-		}
128
-		catch( \Exception $e )
126
+		} catch( \Exception $e )
129 127
 		{
130 128
 			$error = array( 'product-item-subscription' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
131 129
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -361,8 +359,7 @@  discard block
 block discarded – undo
361 359
 			{
362 360
 				$list['product.lists.siteid'] = (string) $map[$attrId]->getSiteId();
363 361
 				$list['product.lists.id'] = (string) $map[$attrId]->getId();
364
-			}
365
-			else
362
+			} else
366 363
 			{
367 364
 				$list['product.lists.siteid'] = $siteId;
368 365
 				$list['product.lists.id'] = '';
Please login to merge, or discard this patch.
admin/jqadm/templates/order/item-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -322,8 +322,11 @@  discard block
 block discarded – undo
322 322
 										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div>
323 323
 									</div>
324 324
 								<?php endforeach; ?>
325
-							<?php else : ?>
326
-								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?>
325
+							<?php else {
326
+	: ?>
327
+								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) );
328
+}
329
+?>
327 330
 							<?php endif; ?>
328 331
 						</div>
329 332
 
@@ -731,8 +734,11 @@  discard block
 block discarded – undo
731 734
 								<div class="col-6 name">
732 735
 									<?php if( $basket->getPrice()->getTaxFlag() ) : ?>
733 736
 										<?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?>
734
-									<?php else : ?>
735
-										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?>
737
+									<?php else {
738
+	: ?>
739
+										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) );
740
+}
741
+?>
736 742
 									<?php endif; ?>
737 743
 								</div>
738 744
 								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div>
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Common/Decorator/Page.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,7 @@
 block discarded – undo
70 70
 			if( ( $rootItem = reset( $sitePath ) ) !== false ) {
71 71
 				$view->pageSiteTree = $siteManager->getTree( $rootItem->getId(), [], $level );
72 72
 			}
73
-		}
74
-		else
73
+		} else
75 74
 		{
76 75
 			$view->pageSiteList = [$view->pageSiteTree];
77 76
 		}
Please login to merge, or discard this patch.