@@ -140,9 +140,12 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -123,9 +123,12 @@ discard block |
||
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 |
||
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"> |
@@ -140,9 +140,12 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -161,9 +161,12 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -87,9 +87,12 @@ |
||
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"> |
@@ -645,8 +645,7 @@ |
||
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; |
@@ -445,8 +445,7 @@ |
||
445 | 445 | $listItem = \Aimeos\MShop::create( $context, 'product' )->createListItem(); |
446 | 446 | $item = $item->addListItem( 'attribute', $listItem->setType( 'custom' ), $attrItem ); |
447 | 447 | } |
448 | - } |
|
449 | - else |
|
448 | + } else |
|
450 | 449 | { |
451 | 450 | if( ( $litem = $item->getListItem( 'attribute', 'custom', $attrItem->getId(), false ) ) !== null ) { |
452 | 451 | $item = $item->deleteListItem( 'attribute', $litem ); |
@@ -35,8 +35,11 @@ |
||
35 | 35 | <span class="navbar-label"> |
36 | 36 | <?php if( $this->get( 'itemData/locale.id' ) ) : ?> |
37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
38 | - <?php else : ?> |
|
39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
41 | +} |
|
42 | +?> |
|
40 | 43 | <?php endif; ?> |
41 | 44 | </span> |
42 | 45 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?></span> |
@@ -45,8 +45,11 @@ |
||
45 | 45 | <span class="navbar-label"> |
46 | 46 | <?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
47 | 47 | <?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ); ?> |
48 | - <?php else : ?> |
|
49 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
48 | + <?php else { |
|
49 | + : ?> |
|
50 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
51 | +} |
|
52 | +?> |
|
50 | 53 | <?php endif; ?> |
51 | 54 | </span> |
52 | 55 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/subscription.siteid' ) ) ); ?></span> |