Completed
Push — master ( 0229de...f71bfb )
by Aimeos
04:41
created
admin/jqadm/src/Admin/JQAdm/Type/Customer/Property/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( 'type-customer-property-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( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64 62
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -100,14 +98,12 @@  discard block
 block discarded – undo
100 98
 				$view->tabindex = ++$idx + 1;
101 99
 				$view->itemBody .= $client->create();
102 100
 			}
103
-		}
104
-		catch( \Aimeos\MShop\Exception $e )
101
+		} catch( \Aimeos\MShop\Exception $e )
105 102
 		{
106 103
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
107 104
 			$view->errors = $view->get( 'errors', [] ) + $error;
108 105
 			$this->logException( $e );
109
-		}
110
-		catch( \Exception $e )
106
+		} catch( \Exception $e )
111 107
 		{
112 108
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
113 109
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -148,14 +144,12 @@  discard block
 block discarded – undo
148 144
 
149 145
 			$this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' );
150 146
 			return;
151
-		}
152
-		catch( \Aimeos\MShop\Exception $e )
147
+		} catch( \Aimeos\MShop\Exception $e )
153 148
 		{
154 149
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
155 150
 			$view->errors = $view->get( 'errors', [] ) + $error;
156 151
 			$this->logException( $e );
157
-		}
158
-		catch( \Exception $e )
152
+		} catch( \Exception $e )
159 153
 		{
160 154
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
161 155
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -196,14 +190,12 @@  discard block
 block discarded – undo
196 190
 				$view->tabindex = ++$idx + 1;
197 191
 				$view->itemBody .= $client->get();
198 192
 			}
199
-		}
200
-		catch( \Aimeos\MShop\Exception $e )
193
+		} catch( \Aimeos\MShop\Exception $e )
201 194
 		{
202 195
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
203 196
 			$view->errors = $view->get( 'errors', [] ) + $error;
204 197
 			$this->logException( $e );
205
-		}
206
-		catch( \Exception $e )
198
+		} catch( \Exception $e )
207 199
 		{
208 200
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
209 201
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -241,18 +233,15 @@  discard block
 block discarded – undo
241 233
 
242 234
 			$this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' );
243 235
 			return;
244
-		}
245
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
236
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
246 237
 		{
247 238
 			// fall through to create
248
-		}
249
-		catch( \Aimeos\MShop\Exception $e )
239
+		} catch( \Aimeos\MShop\Exception $e )
250 240
 		{
251 241
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
252 242
 			$view->errors = $view->get( 'errors', [] ) + $error;
253 243
 			$this->logException( $e );
254
-		}
255
-		catch( \Exception $e )
244
+		} catch( \Exception $e )
256 245
 		{
257 246
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
258 247
 			$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( 'type-customer-property-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( 'type-customer-property-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/src/Admin/JQAdm/Attribute/Property/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -121,14 +121,12 @@  discard block
 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( 'attribute-item-property' => $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( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
134 132
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -320,8 +318,7 @@  discard block
 block discarded – undo
320 318
 			{
321 319
 				$propItem = $propItems[$entry['attribute.property.id']];
322 320
 				unset( $propItems[$entry['attribute.property.id']] );
323
-			}
324
-			else
321
+			} else
325 322
 			{
326 323
 				$propItem = $manager->createItem();
327 324
 			}
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Property/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -305,8 +305,7 @@
 block discarded – undo
305 305
 			{
306 306
 				$propItem = $propItems[$entry['product.property.id']];
307 307
 				unset( $propItems[$entry['product.property.id']] );
308
-			}
309
-			else
308
+			} else
310 309
 			{
311 310
 				$propItem = $manager->createItem();
312 311
 			}
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Customer/Property/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -121,14 +121,12 @@  discard block
 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( 'customer-item-property' => $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( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
134 132
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -299,8 +297,7 @@  discard block
 block discarded – undo
299 297
 			{
300 298
 				$propItem = $propItems[$entry['customer.property.id']];
301 299
 				unset( $propItems[$entry['customer.property.id']] );
302
-			}
303
-			else
300
+			} else
304 301
 			{
305 302
 				$propItem = $manager->createItem();
306 303
 			}
Please login to merge, or discard this patch.
admin/jqadm/templates/customer/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', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
87
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.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/Customer/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( 'customer-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( 'customer-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['customer.address.id']];
286 284
 				unset( $addrItems[$entry['customer.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/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.