@@ -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 |
@@ -173,9 +173,12 @@ |
||
173 | 173 | </option> |
174 | 174 | <?php endforeach; ?> |
175 | 175 | </select> |
176 | - <?php else : ?> |
|
176 | + <?php else { |
|
177 | + : ?> |
|
177 | 178 | <input class="item-languageid" type="hidden" |
178 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" |
|
179 | + name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); |
|
180 | +} |
|
181 | +?>" |
|
179 | 182 | value="<?= $enc->attr( $languages->getCode()->first() ); ?>" /> |
180 | 183 | <?php endif; ?> |
181 | 184 | </div> |
@@ -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"> |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2020 |
6 | 6 | */ |
7 | 7 | |
8 | -$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
9 | -{ |
|
8 | +$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
10 | 9 | if( isset( $orders[$item->getBaseId()] ) ) |
11 | 10 | { |
12 | 11 | $price = $orders[$item->getBaseId()]->getPrice(); |
@@ -15,8 +14,7 @@ discard block |
||
15 | 14 | }; |
16 | 15 | |
17 | 16 | |
18 | -$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
19 | -{ |
|
17 | +$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
20 | 18 | if( isset( $orders[$item->getBaseId()] ) ) |
21 | 19 | { |
22 | 20 | $addresses = $orders[$item->getBaseId()]->getAddresses(); |
@@ -36,8 +34,7 @@ discard block |
||
36 | 34 | }; |
37 | 35 | |
38 | 36 | |
39 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
40 | -{ |
|
37 | +$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
41 | 38 | if( isset( $orders[$item->getBaseId()] ) ) |
42 | 39 | { |
43 | 40 | $services = $orders[$item->getBaseId()]->getServices(); |
@@ -49,8 +46,7 @@ discard block |
||
49 | 46 | }; |
50 | 47 | |
51 | 48 | |
52 | -$status = function( $list, $key ) |
|
53 | -{ |
|
49 | +$status = function( $list, $key ) { |
|
54 | 50 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
55 | 51 | }; |
56 | 52 |
@@ -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; |
@@ -360,9 +360,12 @@ |
||
360 | 360 | </select> |
361 | 361 | </div> |
362 | 362 | </div> |
363 | - <?php else : ?> |
|
363 | + <?php else { |
|
364 | + : ?> |
|
364 | 365 | <input class="item-type" type="hidden" |
365 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'product.type' ) ) ); ?>" |
|
366 | + name="<?= $enc->attr( $this->formparam( array( 'item', 'product.type' ) ) ); |
|
367 | +} |
|
368 | +?>" |
|
366 | 369 | value="<?= $enc->attr( $types->firstKey() ) ?>" /> |
367 | 370 | <?php endif; ?> |
368 | 371 | <div class="form-group row mandatory"> |
@@ -133,9 +133,12 @@ |
||
133 | 133 | </select> |
134 | 134 | </div> |
135 | 135 | </div> |
136 | - <?php else : ?> |
|
136 | + <?php else { |
|
137 | + : ?> |
|
137 | 138 | <input class="item-type" type="hidden" |
138 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'service.type' ) ) ); ?>" |
|
139 | + name="<?= $enc->attr( $this->formparam( array( 'item', 'service.type' ) ) ); |
|
140 | +} |
|
141 | +?>" |
|
139 | 142 | value="<?= $enc->attr( $types->getCode()->first() ) ?>" /> |
140 | 143 | <?php endif; ?> |
141 | 144 | <div class="form-group row mandatory"> |
@@ -133,9 +133,12 @@ |
||
133 | 133 | </select> |
134 | 134 | </div> |
135 | 135 | </div> |
136 | - <?php else : ?> |
|
136 | + <?php else { |
|
137 | + : ?> |
|
137 | 138 | <input class="item-type" type="hidden" |
138 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.type' ) ) ); ?>" |
|
139 | + name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.type' ) ) ); |
|
140 | +} |
|
141 | +?>" |
|
139 | 142 | value="<?= $enc->attr( $types->getCode()->first() ) ?>" /> |
140 | 143 | <?php endif; ?> |
141 | 144 | <div class="form-group row mandatory"> |