@@ -291,8 +291,7 @@ |
||
| 291 | 291 | $propItem->setValue( $value ); |
| 292 | 292 | |
| 293 | 293 | $item->addPropertyItem( $propItem ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $item->deletePropertyItems( $propItems ); |
| 298 | 297 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) ); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - return $client->setAimeos( $aimeos )->setView( $view );; |
|
| 65 | + return $client->setAimeos( $aimeos )->setView( $view ); ; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | } |
@@ -285,7 +285,7 @@ |
||
| 285 | 285 | $manager = \Aimeos\MShop::create( $context, 'index' ); |
| 286 | 286 | |
| 287 | 287 | $search = $manager->createSearch(); |
| 288 | - $search->setSortations( [$search->sort( '+', 'product.id')] ); |
|
| 288 | + $search->setSortations( [$search->sort( '+', 'product.id' )] ); |
|
| 289 | 289 | $search = $this->initCriteria( $search, $params ); |
| 290 | 290 | |
| 291 | 291 | $view->items = $manager->searchItems( $search, array_diff( $this->getDomains(), ['product'] ), $total ); |
@@ -416,7 +416,7 @@ |
||
| 416 | 416 | |
| 417 | 417 | if( $file && $file->getError() !== UPLOAD_ERR_NO_FILE ) { |
| 418 | 418 | $refItem = $cntl->add( $refItem, $file ); |
| 419 | - } elseif ( $refItem->getId() === null && $refItem->getUrl() !== '' ) { |
|
| 419 | + } elseif( $refItem->getId() === null && $refItem->getUrl() !== '' ) { |
|
| 420 | 420 | $refItem = $cntl->copy( $refItem ); |
| 421 | 421 | } |
| 422 | 422 | |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['price.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['price.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -218,7 +218,7 @@ |
||
| 218 | 218 | |
| 219 | 219 | $search = $manager->createSearch( true )->setSlice( 0, 10000 ); |
| 220 | 220 | $search->setConditions( $search->compare( '==', 'price.property.type.domain', 'price' ) ); |
| 221 | - $search->setSortations( [$search->sort( '+', 'price.property.type.position')] ); |
|
| 221 | + $search->setSortations( [$search->sort( '+', 'price.property.type.position' )] ); |
|
| 222 | 222 | |
| 223 | 223 | $view->propertyTypes = $this->map( $manager->searchItems( $search ) ); |
| 224 | 224 | |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['price.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['price.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -291,8 +291,7 @@ |
||
| 291 | 291 | { |
| 292 | 292 | $propItem = $propItems[$entry['price.property.id']]; |
| 293 | 293 | unset( $propItems[$entry['price.property.id']] ); |
| 294 | - } |
|
| 295 | - else |
|
| 294 | + } else |
|
| 296 | 295 | { |
| 297 | 296 | $propItem = $propManager->createItem(); |
| 298 | 297 | } |
@@ -158,9 +158,12 @@ discard block |
||
| 158 | 158 | </select> |
| 159 | 159 | </div> |
| 160 | 160 | </div> |
| 161 | - <?php else : ?> |
|
| 161 | + <?php else { |
|
| 162 | + : ?> |
|
| 162 | 163 | <input class="item-currencyid" type="hidden" |
| 163 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)" |
|
| 164 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); |
|
| 165 | +} |
|
| 166 | +?>'.replace('idx', idx)" |
|
| 164 | 167 | value="<?= $enc->attr( key( $currencies ) ); ?>" /> |
| 165 | 168 | <?php endif; ?> |
| 166 | 169 | |
@@ -188,9 +191,12 @@ discard block |
||
| 188 | 191 | <?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?> |
| 189 | 192 | </div> |
| 190 | 193 | </div> |
| 191 | - <?php else : ?> |
|
| 194 | + <?php else { |
|
| 195 | + : ?> |
|
| 192 | 196 | <input class="item-type" type="hidden" |
| 193 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)" |
|
| 197 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); |
|
| 198 | +} |
|
| 199 | +?>'.replace('idx', idx)" |
|
| 194 | 200 | value="<?= $enc->attr( key( $priceTypes ) ); ?>" /> |
| 195 | 201 | <?php endif; ?> |
| 196 | 202 | |
@@ -246,9 +252,12 @@ discard block |
||
| 246 | 252 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
| 247 | 253 | </div> |
| 248 | 254 | </div> |
| 249 | - <?php else : ?> |
|
| 255 | + <?php else { |
|
| 256 | + : ?> |
|
| 250 | 257 | <input class="listitem-type" type="hidden" |
| 251 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'service.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
| 258 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'service.lists.type' ) ) ); |
|
| 259 | +} |
|
| 260 | +?>'.replace('idx', idx)" |
|
| 252 | 261 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
| 253 | 262 | v-model="items[idx]['service.lists.type']" /> |
| 254 | 263 | <?php endif; ?> |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | <th class="config-row-value"><?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?></th> |
| 296 | 296 | <th class="actions"> |
| 297 | 297 | <div v-if="!readonly" class="btn act-add fa" tabindex="1" v-on:click="add()" |
| 298 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"></div> |
|
| 298 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"></div> |
|
| 299 | 299 | </th> |
| 300 | 300 | </tr> |
| 301 | 301 | </thead> |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | </td> |
| 315 | 315 | <td class="actions"> |
| 316 | 316 | <div v-if="!readonly" class="btn act-delete fa" tabindex="1" v-on:click="remove(pos)" |
| 317 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"></div> |
|
| 317 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"></div> |
|
| 318 | 318 | </td> |
| 319 | 319 | </tr> |
| 320 | 320 | </tbody> |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | <th class="actions"> |
| 117 | 117 | <a class="btn fa act-add" tabindex="1" |
| 118 | 118 | href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>" |
| 119 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 119 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 120 | 120 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
| 121 | 121 | </a> |
| 122 | 122 | |
@@ -180,12 +180,12 @@ discard block |
||
| 180 | 180 | <td class="actions"> |
| 181 | 181 | <a class="btn act-copy fa" tabindex="1" |
| 182 | 182 | href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>" |
| 183 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
| 183 | + title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry' ) ); ?>" |
|
| 184 | 184 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"> |
| 185 | 185 | </a> |
| 186 | 186 | <a class="btn act-delete fa" tabindex="1" |
| 187 | 187 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig ) ); ?>" |
| 188 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 188 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 189 | 189 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"> |
| 190 | 190 | </a> |
| 191 | 191 | </td> |