Completed
Push — master ( 87e30f...7acda6 )
by Aimeos
03:03
created
admin/jqadm/templates/product/item-text-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -159,9 +159,12 @@  discard block
 block discarded – undo
159 159
 										<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
160 160
 									</div>
161 161
 								</div>
162
-							<?php else : ?>
162
+							<?php else {
163
+	: ?>
163 164
 								<input class="text-langid" type="hidden"
164
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
165
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) );
166
+}
167
+?>'.replace('_idx_', idx)"
165 168
 									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
166 169
 							<?php endif; ?>
167 170
 
@@ -181,9 +184,12 @@  discard block
 block discarded – undo
181 184
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
182 185
 									</div>
183 186
 								</div>
184
-							<?php else : ?>
187
+							<?php else {
188
+	: ?>
185 189
 								<input class="item-type" type="hidden"
186
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)"
190
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) );
191
+}
192
+?>'.replace('_idx_', idx)"
187 193
 									value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" />
188 194
 							<?php endif; ?>
189 195
 
@@ -231,9 +237,12 @@  discard block
 block discarded – undo
231 237
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
232 238
 									</div>
233 239
 								</div>
234
-							<?php else : ?>
240
+							<?php else {
241
+	: ?>
235 242
 								<input class="listitem-type" type="hidden"
236
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'product.lists.type' ) ) ); ?>'.replace('_idx_', idx)"
243
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'product.lists.type' ) ) );
244
+}
245
+?>'.replace('_idx_', idx)"
237 246
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
238 247
 							<?php endif; ?>
239 248
 
Please login to merge, or discard this patch.
admin/jqadm/templates/product/item-price-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -161,9 +161,12 @@  discard block
 block discarded – undo
161 161
 										</select>
162 162
 									</div>
163 163
 								</div>
164
-							<?php else : ?>
164
+							<?php else {
165
+	: ?>
165 166
 								<input class="item-currencyid" type="hidden"
166
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)"
167
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) );
168
+}
169
+?>'.replace('idx', idx)"
167 170
 									value="<?= $enc->attr( $currencies->getCode()->first() ) ?>" />
168 171
 							<?php endif; ?>
169 172
 
@@ -183,9 +186,12 @@  discard block
 block discarded – undo
183 186
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?>
184 187
 									</div>
185 188
 								</div>
186
-							<?php else : ?>
189
+							<?php else {
190
+	: ?>
187 191
 								<input class="item-type" type="hidden"
188
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)"
192
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) );
193
+}
194
+?>'.replace('idx', idx)"
189 195
 									value="<?= $enc->attr( $priceTypes->getCode()->first() ) ?>" />
190 196
 							<?php endif; ?>
191 197
 
@@ -233,9 +239,12 @@  discard block
 block discarded – undo
233 239
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
234 240
 									</div>
235 241
 								</div>
236
-							<?php else : ?>
242
+							<?php else {
243
+	: ?>
237 244
 								<input class="listitem-type" type="hidden"
238
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)"
245
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'product.lists.type' ) ) );
246
+}
247
+?>'.replace('idx', idx)"
239 248
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
240 249
 							<?php endif; ?>
241 250
 
Please login to merge, or discard this patch.
admin/jqadm/templates/catalog/item-media-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -123,9 +123,12 @@  discard block
 block discarded – undo
123 123
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?>
124 124
 									</div>
125 125
 								</div>
126
-							<?php else : ?>
126
+							<?php else {
127
+	: ?>
127 128
 								<input class="item-type" type="hidden"
128
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); ?>'.replace('_idx_', idx)"
129
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) );
130
+}
131
+?>'.replace('_idx_', idx)"
129 132
 									value="<?= $enc->attr( $mediaTypes->getCode()->first() ) ?>" />
130 133
 							<?php endif; ?>
131 134
 
@@ -188,9 +191,12 @@  discard block
 block discarded – undo
188 191
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
189 192
 									</div>
190 193
 								</div>
191
-							<?php else : ?>
194
+							<?php else {
195
+	: ?>
192 196
 								<input class="listitem-type" type="hidden"
193
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'catalog.lists.type'] ) ); ?>'.replace('_idx_', idx)"
197
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'catalog.lists.type'] ) );
198
+}
199
+?>'.replace('_idx_', idx)"
194 200
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
195 201
 							<?php endif; ?>
196 202
 							<div class="form-group row optional">
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
@@ -140,9 +140,12 @@  discard block
 block discarded – undo
140 140
 										<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
141 141
 									</div>
142 142
 								</div>
143
-							<?php else : ?>
143
+							<?php else {
144
+	: ?>
144 145
 								<input class="text-langid" type="hidden"
145
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
146
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) );
147
+}
148
+?>'.replace('_idx_', idx)"
146 149
 									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
147 150
 							<?php endif; ?>
148 151
 
@@ -162,9 +165,12 @@  discard block
 block discarded – undo
162 165
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
163 166
 									</div>
164 167
 								</div>
165
-							<?php else : ?>
168
+							<?php else {
169
+	: ?>
166 170
 								<input class="item-type" type="hidden"
167
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)"
171
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) );
172
+}
173
+?>'.replace('_idx_', idx)"
168 174
 									value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" />
169 175
 							<?php endif; ?>
170 176
 
@@ -212,9 +218,12 @@  discard block
 block discarded – undo
212 218
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
213 219
 									</div>
214 220
 								</div>
215
-							<?php else : ?>
221
+							<?php else {
222
+	: ?>
216 223
 								<input class="listitem-type" type="hidden"
217
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'catalog.lists.type' ) ) ); ?>'.replace('_idx_', idx)"
224
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'catalog.lists.type' ) ) );
225
+}
226
+?>'.replace('_idx_', idx)"
218 227
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
219 228
 							<?php endif; ?>
220 229
 
Please login to merge, or discard this patch.
admin/jqadm/templates/attribute/item-media-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -123,9 +123,12 @@  discard block
 block discarded – undo
123 123
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?>
124 124
 									</div>
125 125
 								</div>
126
-							<?php else : ?>
126
+							<?php else {
127
+	: ?>
127 128
 								<input class="item-type" type="hidden"
128
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); ?>'.replace('_idx_', idx)"
129
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) );
130
+}
131
+?>'.replace('_idx_', idx)"
129 132
 									value="<?= $enc->attr( $mediaTypes->getCode()->first() ) ?>" />
130 133
 							<?php endif; ?>
131 134
 
@@ -188,9 +191,12 @@  discard block
 block discarded – undo
188 191
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
189 192
 									</div>
190 193
 								</div>
191
-							<?php else : ?>
194
+							<?php else {
195
+	: ?>
192 196
 								<input class="listitem-type" type="hidden"
193
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'attribute.lists.type'] ) ); ?>'.replace('_idx_', idx)"
197
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'attribute.lists.type'] ) );
198
+}
199
+?>'.replace('_idx_', idx)"
194 200
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
195 201
 							<?php endif; ?>
196 202
 							<div class="form-group row optional">
Please login to merge, or discard this patch.
admin/jqadm/templates/attribute/item-text-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -140,9 +140,12 @@  discard block
 block discarded – undo
140 140
 										<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
141 141
 									</div>
142 142
 								</div>
143
-							<?php else : ?>
143
+							<?php else {
144
+	: ?>
144 145
 								<input class="text-langid" type="hidden"
145
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
146
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.languageid' ) ) );
147
+}
148
+?>'.replace('_idx_', idx)"
146 149
 									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
147 150
 							<?php endif; ?>
148 151
 
@@ -162,9 +165,12 @@  discard block
 block discarded – undo
162 165
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
163 166
 									</div>
164 167
 								</div>
165
-							<?php else : ?>
168
+							<?php else {
169
+	: ?>
166 170
 								<input class="item-type" type="hidden"
167
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)"
171
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'text.type' ) ) );
172
+}
173
+?>'.replace('_idx_', idx)"
168 174
 									value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" />
169 175
 							<?php endif; ?>
170 176
 
@@ -212,9 +218,12 @@  discard block
 block discarded – undo
212 218
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
213 219
 									</div>
214 220
 								</div>
215
-							<?php else : ?>
221
+							<?php else {
222
+	: ?>
216 223
 								<input class="listitem-type" type="hidden"
217
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'attribute.lists.type' ) ) ); ?>'.replace('_idx_', idx)"
224
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'attribute.lists.type' ) ) );
225
+}
226
+?>'.replace('_idx_', idx)"
218 227
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
219 228
 							<?php endif; ?>
220 229
 
Please login to merge, or discard this patch.
admin/jqadm/templates/attribute/item-price-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -161,9 +161,12 @@  discard block
 block discarded – undo
161 161
 										</select>
162 162
 									</div>
163 163
 								</div>
164
-							<?php else : ?>
164
+							<?php else {
165
+	: ?>
165 166
 								<input class="item-currencyid" type="hidden"
166
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)"
167
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) );
168
+}
169
+?>'.replace('idx', idx)"
167 170
 									value="<?= $enc->attr( $currencies->getCode()->first() ) ?>" />
168 171
 							<?php endif; ?>
169 172
 
@@ -183,9 +186,12 @@  discard block
 block discarded – undo
183 186
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?>
184 187
 									</div>
185 188
 								</div>
186
-							<?php else : ?>
189
+							<?php else {
190
+	: ?>
187 191
 								<input class="item-type" type="hidden"
188
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)"
192
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) );
193
+}
194
+?>'.replace('idx', idx)"
189 195
 									value="<?= $enc->attr( $priceTypes->getCode()->first() ) ?>" />
190 196
 							<?php endif; ?>
191 197
 
@@ -233,9 +239,12 @@  discard block
 block discarded – undo
233 239
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
234 240
 									</div>
235 241
 								</div>
236
-							<?php else : ?>
242
+							<?php else {
243
+	: ?>
237 244
 								<input class="listitem-type" type="hidden"
238
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
245
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) );
246
+}
247
+?>'.replace('idx', idx)"
239 248
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
240 249
 							<?php endif; ?>
241 250
 
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
@@ -87,9 +87,12 @@
 block discarded – undo
87 87
 										</select>
88 88
 									</div>
89 89
 								</div>
90
-							<?php else : ?>
90
+							<?php else {
91
+	: ?>
91 92
 								<input class="item-languageid" type="hidden"
92
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
93
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) );
94
+}
95
+?>'.replace('idx', idx)"
93 96
 									value="<?= $enc->attr( $languages->getCode()->first() ); ?>" />
94 97
 							<?php endif; ?>
95 98
 							<div class="form-group row optional">
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Base.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -645,8 +645,7 @@
 block discarded – undo
645 645
 		{
646 646
 			$view->errors = array_merge( $view->get( 'errors', [] ), [$e->getMessage()] );
647 647
 			return $this;
648
-		}
649
-		elseif( $e instanceof \Aimeos\MShop\Exception )
648
+		} elseif( $e instanceof \Aimeos\MShop\Exception )
650 649
 		{
651 650
 			$view->errors = array_merge( $view->get( 'errors', [] ), [$i18n->dt( 'mshop', $e->getMessage() )] );
652 651
 			return $this;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 	/**
570 570
 	 * Returns a map of code/item pairs
571 571
 	 *
572
-	 * @param \Aimeos\MShop\Common\Item\Type\Iface[] $items Associative list of type items
572
+	 * @param \Aimeos\Map $items Associative list of type items
573 573
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface[] Associative list of codes as keys and items as values
574 574
 	 * @deprecated 2021.01
575 575
 	 */
@@ -589,9 +589,7 @@  discard block
 block discarded – undo
589 589
 	 * Adds a redirect to the response for the next action
590 590
 	 *
591 591
 	 * @param string $resource Resource name
592
-	 * @param string|null $action Next action
593 592
 	 * @param string|null $id ID of the next resource item
594
-	 * @param string|null $act Current action name
595 593
 	 * @return string|null Returns value for the actions
596 594
 	 */
597 595
 	protected function redirect( string $resource, ?string $action, string $id = null,
Please login to merge, or discard this patch.