Completed
Push — master ( 0229de...f71bfb )
by Aimeos
04:41
created
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.
admin/jqadm/templates/catalog/item-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,9 +87,12 @@
 block discarded – undo
87 87
 		<div class="item-actions">
88 88
 			<?php if( isset( $this->itemData ) ) : ?>
89 89
 				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
90
-			<?php else : ?>
90
+			<?php else {
91
+	: ?>
91 92
 				<span class="placeholder">&nbsp;</span>
92
-			<?php endif; ?>
93
+			<?php endif;
94
+}
95
+?>
93 96
 		</div>
94 97
 	</nav>
95 98
 
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Locale/Language/Standard.php 1 patch
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -51,14 +51,12 @@  discard block
 block discarded – undo
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54
-		}
55
-		catch( \Aimeos\MShop\Exception $e )
54
+		} catch( \Aimeos\MShop\Exception $e )
56 55
 		{
57 56
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58 57
 			$view->errors = $view->get( 'errors', [] ) + $error;
59 58
 			$this->logException( $e );
60
-		}
61
-		catch( \Exception $e )
59
+		} catch( \Exception $e )
62 60
 		{
63 61
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64 62
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -96,14 +94,12 @@  discard block
 block discarded – undo
96 94
 				$view->tabindex = ++$idx + 1;
97 95
 				$view->itemBody .= $client->create();
98 96
 			}
99
-		}
100
-		catch( \Aimeos\MShop\Exception $e )
97
+		} catch( \Aimeos\MShop\Exception $e )
101 98
 		{
102 99
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
103 100
 			$view->errors = $view->get( 'errors', [] ) + $error;
104 101
 			$this->logException( $e );
105
-		}
106
-		catch( \Exception $e )
102
+		} catch( \Exception $e )
107 103
 		{
108 104
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
109 105
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -144,14 +140,12 @@  discard block
 block discarded – undo
144 140
 
145 141
 			$this->nextAction( $view, 'search', 'locale/language', null, 'delete' );
146 142
 			return;
147
-		}
148
-		catch( \Aimeos\MShop\Exception $e )
143
+		} catch( \Aimeos\MShop\Exception $e )
149 144
 		{
150 145
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
151 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
152 147
 			$this->logException( $e );
153
-		}
154
-		catch( \Exception $e )
148
+		} catch( \Exception $e )
155 149
 		{
156 150
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
157 151
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -192,14 +186,12 @@  discard block
 block discarded – undo
192 186
 				$view->tabindex = ++$idx + 1;
193 187
 				$view->itemBody .= $client->get();
194 188
 			}
195
-		}
196
-		catch( \Aimeos\MShop\Exception $e )
189
+		} catch( \Aimeos\MShop\Exception $e )
197 190
 		{
198 191
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
199 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
200 193
 			$this->logException( $e );
201
-		}
202
-		catch( \Exception $e )
194
+		} catch( \Exception $e )
203 195
 		{
204 196
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
205 197
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -238,18 +230,15 @@  discard block
 block discarded – undo
238 230
 
239 231
 			$this->nextAction( $view, $view->param( 'next' ), 'locale/language', $view->item->getId(), 'save' );
240 232
 			return;
241
-		}
242
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
233
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
243 234
 		{
244 235
 			// fall through to create
245
-		}
246
-		catch( \Aimeos\MShop\Exception $e )
236
+		} catch( \Aimeos\MShop\Exception $e )
247 237
 		{
248 238
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
249 239
 			$view->errors = $view->get( 'errors', [] ) + $error;
250 240
 			$this->logException( $e );
251
-		}
252
-		catch( \Exception $e )
241
+		} catch( \Exception $e )
253 242
 		{
254 243
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
255 244
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -291,14 +280,12 @@  discard block
 block discarded – undo
291 280
 			foreach( $this->getSubClients() as $client ) {
292 281
 				$view->itemBody .= $client->search();
293 282
 			}
294
-		}
295
-		catch( \Aimeos\MShop\Exception $e )
283
+		} catch( \Aimeos\MShop\Exception $e )
296 284
 		{
297 285
 			$error = array( 'locale-language-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
298 286
 			$view->errors = $view->get( 'errors', [] ) + $error;
299 287
 			$this->logException( $e );
300
-		}
301
-		catch( \Exception $e )
288
+		} catch( \Exception $e )
302 289
 		{
303 290
 			$error = array( 'locale-language-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
304 291
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
admin/jqadm/templates/supplier/item-text-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -115,9 +115,12 @@  discard block
 block discarded – undo
115 115
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
116 116
 							</div>
117 117
 						</div>
118
-					<?php else : ?>
118
+					<?php else {
119
+	: ?>
119 120
 						<input class="text-langid" type="hidden"
120
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
121
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
122
+}
123
+?>'.replace('idx', idx)"
121 124
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
122 125
 					<?php endif; ?>
123 126
 
@@ -146,9 +149,12 @@  discard block
 block discarded – undo
146 149
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
147 150
 							</div>
148 151
 						</div>
149
-					<?php else : ?>
152
+					<?php else {
153
+	: ?>
150 154
 						<input class="item-type" type="hidden"
151
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
155
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) );
156
+}
157
+?>'.replace('idx', idx)"
152 158
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
153 159
 					<?php endif; ?>
154 160
 
@@ -204,9 +210,12 @@  discard block
 block discarded – undo
204 210
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
205 211
 							</div>
206 212
 						</div>
207
-					<?php else : ?>
213
+					<?php else {
214
+	: ?>
208 215
 						<input class="listitem-type" type="hidden"
209
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.type' ) ) ); ?>'.replace('idx', idx)"
216
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.type' ) ) );
217
+}
218
+?>'.replace('idx', idx)"
210 219
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
211 220
 							v-model="items[idx]['supplier.lists.type']" />
212 221
 					<?php endif; ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/catalog/item-text-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -115,9 +115,12 @@  discard block
 block discarded – undo
115 115
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
116 116
 							</div>
117 117
 						</div>
118
-					<?php else : ?>
118
+					<?php else {
119
+	: ?>
119 120
 						<input class="text-langid" type="hidden"
120
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
121
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
122
+}
123
+?>'.replace('idx', idx)"
121 124
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
122 125
 					<?php endif; ?>
123 126
 
@@ -146,9 +149,12 @@  discard block
 block discarded – undo
146 149
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
147 150
 							</div>
148 151
 						</div>
149
-					<?php else : ?>
152
+					<?php else {
153
+	: ?>
150 154
 						<input class="item-type" type="hidden"
151
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
155
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) );
156
+}
157
+?>'.replace('idx', idx)"
152 158
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
153 159
 					<?php endif; ?>
154 160
 
@@ -204,9 +210,12 @@  discard block
 block discarded – undo
204 210
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
205 211
 							</div>
206 212
 						</div>
207
-					<?php else : ?>
213
+					<?php else {
214
+	: ?>
208 215
 						<input class="listitem-type" type="hidden"
209
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.type' ) ) ); ?>'.replace('idx', idx)"
216
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.type' ) ) );
217
+}
218
+?>'.replace('idx', idx)"
210 219
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
211 220
 							v-model="items[idx]['catalog.lists.type']" />
212 221
 					<?php endif; ?>
Please login to merge, or discard this patch.