@@ -159,9 +159,12 @@ discard block |
||
| 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( key( $languages ) ) ?>" /> |
| 166 | 169 | <?php endif; ?> |
| 167 | 170 | |
@@ -181,9 +184,12 @@ discard block |
||
| 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( key( $textTypes ) ) ?>" /> |
| 188 | 194 | <?php endif; ?> |
| 189 | 195 | |
@@ -231,9 +237,12 @@ discard block |
||
| 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( key( $listTypes ) ) ?>" /> |
| 238 | 247 | <?php endif; ?> |
| 239 | 248 | |
@@ -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( key( $languages ) ) ?>" /> |
| 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( key( $textTypes ) ) ?>" /> |
| 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_', 'supplier.lists.type' ) ) ); ?>'.replace('_idx_', idx)" |
|
| 224 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', '_idx_', 'supplier.lists.type' ) ) ); |
|
| 225 | +} |
|
| 226 | +?>'.replace('_idx_', idx)" |
|
| 218 | 227 | value="<?= $enc->attr( key( $listTypes ) ) ?>" /> |
| 219 | 228 | <?php endif; ?> |
| 220 | 229 | |
@@ -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( key( $languages ) ) ?>" /> |
| 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( key( $textTypes ) ) ?>" /> |
| 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( key( $listTypes ) ) ?>" /> |
| 219 | 228 | <?php endif; ?> |
| 220 | 229 | |
@@ -56,16 +56,14 @@ |
||
| 56 | 56 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
| 57 | 57 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
| 58 | 58 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
| 59 | - } |
|
| 60 | - else |
|
| 59 | + } else |
|
| 61 | 60 | { |
| 62 | 61 | $target = $this->config( 'admin/jqadm/url/create/target' ); |
| 63 | 62 | $controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' ); |
| 64 | 63 | $action = $this->config( 'admin/jqadm/url/create/action', 'create' ); |
| 65 | 64 | $config = $this->config( 'admin/jqadm/url/create/config', [] ); |
| 66 | 65 | } |
| 67 | -} |
|
| 68 | -else |
|
| 66 | +} else |
|
| 69 | 67 | { |
| 70 | 68 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
| 71 | 69 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | $id = $siteManager->searchItems( $search )->keys()->first() ?: $siteItem->getId(); |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | - catch( \Exception $e ) { ; } |
|
| 53 | + catch( \Exception $e ) {; } |
|
| 54 | 54 | |
| 55 | 55 | if( $view->access( ['admin', 'super'] ) ) { |
| 56 | 56 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE; |
@@ -50,7 +50,9 @@ discard block |
||
| 50 | 50 | $id = $siteManager->searchItems( $search )->keys()->first() ?: $siteItem->getId(); |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | - catch( \Exception $e ) { ; } |
|
| 53 | + catch( \Exception $e ) |
|
| 54 | + { |
|
| 55 | +; } |
|
| 54 | 56 | |
| 55 | 57 | if( $view->access( ['admin', 'super'] ) ) { |
| 56 | 58 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE; |
@@ -77,8 +79,7 @@ discard block |
||
| 77 | 79 | if( ( $rootItem = $sitePath->first() ) !== null ) { |
| 78 | 80 | $view->pageSiteTree = $siteManager->getTree( $rootItem->getId(), [], $level ); |
| 79 | 81 | } |
| 80 | - } |
|
| 81 | - else |
|
| 82 | + } else |
|
| 82 | 83 | { |
| 83 | 84 | $view->pageSiteList = [$view->pageSiteTree]; |
| 84 | 85 | } |
@@ -174,8 +174,11 @@ |
||
| 174 | 174 | </option> |
| 175 | 175 | <?php endforeach; ?> |
| 176 | 176 | </select> |
| 177 | - <?php else : ?> |
|
| 178 | - <?php $language = ( ( $item = $languages->first() ) !== null ? $item->getId() : '' ); ?> |
|
| 177 | + <?php else { |
|
| 178 | + : ?> |
|
| 179 | + <?php $language = ( ( $item = $languages->first() ) !== null ? $item->getId() : '' ); |
|
| 180 | +} |
|
| 181 | +?> |
|
| 179 | 182 | <input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" /> |
| 180 | 183 | <?php endif; ?> |
| 181 | 184 | </div> |
@@ -294,8 +294,7 @@ |
||
| 294 | 294 | $propItem->setValue( $value ); |
| 295 | 295 | |
| 296 | 296 | $item->addPropertyItem( $propItem ); |
| 297 | - } |
|
| 298 | - else |
|
| 297 | + } else |
|
| 299 | 298 | { |
| 300 | 299 | $item->deletePropertyItems( $propItems->toArray() ); |
| 301 | 300 | } |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 9 | -{ |
|
| 8 | +$price = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
| 10 | 9 | if( ( $order = $orders->get( $item->getBaseId() ) ) !== null ) |
| 11 | 10 | { |
| 12 | 11 | $price = $order->getPrice(); |
@@ -15,8 +14,7 @@ discard block |
||
| 15 | 14 | }; |
| 16 | 15 | |
| 17 | 16 | |
| 18 | -$name = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 19 | -{ |
|
| 17 | +$name = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 20 | 18 | if( ( $order = $orders->get( $item->getBaseId() ) ) !== null ) |
| 21 | 19 | { |
| 22 | 20 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -34,8 +32,7 @@ discard block |
||
| 34 | 32 | }; |
| 35 | 33 | |
| 36 | 34 | |
| 37 | -$payment = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 38 | -{ |
|
| 35 | +$payment = function( \Aimeos\Map $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 39 | 36 | if( ( $order = $orders->get( $item->getBaseId() ) ) !== null ) |
| 40 | 37 | { |
| 41 | 38 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -51,8 +48,7 @@ discard block |
||
| 51 | 48 | }; |
| 52 | 49 | |
| 53 | 50 | |
| 54 | -$status = function( array $list, $key ) |
|
| 55 | -{ |
|
| 51 | +$status = function( array $list, $key ) { |
|
| 56 | 52 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
| 57 | 53 | }; |
| 58 | 54 | |
@@ -334,8 +334,11 @@ discard block |
||
| 334 | 334 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div> |
| 335 | 335 | </div> |
| 336 | 336 | <?php endforeach; ?> |
| 337 | - <?php else : ?> |
|
| 338 | - <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?> |
|
| 337 | + <?php else { |
|
| 338 | + : ?> |
|
| 339 | + <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); |
|
| 340 | +} |
|
| 341 | +?> |
|
| 339 | 342 | <?php endif; ?> |
| 340 | 343 | </div> |
| 341 | 344 | |
@@ -762,8 +765,11 @@ discard block |
||
| 762 | 765 | <div class="col-6 name"> |
| 763 | 766 | <?php if( $basket->getPrice()->getTaxFlag() ) : ?> |
| 764 | 767 | <?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?> |
| 765 | - <?php else : ?> |
|
| 766 | - <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?> |
|
| 768 | + <?php else { |
|
| 769 | + : ?> |
|
| 770 | + <?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); |
|
| 771 | +} |
|
| 772 | +?> |
|
| 767 | 773 | <?php endif; ?> |
| 768 | 774 | </div> |
| 769 | 775 | <div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div> |