aimeos /
ai-admin-jqadm
@@ -5,29 +5,29 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 8 | +$price = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat) |
|
| 9 | 9 | { |
| 10 | - if( isset( $orders[$item->getBaseId()] ) ) |
|
| 10 | + if (isset($orders[$item->getBaseId()])) |
|
| 11 | 11 | { |
| 12 | 12 | $price = $orders[$item->getBaseId()]->getPrice(); |
| 13 | - return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() ); |
|
| 13 | + return sprintf($priceFormat, $price->getValue(), $price->getCurrencyId()); |
|
| 14 | 14 | } |
| 15 | 15 | }; |
| 16 | 16 | |
| 17 | 17 | |
| 18 | -$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 18 | +$name = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item) |
|
| 19 | 19 | { |
| 20 | - if( isset( $orders[$item->getBaseId()] ) ) |
|
| 20 | + if (isset($orders[$item->getBaseId()])) |
|
| 21 | 21 | { |
| 22 | 22 | $addresses = $orders[$item->getBaseId()]->getAddresses(); |
| 23 | 23 | |
| 24 | - if( !isset( $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT] ) ) { |
|
| 24 | + if (!isset($addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT])) { |
|
| 25 | 25 | return; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $address = $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT]; |
| 29 | 29 | |
| 30 | - if( $address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY ) { |
|
| 30 | + if ($address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY) { |
|
| 31 | 31 | return $address->getFirstName() . ' ' . $address->getLastName(); |
| 32 | 32 | } else { |
| 33 | 33 | return $address->getCompany(); |
@@ -36,50 +36,50 @@ discard block |
||
| 36 | 36 | }; |
| 37 | 37 | |
| 38 | 38 | |
| 39 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 39 | +$payment = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item) |
|
| 40 | 40 | { |
| 41 | - if( isset( $orders[$item->getBaseId()] ) ) |
|
| 41 | + if (isset($orders[$item->getBaseId()])) |
|
| 42 | 42 | { |
| 43 | 43 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
| 44 | - $services = $orders[$item->getBaseId()]->getService( $type ); |
|
| 44 | + $services = $orders[$item->getBaseId()]->getService($type); |
|
| 45 | 45 | $codes = []; |
| 46 | 46 | |
| 47 | - foreach( $services as $service ) { |
|
| 47 | + foreach ($services as $service) { |
|
| 48 | 48 | $codes[] = $service->getCode(); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - return implode( ', ', $codes ); |
|
| 51 | + return implode(', ', $codes); |
|
| 52 | 52 | } |
| 53 | 53 | }; |
| 54 | 54 | |
| 55 | 55 | |
| 56 | -$status = function( $list, $key ) |
|
| 56 | +$status = function($list, $key) |
|
| 57 | 57 | { |
| 58 | - return ( isset( $list[$key] ) ? $list[$key] : '' ); |
|
| 58 | + return (isset($list[$key]) ? $list[$key] : ''); |
|
| 59 | 59 | }; |
| 60 | 60 | |
| 61 | 61 | |
| 62 | -$getTarget = $this->config( 'admin/jqadm/url/get/target' ); |
|
| 63 | -$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
|
| 64 | -$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
|
| 65 | -$getConfig = $this->config( 'admin/jqadm/url/get/config', [] ); |
|
| 62 | +$getTarget = $this->config('admin/jqadm/url/get/target'); |
|
| 63 | +$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm'); |
|
| 64 | +$getAction = $this->config('admin/jqadm/url/get/action', 'get'); |
|
| 65 | +$getConfig = $this->config('admin/jqadm/url/get/config', []); |
|
| 66 | 66 | |
| 67 | 67 | |
| 68 | 68 | $enc = $this->encoder(); |
| 69 | 69 | $params = $this->param(); |
| 70 | -$baskets = $this->get( 'orderlatestBaskets', [] ); |
|
| 70 | +$baskets = $this->get('orderlatestBaskets', []); |
|
| 71 | 71 | /// price format with value (%1$s) and currency (%2$s) |
| 72 | -$priceFormat = $this->translate( 'admin', '%1$s %2$s' ); |
|
| 72 | +$priceFormat = $this->translate('admin', '%1$s %2$s'); |
|
| 73 | 73 | |
| 74 | 74 | $statuslist = array( |
| 75 | - '-1' => $this->translate( 'mshop/code', 'pay:-1' ), |
|
| 76 | - '0' => $this->translate( 'mshop/code', 'pay:0' ), |
|
| 77 | - '1' => $this->translate( 'mshop/code', 'pay:1' ), |
|
| 78 | - '2' => $this->translate( 'mshop/code', 'pay:2' ), |
|
| 79 | - '3' => $this->translate( 'mshop/code', 'pay:3' ), |
|
| 80 | - '4' => $this->translate( 'mshop/code', 'pay:4' ), |
|
| 81 | - '5' => $this->translate( 'mshop/code', 'pay:5' ), |
|
| 82 | - '6' => $this->translate( 'mshop/code', 'pay:6' ), |
|
| 75 | + '-1' => $this->translate('mshop/code', 'pay:-1'), |
|
| 76 | + '0' => $this->translate('mshop/code', 'pay:0'), |
|
| 77 | + '1' => $this->translate('mshop/code', 'pay:1'), |
|
| 78 | + '2' => $this->translate('mshop/code', 'pay:2'), |
|
| 79 | + '3' => $this->translate('mshop/code', 'pay:3'), |
|
| 80 | + '4' => $this->translate('mshop/code', 'pay:4'), |
|
| 81 | + '5' => $this->translate('mshop/code', 'pay:5'), |
|
| 82 | + '6' => $this->translate('mshop/code', 'pay:6'), |
|
| 83 | 83 | ); |
| 84 | 84 | |
| 85 | 85 | ?> |
@@ -91,33 +91,33 @@ discard block |
||
| 91 | 91 | <div class="btn btn-card-header act-show fa"></div> |
| 92 | 92 | </div> |
| 93 | 93 | <span class="item-label header-label"> |
| 94 | - <?= $enc->html( $this->translate( 'admin', 'Latest orders' ) ); ?> |
|
| 94 | + <?= $enc->html($this->translate('admin', 'Latest orders')); ?> |
|
| 95 | 95 | </span> |
| 96 | 96 | </div> |
| 97 | 97 | <div id="order-latest-data" class="card-block content collapse show" role="tabpanel" aria-labelledby="order-latest-head"> |
| 98 | 98 | <div class="table-responsive"> |
| 99 | 99 | <table class="list-items table table-hover"> |
| 100 | 100 | <tbody> |
| 101 | - <?php foreach( $this->get( 'orderlatestItems', [] ) as $item ) : ?> |
|
| 102 | - <?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?> |
|
| 101 | + <?php foreach ($this->get('orderlatestItems', []) as $item) : ?> |
|
| 102 | + <?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig)); ?> |
|
| 103 | 103 | <tr> |
| 104 | 104 | <td class="order-id"> |
| 105 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a> |
|
| 105 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a> |
|
| 106 | 106 | </td> |
| 107 | 107 | <td class="order-base-address-name"> |
| 108 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $name( $baskets, $item ) ); ?></a> |
|
| 108 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($name($baskets, $item)); ?></a> |
|
| 109 | 109 | </td> |
| 110 | 110 | <td class="order-base-price"> |
| 111 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $price( $baskets, $item, $priceFormat ) ); ?></a> |
|
| 111 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($price($baskets, $item, $priceFormat)); ?></a> |
|
| 112 | 112 | </td> |
| 113 | 113 | <td class="order-datepayment"> |
| 114 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDatePayment() ); ?></a> |
|
| 114 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDatePayment()); ?></a> |
|
| 115 | 115 | </td> |
| 116 | 116 | <td class="order-statuspayment"> |
| 117 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $status( $statuslist, $item->getPaymentStatus() ) ); ?></a> |
|
| 117 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($status($statuslist, $item->getPaymentStatus())); ?></a> |
|
| 118 | 118 | </td> |
| 119 | 119 | <td class="order-base-service-payment"> |
| 120 | - <a class="items-field" href="<?= $url; ?>"><?= $enc->html( $payment( $baskets, $item ) ); ?></a> |
|
| 120 | + <a class="items-field" href="<?= $url; ?>"><?= $enc->html($payment($baskets, $item)); ?></a> |
|
| 121 | 121 | </td> |
| 122 | 122 | </tr> |
| 123 | 123 | <?php endforeach; ?> |
@@ -126,4 +126,4 @@ discard block |
||
| 126 | 126 | </div> |
| 127 | 127 | </div> |
| 128 | 128 | </div> |
| 129 | -<?= $this->get( 'orderlatestBody' ); ?> |
|
| 129 | +<?= $this->get('orderlatestBody'); ?> |
|
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$selected = function( $key, $code ) { |
|
| 9 | - return ( $key == $code ? 'selected="selected"' : '' ); |
|
| 8 | +$selected = function($key, $code) { |
|
| 9 | + return ($key == $code ? 'selected="selected"' : ''); |
|
| 10 | 10 | }; |
| 11 | 11 | |
| 12 | 12 | $enc = $this->encoder(); |
@@ -14,90 +14,90 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | ?> |
| 16 | 16 | <div id="download" class="row item-download tab-pane fade" role="tabpanel" aria-labelledby="download"> |
| 17 | - <div class="col-lg-6 content-block <?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?>"> |
|
| 17 | + <div class="col-lg-6 content-block <?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?>"> |
|
| 18 | 18 | <div class="form-group row optional"> |
| 19 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'File' ) ); ?></label> |
|
| 19 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'File')); ?></label> |
|
| 20 | 20 | <div class="input-group col-sm-8"> |
| 21 | - <input class="item-siteid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'product.lists.siteid' ) ) ); ?>" |
|
| 22 | - value="<?= $enc->attr( $this->get( 'downloadData/product.lists.siteid' ) ); ?>" /> |
|
| 23 | - <input class="item-listid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'product.lists.id' ) ) ); ?>" |
|
| 24 | - value="<?= $enc->attr( $this->get( 'downloadData/product.lists.id' ) ); ?>" /> |
|
| 25 | - <input class="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.id' ) ) ); ?>" |
|
| 26 | - value="<?= $enc->attr( $this->get( 'downloadData/attribute.id' ) ); ?>" /> |
|
| 21 | + <input class="item-siteid" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'product.lists.siteid'))); ?>" |
|
| 22 | + value="<?= $enc->attr($this->get('downloadData/product.lists.siteid')); ?>" /> |
|
| 23 | + <input class="item-listid" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'product.lists.id'))); ?>" |
|
| 24 | + value="<?= $enc->attr($this->get('downloadData/product.lists.id')); ?>" /> |
|
| 25 | + <input class="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('download', 'attribute.id'))); ?>" |
|
| 26 | + value="<?= $enc->attr($this->get('downloadData/attribute.id')); ?>" /> |
|
| 27 | 27 | <div class="custom-file"> |
| 28 | - <input id="download-file" class="custom-file-input fileupload" type="file" name="download[file]" tabindex="<?= $this->get( 'tabindex' ); ?>" /> |
|
| 29 | - <label for="download-file" class="custom-file-label"><?= $enc->html( $this->translate( 'admin', 'Choose file' ) ); ?></label> |
|
| 28 | + <input id="download-file" class="custom-file-input fileupload" type="file" name="download[file]" tabindex="<?= $this->get('tabindex'); ?>" /> |
|
| 29 | + <label for="download-file" class="custom-file-label"><?= $enc->html($this->translate('admin', 'Choose file')); ?></label> |
|
| 30 | 30 | </div> |
| 31 | 31 | </div> |
| 32 | 32 | </div> |
| 33 | 33 | <div class="form-group row optional"> |
| 34 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label> |
|
| 34 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label> |
|
| 35 | 35 | <div class="col-sm-8"> |
| 36 | - <select class="form-control custom-select item-status" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 37 | - name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.status' ) ) ); ?>" |
|
| 38 | - <?= $this->site()->readonly( $this->get( 'downloadData/attribute.siteid', $this->pageSiteItem->getId() ) ); ?> > |
|
| 39 | - <option value="1" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), 1 ); ?> > |
|
| 40 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?> |
|
| 36 | + <select class="form-control custom-select item-status" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 37 | + name="<?= $enc->attr($this->formparam(array('download', 'attribute.status'))); ?>" |
|
| 38 | + <?= $this->site()->readonly($this->get('downloadData/attribute.siteid', $this->pageSiteItem->getId())); ?> > |
|
| 39 | + <option value="1" <?= $selected($this->get('downloadData/attribute.status', 1), 1); ?> > |
|
| 40 | + <?= $enc->html($this->translate('mshop/code', 'status:1')); ?> |
|
| 41 | 41 | </option> |
| 42 | - <option value="0" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), 0 ); ?> > |
|
| 43 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?> |
|
| 42 | + <option value="0" <?= $selected($this->get('downloadData/attribute.status', 1), 0); ?> > |
|
| 43 | + <?= $enc->html($this->translate('mshop/code', 'status:0')); ?> |
|
| 44 | 44 | </option> |
| 45 | - <option value="-1" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), -1 ); ?> > |
|
| 46 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?> |
|
| 45 | + <option value="-1" <?= $selected($this->get('downloadData/attribute.status', 1), -1); ?> > |
|
| 46 | + <?= $enc->html($this->translate('mshop/code', 'status:-1')); ?> |
|
| 47 | 47 | </option> |
| 48 | - <option value="-2" <?= $selected( $this->get( 'downloadData/attribute.status', 1 ), -2 ); ?> > |
|
| 49 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?> |
|
| 48 | + <option value="-2" <?= $selected($this->get('downloadData/attribute.status', 1), -2); ?> > |
|
| 49 | + <?= $enc->html($this->translate('mshop/code', 'status:-2')); ?> |
|
| 50 | 50 | </option> |
| 51 | 51 | </select> |
| 52 | 52 | </div> |
| 53 | 53 | </div> |
| 54 | 54 | <div class="form-group row optional"> |
| 55 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Name' ) ); ?></label> |
|
| 55 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Name')); ?></label> |
|
| 56 | 56 | <div class="col-sm-8"> |
| 57 | - <input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 58 | - name="<?= $enc->attr( $this->formparam( array( 'download', 'attribute.label' ) ) ); ?>" |
|
| 59 | - value="<?= $enc->attr( $this->get( 'downloadData/attribute.label' ) ); ?>" |
|
| 60 | - <?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?> /> |
|
| 57 | + <input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 58 | + name="<?= $enc->attr($this->formparam(array('download', 'attribute.label'))); ?>" |
|
| 59 | + value="<?= $enc->attr($this->get('downloadData/attribute.label')); ?>" |
|
| 60 | + <?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?> /> |
|
| 61 | 61 | </div> |
| 62 | 62 | <div class="col-sm-12 form-text text-muted help-text"> |
| 63 | - <?= $enc->html( $this->translate( 'admin', 'Name of the downloaded file when customers saves the file on their computers' ) ); ?> |
|
| 63 | + <?= $enc->html($this->translate('admin', 'Name of the downloaded file when customers saves the file on their computers')); ?> |
|
| 64 | 64 | </div> |
| 65 | 65 | </div> |
| 66 | 66 | <div class="form-group row optional"> |
| 67 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Replace file' ) ); ?></label> |
|
| 67 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Replace file')); ?></label> |
|
| 68 | 68 | <div class="col-sm-8"> |
| 69 | - <input class="form-control item-overwrite" type="checkbox" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 70 | - name="<?= $enc->attr( $this->formparam( array( 'download', 'overwrite' ) ) ); ?>" value="1" |
|
| 71 | - <?= $this->site()->readonly( $this->get( 'downloadData/product.lists.siteid', $this->pageSiteItem->getId() ) ); ?> |
|
| 72 | - <?= $selected( $this->get( 'downloadData/overwrite' ), 1 ); ?> /> |
|
| 69 | + <input class="form-control item-overwrite" type="checkbox" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 70 | + name="<?= $enc->attr($this->formparam(array('download', 'overwrite'))); ?>" value="1" |
|
| 71 | + <?= $this->site()->readonly($this->get('downloadData/product.lists.siteid', $this->pageSiteItem->getId())); ?> |
|
| 72 | + <?= $selected($this->get('downloadData/overwrite'), 1); ?> /> |
|
| 73 | 73 | </div> |
| 74 | 74 | <div class="col-sm-12 form-text text-muted help-text"> |
| 75 | - <?= $enc->html( $this->translate( 'admin', 'Overwrite the existing file and customers bought it in the past can then download the new content too' ) ); ?> |
|
| 75 | + <?= $enc->html($this->translate('admin', 'Overwrite the existing file and customers bought it in the past can then download the new content too')); ?> |
|
| 76 | 76 | </div> |
| 77 | 77 | </div> |
| 78 | 78 | </div> |
| 79 | 79 | <div class="col-lg-6 content-block "> |
| 80 | - <?php if( $this->get( 'downloadData/attribute.code' ) != '' ) : ?> |
|
| 80 | + <?php if ($this->get('downloadData/attribute.code') != '') : ?> |
|
| 81 | 81 | <div class="form-group row"> |
| 82 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Path' ) ); ?></label> |
|
| 82 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Path')); ?></label> |
|
| 83 | 83 | <div class="col-sm-8"> |
| 84 | - <p class="form-control-plaintext item-file"><?= $enc->html( $this->get( 'downloadData/attribute.code' ) ); ?></p> |
|
| 84 | + <p class="form-control-plaintext item-file"><?= $enc->html($this->get('downloadData/attribute.code')); ?></p> |
|
| 85 | 85 | </div> |
| 86 | 86 | </div> |
| 87 | 87 | <div class="form-group row"> |
| 88 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Size' ) ); ?></label> |
|
| 88 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Size')); ?></label> |
|
| 89 | 89 | <div class="col-sm-8"> |
| 90 | - <p class="form-control-plaintext item-file"><?= $enc->html( number_format( $this->get( 'downloadData/size' ) / 1024, 0, '.', ' ' ) ); ?> KB</p> |
|
| 90 | + <p class="form-control-plaintext item-file"><?= $enc->html(number_format($this->get('downloadData/size') / 1024, 0, '.', ' ')); ?> KB</p> |
|
| 91 | 91 | </div> |
| 92 | 92 | </div> |
| 93 | 93 | <div class="form-group row"> |
| 94 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Uploaded' ) ); ?></label> |
|
| 94 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Uploaded')); ?></label> |
|
| 95 | 95 | <div class="col-sm-8"> |
| 96 | - <p class="form-control-plaintext item-file"><?= $enc->html( date( 'Y-m-d H:i:s', $this->get( 'downloadData/time' ) ) ); ?></p> |
|
| 96 | + <p class="form-control-plaintext item-file"><?= $enc->html(date('Y-m-d H:i:s', $this->get('downloadData/time'))); ?></p> |
|
| 97 | 97 | </div> |
| 98 | 98 | </div> |
| 99 | 99 | <?php endif; ?> |
| 100 | 100 | </div> |
| 101 | 101 | |
| 102 | - <?= $this->get( 'downloadBody' ); ?> |
|
| 102 | + <?= $this->get('downloadBody'); ?> |
|
| 103 | 103 | </div> |
@@ -21,56 +21,56 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | |
| 24 | -$pgroup = function( array $params, $group ) |
|
| 24 | +$pgroup = function(array $params, $group) |
|
| 25 | 25 | { |
| 26 | - if( $group != null ) { |
|
| 26 | + if ($group != null) { |
|
| 27 | 27 | return [$group => ['page' => $params]]; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | return ['page' => $params]; |
| 31 | 31 | }; |
| 32 | 32 | |
| 33 | -$fragment = (array) $this->get( 'fragment', [] ); |
|
| 34 | -$total = min( $this->get( 'total', 0 ), 10000 ); |
|
| 35 | -$pOffset = $pLimit = $this->get( 'page', [] ); |
|
| 36 | -$params = $this->get( 'pageParams', [] ); |
|
| 37 | -$group = $this->get( 'group' ); |
|
| 33 | +$fragment = (array) $this->get('fragment', []); |
|
| 34 | +$total = min($this->get('total', 0), 10000); |
|
| 35 | +$pOffset = $pLimit = $this->get('page', []); |
|
| 36 | +$params = $this->get('pageParams', []); |
|
| 37 | +$group = $this->get('group'); |
|
| 38 | 38 | |
| 39 | -$offset = max( $this->get( 'page/offset', 0 ), 0 ); |
|
| 40 | -$limit = max( $this->get( 'page/limit', 25 ), 1 ); |
|
| 39 | +$offset = max($this->get('page/offset', 0), 0); |
|
| 40 | +$limit = max($this->get('page/limit', 25), 1); |
|
| 41 | 41 | |
| 42 | -$first = ( $offset > 0 ? 0 : null ); |
|
| 43 | -$prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
|
| 44 | -$next = ( $offset + $limit < $total ? $offset + $limit : null ); |
|
| 45 | -$last = ( floor(($total - 1) / $limit) * $limit > $offset ? floor(($total - 1) / $limit) * $limit : null ); |
|
| 42 | +$first = ($offset > 0 ? 0 : null); |
|
| 43 | +$prev = ($offset - $limit >= 0 ? $offset - $limit : null); |
|
| 44 | +$next = ($offset + $limit < $total ? $offset + $limit : null); |
|
| 45 | +$last = (floor(($total - 1) / $limit) * $limit > $offset ? floor(($total - 1) / $limit) * $limit : null); |
|
| 46 | 46 | |
| 47 | -$pageCurrent = floor( $offset / $limit ) + 1; |
|
| 48 | -$pageTotal = ( $total != 0 ? ceil( $total / $limit ) : 1 ); |
|
| 47 | +$pageCurrent = floor($offset / $limit) + 1; |
|
| 48 | +$pageTotal = ($total != 0 ? ceil($total / $limit) : 1); |
|
| 49 | 49 | |
| 50 | 50 | |
| 51 | -if( $this->get( 'action' ) === 'get' ) |
|
| 51 | +if ($this->get('action') === 'get') |
|
| 52 | 52 | { |
| 53 | - if( isset( $params['id'] ) ) |
|
| 53 | + if (isset($params['id'])) |
|
| 54 | 54 | { |
| 55 | - $target = $this->config( 'admin/jqadm/url/get/target' ); |
|
| 56 | - $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
|
| 57 | - $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
|
| 58 | - $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
|
| 55 | + $target = $this->config('admin/jqadm/url/get/target'); |
|
| 56 | + $controller = $this->config('admin/jqadm/url/get/controller', 'Jqadm'); |
|
| 57 | + $action = $this->config('admin/jqadm/url/get/action', 'get'); |
|
| 58 | + $config = $this->config('admin/jqadm/url/get/config', []); |
|
| 59 | 59 | } |
| 60 | 60 | else |
| 61 | 61 | { |
| 62 | - $target = $this->config( 'admin/jqadm/url/create/target' ); |
|
| 63 | - $controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' ); |
|
| 64 | - $action = $this->config( 'admin/jqadm/url/create/action', 'create' ); |
|
| 65 | - $config = $this->config( 'admin/jqadm/url/create/config', [] ); |
|
| 62 | + $target = $this->config('admin/jqadm/url/create/target'); |
|
| 63 | + $controller = $this->config('admin/jqadm/url/create/controller', 'Jqadm'); |
|
| 64 | + $action = $this->config('admin/jqadm/url/create/action', 'create'); |
|
| 65 | + $config = $this->config('admin/jqadm/url/create/config', []); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | else |
| 69 | 69 | { |
| 70 | - $target = $this->config( 'admin/jqadm/url/search/target' ); |
|
| 71 | - $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
|
| 72 | - $action = $this->config( 'admin/jqadm/url/search/action', 'search' ); |
|
| 73 | - $config = $this->config( 'admin/jqadm/url/search/config', [] ); |
|
| 70 | + $target = $this->config('admin/jqadm/url/search/target'); |
|
| 71 | + $controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm'); |
|
| 72 | + $action = $this->config('admin/jqadm/url/search/action', 'search'); |
|
| 73 | + $config = $this->config('admin/jqadm/url/search/config', []); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
@@ -78,68 +78,68 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | |
| 80 | 80 | ?> |
| 81 | -<?php if( $total > $limit || $offset > 0 || $this->get( 'pos', 'top' ) === 'bottom' ) : ?> |
|
| 81 | +<?php if ($total > $limit || $offset > 0 || $this->get('pos', 'top') === 'bottom') : ?> |
|
| 82 | 82 | <nav class="list-page"> |
| 83 | 83 | <ul class="page-offset pagination"> |
| 84 | - <li class="page-item <?= ( $first === null ? 'disabled' : '' ) ?>"> |
|
| 85 | - <a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 86 | - href="<?php $pOffset['offset'] = $first; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 87 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'First' ) ); ?>"> |
|
| 84 | + <li class="page-item <?= ($first === null ? 'disabled' : '') ?>"> |
|
| 85 | + <a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" |
|
| 86 | + href="<?php $pOffset['offset'] = $first; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>" |
|
| 87 | + aria-label="<?= $enc->attr($this->translate('admin', 'First')); ?>"> |
|
| 88 | 88 | <span class="fa fa-fast-backward" aria-hidden="true"></span> |
| 89 | 89 | </a> |
| 90 | 90 | </li><!-- |
| 91 | - --><li class="page-item <?= ( $prev === null ? 'disabled' : '' ) ?>"> |
|
| 92 | - <a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 93 | - href="<?php $pOffset['offset'] = $prev; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 94 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Previous' ) ); ?>"> |
|
| 91 | + --><li class="page-item <?= ($prev === null ? 'disabled' : '') ?>"> |
|
| 92 | + <a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" |
|
| 93 | + href="<?php $pOffset['offset'] = $prev; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>" |
|
| 94 | + aria-label="<?= $enc->attr($this->translate('admin', 'Previous')); ?>"> |
|
| 95 | 95 | <span class="fa fa-step-backward" aria-hidden="true"></span> |
| 96 | 96 | </a> |
| 97 | 97 | </li><!-- |
| 98 | 98 | --><li class="page-item disabled"> |
| 99 | - <a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" href="#"> |
|
| 100 | - <?= $enc->html( sprintf( $this->translate( 'admin', 'Page %1$d of %2$d' ), $pageCurrent, $pageTotal ) ); ?> |
|
| 99 | + <a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" href="#"> |
|
| 100 | + <?= $enc->html(sprintf($this->translate('admin', 'Page %1$d of %2$d'), $pageCurrent, $pageTotal)); ?> |
|
| 101 | 101 | </a> |
| 102 | 102 | </li><!-- |
| 103 | - --><li class="page-item <?= ( $next === null ? 'disabled' : '' ) ?>"> |
|
| 104 | - <a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 105 | - href="<?php $pOffset['offset'] = $next; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 106 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Next' ) ); ?>"> |
|
| 103 | + --><li class="page-item <?= ($next === null ? 'disabled' : '') ?>"> |
|
| 104 | + <a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" |
|
| 105 | + href="<?php $pOffset['offset'] = $next; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>" |
|
| 106 | + aria-label="<?= $enc->attr($this->translate('admin', 'Next')); ?>"> |
|
| 107 | 107 | <span class="fa fa-step-forward" aria-hidden="true"></span> |
| 108 | 108 | </a> |
| 109 | 109 | </li><!-- |
| 110 | - --><li class="page-item <?= ( $last === null ? 'disabled' : '' ) ?>"> |
|
| 111 | - <a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 112 | - href="<?php $pOffset['offset'] = $last; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 113 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Last' ) ); ?>"> |
|
| 110 | + --><li class="page-item <?= ($last === null ? 'disabled' : '') ?>"> |
|
| 111 | + <a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" |
|
| 112 | + href="<?php $pOffset['offset'] = $last; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>" |
|
| 113 | + aria-label="<?= $enc->attr($this->translate('admin', 'Last')); ?>"> |
|
| 114 | 114 | <span class="fa fa-fast-forward" aria-hidden="true"></span> |
| 115 | 115 | </a> |
| 116 | 116 | </li> |
| 117 | 117 | </ul> |
| 118 | - <div class="page-limit btn-group <?= ( $this->get( 'pos', 'top' ) === 'bottom' ? 'dropup' : '' ); ?>" role="group"> |
|
| 118 | + <div class="page-limit btn-group <?= ($this->get('pos', 'top') === 'bottom' ? 'dropup' : ''); ?>" role="group"> |
|
| 119 | 119 | <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" |
| 120 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>" aria-haspopup="true" aria-expanded="false"> |
|
| 120 | + tabindex="<?= $this->get('tabindex', 1); ?>" aria-haspopup="true" aria-expanded="false"> |
|
| 121 | 121 | <?= $limit; ?> <span class="caret"></span> |
| 122 | 122 | </button> |
| 123 | 123 | <ul class="dropdown-menu"> |
| 124 | 124 | <li class="dropdown-item"> |
| 125 | - <a href="<?php $pLimit['limit'] = 25; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 126 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>">25</a> |
|
| 125 | + <a href="<?php $pLimit['limit'] = 25; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>" |
|
| 126 | + tabindex="<?= $this->get('tabindex', 1); ?>">25</a> |
|
| 127 | 127 | </li> |
| 128 | 128 | <li class="dropdown-item"> |
| 129 | - <a href="<?php $pLimit['limit'] = 50; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 130 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>">50</a> |
|
| 129 | + <a href="<?php $pLimit['limit'] = 50; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>" |
|
| 130 | + tabindex="<?= $this->get('tabindex', 1); ?>">50</a> |
|
| 131 | 131 | </li> |
| 132 | 132 | <li class="dropdown-item"> |
| 133 | - <a href="<?php $pLimit['limit'] = 100; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 134 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>">100</a> |
|
| 133 | + <a href="<?php $pLimit['limit'] = 100; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>" |
|
| 134 | + tabindex="<?= $this->get('tabindex', 1); ?>">100</a> |
|
| 135 | 135 | </li> |
| 136 | 136 | <li class="dropdown-item"> |
| 137 | - <a href="<?php $pLimit['limit'] = 200; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 138 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>">200</a> |
|
| 137 | + <a href="<?php $pLimit['limit'] = 200; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>" |
|
| 138 | + tabindex="<?= $this->get('tabindex', 1); ?>">200</a> |
|
| 139 | 139 | </li> |
| 140 | 140 | <li class="dropdown-item"> |
| 141 | - <a href="<?php $pLimit['limit'] = 500; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>" |
|
| 142 | - tabindex="<?= $this->get( 'tabindex', 1 ); ?>">500</a> |
|
| 141 | + <a href="<?php $pLimit['limit'] = 500; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>" |
|
| 142 | + tabindex="<?= $this->get('tabindex', 1); ?>">500</a> |
|
| 143 | 143 | </li> |
| 144 | 144 | </ul> |
| 145 | 145 | </div> |
@@ -6,12 +6,12 @@ discard block |
||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | |
| 9 | -$selected = function( $key, $code ) { |
|
| 10 | - return ( $key == $code ? 'selected="selected"' : '' ); |
|
| 9 | +$selected = function($key, $code) { |
|
| 10 | + return ($key == $code ? 'selected="selected"' : ''); |
|
| 11 | 11 | }; |
| 12 | 12 | |
| 13 | 13 | $enc = $this->encoder(); |
| 14 | -$params = $this->get( 'pageParams', [] ); |
|
| 14 | +$params = $this->get('pageParams', []); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | /** admin/jqadm/order/invoice/fields |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | * @category Developer |
| 30 | 30 | */ |
| 31 | 31 | $default = ['order.id', 'order.datepayment', 'order.statuspayment', 'order.statusdelivery']; |
| 32 | -$default = $this->config( 'admin/jqadm/order/invoice/fields', $default ); |
|
| 33 | -$fields = $this->session( 'aimeos/admin/jqadm/orderinvoice/fields', $default ); |
|
| 32 | +$default = $this->config('admin/jqadm/order/invoice/fields', $default); |
|
| 33 | +$fields = $this->session('aimeos/admin/jqadm/orderinvoice/fields', $default); |
|
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | /** admin/jqadm/order/invoice/types |
@@ -44,30 +44,30 @@ discard block |
||
| 44 | 44 | * @since 2017.07 |
| 45 | 45 | * @category Developer |
| 46 | 46 | */ |
| 47 | -$types = $this->config( 'admin/jqadm/order/invoice/fields', ['web', 'phone'] ); |
|
| 47 | +$types = $this->config('admin/jqadm/order/invoice/fields', ['web', 'phone']); |
|
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | $paymentStatusList = [ |
| 51 | - '-1' => $this->translate( 'mshop/code', 'pay:-1' ), |
|
| 52 | - '0' => $this->translate( 'mshop/code', 'pay:0' ), |
|
| 53 | - '1' => $this->translate( 'mshop/code', 'pay:1' ), |
|
| 54 | - '2' => $this->translate( 'mshop/code', 'pay:2' ), |
|
| 55 | - '3' => $this->translate( 'mshop/code', 'pay:3' ), |
|
| 56 | - '4' => $this->translate( 'mshop/code', 'pay:4' ), |
|
| 57 | - '5' => $this->translate( 'mshop/code', 'pay:5' ), |
|
| 58 | - '6' => $this->translate( 'mshop/code', 'pay:6' ), |
|
| 51 | + '-1' => $this->translate('mshop/code', 'pay:-1'), |
|
| 52 | + '0' => $this->translate('mshop/code', 'pay:0'), |
|
| 53 | + '1' => $this->translate('mshop/code', 'pay:1'), |
|
| 54 | + '2' => $this->translate('mshop/code', 'pay:2'), |
|
| 55 | + '3' => $this->translate('mshop/code', 'pay:3'), |
|
| 56 | + '4' => $this->translate('mshop/code', 'pay:4'), |
|
| 57 | + '5' => $this->translate('mshop/code', 'pay:5'), |
|
| 58 | + '6' => $this->translate('mshop/code', 'pay:6'), |
|
| 59 | 59 | ]; |
| 60 | 60 | |
| 61 | 61 | $statusList = [ |
| 62 | - '-1' => $this->translate( 'mshop/code', 'stat:-1' ), |
|
| 63 | - '0' => $this->translate( 'mshop/code', 'stat:0' ), |
|
| 64 | - '1' => $this->translate( 'mshop/code', 'stat:1' ), |
|
| 65 | - '2' => $this->translate( 'mshop/code', 'stat:2' ), |
|
| 66 | - '3' => $this->translate( 'mshop/code', 'stat:3' ), |
|
| 67 | - '4' => $this->translate( 'mshop/code', 'stat:4' ), |
|
| 68 | - '5' => $this->translate( 'mshop/code', 'stat:5' ), |
|
| 69 | - '6' => $this->translate( 'mshop/code', 'stat:6' ), |
|
| 70 | - '7' => $this->translate( 'mshop/code', 'stat:7' ), |
|
| 62 | + '-1' => $this->translate('mshop/code', 'stat:-1'), |
|
| 63 | + '0' => $this->translate('mshop/code', 'stat:0'), |
|
| 64 | + '1' => $this->translate('mshop/code', 'stat:1'), |
|
| 65 | + '2' => $this->translate('mshop/code', 'stat:2'), |
|
| 66 | + '3' => $this->translate('mshop/code', 'stat:3'), |
|
| 67 | + '4' => $this->translate('mshop/code', 'stat:4'), |
|
| 68 | + '5' => $this->translate('mshop/code', 'stat:5'), |
|
| 69 | + '6' => $this->translate('mshop/code', 'stat:6'), |
|
| 70 | + '7' => $this->translate('mshop/code', 'stat:7'), |
|
| 71 | 71 | ]; |
| 72 | 72 | |
| 73 | 73 | |
@@ -75,10 +75,10 @@ discard block |
||
| 75 | 75 | <div id="invoice" class="item-invoice content-block tab-pane fade" role="tabpanel" aria-labelledby="invoice"> |
| 76 | 76 | |
| 77 | 77 | <?= $this->partial( |
| 78 | - $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
|
| 79 | - ['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'invoiceTotal' ), |
|
| 78 | + $this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'), |
|
| 79 | + ['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('invoiceTotal'), |
|
| 80 | 80 | 'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice', |
| 81 | - 'page' => $this->session( 'aimeos/admin/jqadm/orderinvoice/page', [] )] |
|
| 81 | + 'page' => $this->session('aimeos/admin/jqadm/orderinvoice/page', [])] |
|
| 82 | 82 | ); |
| 83 | 83 | ?> |
| 84 | 84 | |
@@ -86,45 +86,45 @@ discard block |
||
| 86 | 86 | <thead class="list-header"> |
| 87 | 87 | <tr> |
| 88 | 88 | <?= $this->partial( |
| 89 | - $this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [ |
|
| 90 | - 'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ), |
|
| 89 | + $this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), [ |
|
| 90 | + 'fields' => $fields, 'params' => $params, 'tabindex' => $this->get('tabindex'), |
|
| 91 | 91 | 'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice', |
| 92 | - 'sort' => $this->session( 'aimeos/admin/jqadm/product/sort' ), |
|
| 92 | + 'sort' => $this->session('aimeos/admin/jqadm/product/sort'), |
|
| 93 | 93 | 'data' => [ |
| 94 | - 'order.id' => $this->translate( 'admin', 'Invoice' ), |
|
| 95 | - 'order.type' => $this->translate( 'admin', 'Type' ), |
|
| 96 | - 'order.datepayment' => $this->translate( 'admin', 'Payment' ), |
|
| 97 | - 'order.statuspayment' => $this->translate( 'admin', 'Payment status' ), |
|
| 98 | - 'order.datedelivery' => $this->translate( 'admin', 'Delivery' ), |
|
| 99 | - 'order.statusdelivery' => $this->translate( 'admin', 'Delivery status' ), |
|
| 100 | - 'order.relatedid' => $this->translate( 'admin', 'Related ID' ), |
|
| 101 | - 'order.ctime' => $this->translate( 'admin', 'Created' ), |
|
| 102 | - 'order.mtime' => $this->translate( 'admin', 'Modified' ), |
|
| 103 | - 'order.editor' => $this->translate( 'admin', 'Editor' ), |
|
| 94 | + 'order.id' => $this->translate('admin', 'Invoice'), |
|
| 95 | + 'order.type' => $this->translate('admin', 'Type'), |
|
| 96 | + 'order.datepayment' => $this->translate('admin', 'Payment'), |
|
| 97 | + 'order.statuspayment' => $this->translate('admin', 'Payment status'), |
|
| 98 | + 'order.datedelivery' => $this->translate('admin', 'Delivery'), |
|
| 99 | + 'order.statusdelivery' => $this->translate('admin', 'Delivery status'), |
|
| 100 | + 'order.relatedid' => $this->translate('admin', 'Related ID'), |
|
| 101 | + 'order.ctime' => $this->translate('admin', 'Created'), |
|
| 102 | + 'order.mtime' => $this->translate('admin', 'Modified'), |
|
| 103 | + 'order.editor' => $this->translate('admin', 'Editor'), |
|
| 104 | 104 | ] |
| 105 | 105 | ] ); |
| 106 | 106 | ?> |
| 107 | 107 | |
| 108 | 108 | <th class="actions"> |
| 109 | - <a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 110 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 111 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
|
| 109 | + <a class="btn fa act-add" href="#" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 110 | + title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>" |
|
| 111 | + aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>"> |
|
| 112 | 112 | </a> |
| 113 | 113 | |
| 114 | 114 | <?= $this->partial( |
| 115 | - $this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ), [ |
|
| 116 | - 'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get( 'tabindex' ), |
|
| 115 | + $this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [ |
|
| 116 | + 'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get('tabindex'), |
|
| 117 | 117 | 'data' => [ |
| 118 | - 'order.id' => $this->translate( 'admin', 'Invoice' ), |
|
| 119 | - 'order.type' => $this->translate( 'admin', 'Type' ), |
|
| 120 | - 'order.datepayment' => $this->translate( 'admin', 'Payment' ), |
|
| 121 | - 'order.statuspayment' => $this->translate( 'admin', 'Payment status' ), |
|
| 122 | - 'order.datedelivery' => $this->translate( 'admin', 'Delivery' ), |
|
| 123 | - 'order.statusdelivery' => $this->translate( 'admin', 'Delivery status' ), |
|
| 124 | - 'order.relatedid' => $this->translate( 'admin', 'Related ID' ), |
|
| 125 | - 'order.ctime' => $this->translate( 'admin', 'Created' ), |
|
| 126 | - 'order.mtime' => $this->translate( 'admin', 'Modified' ), |
|
| 127 | - 'order.editor' => $this->translate( 'admin', 'Editor' ), |
|
| 118 | + 'order.id' => $this->translate('admin', 'Invoice'), |
|
| 119 | + 'order.type' => $this->translate('admin', 'Type'), |
|
| 120 | + 'order.datepayment' => $this->translate('admin', 'Payment'), |
|
| 121 | + 'order.statuspayment' => $this->translate('admin', 'Payment status'), |
|
| 122 | + 'order.datedelivery' => $this->translate('admin', 'Delivery'), |
|
| 123 | + 'order.statusdelivery' => $this->translate('admin', 'Delivery status'), |
|
| 124 | + 'order.relatedid' => $this->translate('admin', 'Related ID'), |
|
| 125 | + 'order.ctime' => $this->translate('admin', 'Created'), |
|
| 126 | + 'order.mtime' => $this->translate('admin', 'Modified'), |
|
| 127 | + 'order.editor' => $this->translate('admin', 'Editor'), |
|
| 128 | 128 | ] |
| 129 | 129 | ] ); |
| 130 | 130 | ?> |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | </thead> |
| 134 | 134 | <tbody> |
| 135 | 135 | <?= $this->partial( |
| 136 | - $this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [ |
|
| 137 | - 'filter' => $this->session( 'aimeos/admin/jqadm/orderinvoice/filter', [] ), |
|
| 138 | - 'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get( 'tabindex' ), |
|
| 136 | + $this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [ |
|
| 137 | + 'filter' => $this->session('aimeos/admin/jqadm/orderinvoice/filter', []), |
|
| 138 | + 'fields' => $fields, 'group' => 'oi', 'tabindex' => $this->get('tabindex'), |
|
| 139 | 139 | 'data' => [ |
| 140 | 140 | 'order.id' => ['oi' => '==', 'type' => 'number'], |
| 141 | 141 | 'order.type' => ['oi' => '~=', 'type' => 'select', 'val' => [ |
| 142 | - 'web' => $this->translate( 'mshop/code', 'order:web' ), |
|
| 143 | - 'phone' => $this->translate( 'mshop/code', 'order:phone' ), |
|
| 142 | + 'web' => $this->translate('mshop/code', 'order:web'), |
|
| 143 | + 'phone' => $this->translate('mshop/code', 'order:phone'), |
|
| 144 | 144 | ]], |
| 145 | 145 | 'order.datepayment' => ['oi' => '>=', 'type' => 'datetime-local'], |
| 146 | 146 | 'order.statuspayment' => ['oi' => '==', 'type' => 'select', 'val' => $paymentStatusList], |
@@ -155,198 +155,198 @@ discard block |
||
| 155 | 155 | ?> |
| 156 | 156 | |
| 157 | 157 | <tr class="list-item-new prototype"> |
| 158 | - <td colspan="<?= count( $fields ); ?>"> |
|
| 158 | + <td colspan="<?= count($fields); ?>"> |
|
| 159 | 159 | <div class="content-block row"> |
| 160 | 160 | <div class="col-xl-6"> |
| 161 | 161 | <input class="order-id" type="hidden" value="" disabled="disabled" |
| 162 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.id', '' ) ) ); ?>" /> |
|
| 162 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.id', ''))); ?>" /> |
|
| 163 | 163 | |
| 164 | 164 | <div class="form-group row mandatory"> |
| 165 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label> |
|
| 165 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label> |
|
| 166 | 166 | <div class="col-sm-8"> |
| 167 | - <select class="form-control custom-select order-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 168 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.type', '' ) ) ); ?>" disabled="disabled"> |
|
| 169 | - <option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option> |
|
| 167 | + <select class="form-control custom-select order-type" required="required" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 168 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.type', ''))); ?>" disabled="disabled"> |
|
| 169 | + <option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option> |
|
| 170 | 170 | |
| 171 | - <?php foreach( $types as $type ) : ?> |
|
| 172 | - <option value="<?= $enc->attr( $type ); ?>" ><?= $enc->html( $type ); ?></option> |
|
| 171 | + <?php foreach ($types as $type) : ?> |
|
| 172 | + <option value="<?= $enc->attr($type); ?>" ><?= $enc->html($type); ?></option> |
|
| 173 | 173 | <?php endforeach; ?> |
| 174 | 174 | </select> |
| 175 | 175 | </div> |
| 176 | 176 | <div class="col-sm-12 form-text text-muted help-text"> |
| 177 | - <?= $enc->html( $this->translate( 'admin', 'Source of the invoice, e.g. by web or phone' ) ); ?> |
|
| 177 | + <?= $enc->html($this->translate('admin', 'Source of the invoice, e.g. by web or phone')); ?> |
|
| 178 | 178 | </div> |
| 179 | 179 | </div> |
| 180 | 180 | <div class="form-group row mandatory"> |
| 181 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Payment' ) ); ?></label> |
|
| 181 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Payment')); ?></label> |
|
| 182 | 182 | <div class="col-sm-8"> |
| 183 | - <input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 184 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datepayment', '' ) ) ); ?>" disabled="disabled" /> |
|
| 183 | + <input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 184 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.datepayment', ''))); ?>" disabled="disabled" /> |
|
| 185 | 185 | </div> |
| 186 | 186 | <div class="col-sm-12 form-text text-muted help-text"> |
| 187 | - <?= $enc->html( $this->translate( 'admin', 'Date of the last payment status change' ) ); ?> |
|
| 187 | + <?= $enc->html($this->translate('admin', 'Date of the last payment status change')); ?> |
|
| 188 | 188 | </div> |
| 189 | 189 | </div> |
| 190 | 190 | <div class="form-group row mandatory"> |
| 191 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Payment status' ) ); ?></label> |
|
| 191 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Payment status')); ?></label> |
|
| 192 | 192 | <div class="col-sm-8"> |
| 193 | - <select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 194 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statuspayment', '' ) ) ); ?>" disabled="disabled"> |
|
| 195 | - <option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option> |
|
| 196 | - <?php foreach( $paymentStatusList as $code => $label ) : ?> |
|
| 197 | - <option value="<?= $code ?>"><?= $enc->html( $label ); ?></option> |
|
| 193 | + <select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 194 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.statuspayment', ''))); ?>" disabled="disabled"> |
|
| 195 | + <option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option> |
|
| 196 | + <?php foreach ($paymentStatusList as $code => $label) : ?> |
|
| 197 | + <option value="<?= $code ?>"><?= $enc->html($label); ?></option> |
|
| 198 | 198 | <?php endforeach; ?> |
| 199 | 199 | </select> |
| 200 | 200 | </div> |
| 201 | 201 | <div class="col-sm-12 form-text text-muted help-text"> |
| 202 | - <?= $enc->html( $this->translate( 'admin', 'Last payment status of the order' ) ); ?> |
|
| 202 | + <?= $enc->html($this->translate('admin', 'Last payment status of the order')); ?> |
|
| 203 | 203 | </div> |
| 204 | 204 | </div> |
| 205 | 205 | </div> |
| 206 | 206 | <div class="col-xl-6"> |
| 207 | 207 | <div class="form-group row optional"> |
| 208 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Delivery' ) ); ?></label> |
|
| 208 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Delivery')); ?></label> |
|
| 209 | 209 | <div class="col-sm-8"> |
| 210 | - <input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 211 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datedelivery', '' ) ) ); ?>" disabled="disabled" /> |
|
| 210 | + <input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 211 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.datedelivery', ''))); ?>" disabled="disabled" /> |
|
| 212 | 212 | </div> |
| 213 | 213 | <div class="col-sm-12 form-text text-muted help-text"> |
| 214 | - <?= $enc->html( $this->translate( 'admin', 'Date of the last delivery status change' ) ); ?> |
|
| 214 | + <?= $enc->html($this->translate('admin', 'Date of the last delivery status change')); ?> |
|
| 215 | 215 | </div> |
| 216 | 216 | </div> |
| 217 | 217 | <div class="form-group row optional"> |
| 218 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Delivery status' ) ); ?></label> |
|
| 218 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Delivery status')); ?></label> |
|
| 219 | 219 | <div class="col-sm-8"> |
| 220 | - <select class="form-control custom-select order-statusdelivery" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 221 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statusdelivery', '' ) ) ); ?>" disabled="disabled"> |
|
| 222 | - <option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option> |
|
| 223 | - <?php foreach( $statusList as $code => $label ) : ?> |
|
| 224 | - <option value="<?= $code ?>"><?= $enc->html( $label ); ?></option> |
|
| 220 | + <select class="form-control custom-select order-statusdelivery" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 221 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.statusdelivery', ''))); ?>" disabled="disabled"> |
|
| 222 | + <option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option> |
|
| 223 | + <?php foreach ($statusList as $code => $label) : ?> |
|
| 224 | + <option value="<?= $code ?>"><?= $enc->html($label); ?></option> |
|
| 225 | 225 | <?php endforeach; ?> |
| 226 | 226 | </select> |
| 227 | 227 | </div> |
| 228 | 228 | <div class="col-sm-12 form-text text-muted help-text"> |
| 229 | - <?= $enc->html( $this->translate( 'admin', 'Last delivery status of the order' ) ); ?> |
|
| 229 | + <?= $enc->html($this->translate('admin', 'Last delivery status of the order')); ?> |
|
| 230 | 230 | </div> |
| 231 | 231 | </div> |
| 232 | 232 | <div class="form-group row optional"> |
| 233 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Related ID' ) ); ?></label> |
|
| 233 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Related ID')); ?></label> |
|
| 234 | 234 | <div class="col-sm-8"> |
| 235 | - <input class="form-control order-relatedid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 236 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.relatedid', '' ) ) ); ?>" disabled="disabled" /> |
|
| 235 | + <input class="form-control order-relatedid" type="text" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 236 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.relatedid', ''))); ?>" disabled="disabled" /> |
|
| 237 | 237 | </div> |
| 238 | 238 | <div class="col-sm-12 form-text text-muted help-text"> |
| 239 | - <?= $enc->html( $this->translate( 'admin', 'ID of a related invoice, e.g. of a changed or refunded invoice' ) ); ?> |
|
| 239 | + <?= $enc->html($this->translate('admin', 'ID of a related invoice, e.g. of a changed or refunded invoice')); ?> |
|
| 240 | 240 | </div> |
| 241 | 241 | </div> |
| 242 | 242 | </div> |
| 243 | 243 | </div> |
| 244 | 244 | </td> |
| 245 | 245 | <td class="actions"> |
| 246 | - <a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 247 | - title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>" |
|
| 248 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"> |
|
| 246 | + <a class="btn fa act-close" href="#" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 247 | + title="<?= $enc->attr($this->translate('admin', 'Close')); ?>" |
|
| 248 | + aria-label="<?= $enc->attr($this->translate('admin', 'Close')); ?>"> |
|
| 249 | 249 | </a> |
| 250 | 250 | </td> |
| 251 | 251 | </tr> |
| 252 | 252 | |
| 253 | - <?php foreach( $this->get( 'invoiceData/order.id', [] ) as $idx => $orderId ) : ?> |
|
| 254 | - <?php $siteId = $this->get( 'invoiceData/order.siteid/' . $idx ); ?> |
|
| 253 | + <?php foreach ($this->get('invoiceData/order.id', []) as $idx => $orderId) : ?> |
|
| 254 | + <?php $siteId = $this->get('invoiceData/order.siteid/' . $idx); ?> |
|
| 255 | 255 | |
| 256 | - <tr class="list-item <?= $this->site()->readonly( $siteId ); ?>"> |
|
| 257 | - <?php if( in_array( 'order.id', $fields ) ) : ?> |
|
| 256 | + <tr class="list-item <?= $this->site()->readonly($siteId); ?>"> |
|
| 257 | + <?php if (in_array('order.id', $fields)) : ?> |
|
| 258 | 258 | <td class="order-id"> |
| 259 | 259 | <input class="order-id" type="hidden" |
| 260 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.id', '' ) ) ); ?>" |
|
| 261 | - value="<?= $enc->attr( $orderId ); ?>" disabled="disabled" /> |
|
| 262 | - <?= $enc->html( $orderId ); ?> |
|
| 260 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.id', ''))); ?>" |
|
| 261 | + value="<?= $enc->attr($orderId); ?>" disabled="disabled" /> |
|
| 262 | + <?= $enc->html($orderId); ?> |
|
| 263 | 263 | </td> |
| 264 | 264 | <?php endif; ?> |
| 265 | - <?php if( in_array( 'order.type', $fields ) ) : ?> |
|
| 265 | + <?php if (in_array('order.type', $fields)) : ?> |
|
| 266 | 266 | <td class="order-type"> |
| 267 | - <select class="form-control custom-select order-type" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 268 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.type', '' ) ) ); ?>" |
|
| 269 | - value="<?= $enc->attr( $this->get( 'invoiceData/order.type/' . $idx ) ); ?>" disabled="disabled" /> |
|
| 270 | - <option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option> |
|
| 267 | + <select class="form-control custom-select order-type" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 268 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.type', ''))); ?>" |
|
| 269 | + value="<?= $enc->attr($this->get('invoiceData/order.type/' . $idx)); ?>" disabled="disabled" /> |
|
| 270 | + <option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option> |
|
| 271 | 271 | |
| 272 | - <?php foreach( $types as $type ) : ?> |
|
| 273 | - <option value="<?= $enc->attr( $type ); ?>" <?= $selected( $this->get( 'invoiceData/order.type/' . $idx ), $type ); ?> > |
|
| 274 | - <?= $enc->html( $type ); ?> |
|
| 272 | + <?php foreach ($types as $type) : ?> |
|
| 273 | + <option value="<?= $enc->attr($type); ?>" <?= $selected($this->get('invoiceData/order.type/' . $idx), $type); ?> > |
|
| 274 | + <?= $enc->html($type); ?> |
|
| 275 | 275 | </option> |
| 276 | 276 | <?php endforeach; ?> |
| 277 | 277 | </select> |
| 278 | 278 | </td> |
| 279 | 279 | <?php endif; ?> |
| 280 | - <?php if( in_array( 'order.datepayment', $fields ) ) : ?> |
|
| 280 | + <?php if (in_array('order.datepayment', $fields)) : ?> |
|
| 281 | 281 | <td class="order-datepayment"> |
| 282 | - <input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 283 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datepayment', '' ) ) ); ?>" |
|
| 284 | - value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'invoiceData/order.datepayment/' . $idx ) ) ); ?>" |
|
| 285 | - <?= $this->site()->readonly( $siteId ); ?> disabled="disabled" /> |
|
| 282 | + <input class="form-control order-datepayment" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 283 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.datepayment', ''))); ?>" |
|
| 284 | + value="<?= $enc->attr(str_replace(' ', 'T', $this->get('invoiceData/order.datepayment/' . $idx))); ?>" |
|
| 285 | + <?= $this->site()->readonly($siteId); ?> disabled="disabled" /> |
|
| 286 | 286 | </td> |
| 287 | 287 | <?php endif; ?> |
| 288 | - <?php if( in_array( 'order.statuspayment', $fields ) ) : ?> |
|
| 288 | + <?php if (in_array('order.statuspayment', $fields)) : ?> |
|
| 289 | 289 | <td class="order-statuspayment"> |
| 290 | - <select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 291 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statuspayment', '' ) ) ); ?>" |
|
| 292 | - <?= $this->site()->readonly( $siteId ); ?> disabled="disabled" > |
|
| 290 | + <select class="form-control custom-select order-statuspayment" required="required" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 291 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.statuspayment', ''))); ?>" |
|
| 292 | + <?= $this->site()->readonly($siteId); ?> disabled="disabled" > |
|
| 293 | 293 | <option value=""> |
| 294 | - <?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 294 | + <?= $enc->html($this->translate('admin', 'Please select')); ?> |
|
| 295 | 295 | </option> |
| 296 | - <?php foreach( $paymentStatusList as $code => $label ) : ?> |
|
| 297 | - <option value="<?= $code ?>" <?= $selected( $this->get( 'invoiceData/order.statuspayment/' . $idx ), $code ); ?> > |
|
| 298 | - <?= $enc->html( $label ); ?> |
|
| 296 | + <?php foreach ($paymentStatusList as $code => $label) : ?> |
|
| 297 | + <option value="<?= $code ?>" <?= $selected($this->get('invoiceData/order.statuspayment/' . $idx), $code); ?> > |
|
| 298 | + <?= $enc->html($label); ?> |
|
| 299 | 299 | </option> |
| 300 | 300 | <?php endforeach; ?> |
| 301 | 301 | </select> |
| 302 | 302 | </td> |
| 303 | 303 | <?php endif; ?> |
| 304 | - <?php if( in_array( 'order.datedelivery', $fields ) ) : ?> |
|
| 304 | + <?php if (in_array('order.datedelivery', $fields)) : ?> |
|
| 305 | 305 | <td class="order-datedelivery"> |
| 306 | - <input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 307 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.datedelivery', '' ) ) ); ?>" |
|
| 308 | - value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'invoiceData/order.datedelivery/' . $idx ) ) ); ?>" |
|
| 309 | - <?= $this->site()->readonly( $siteId ); ?> disabled="disabled" /> |
|
| 306 | + <input class="form-control order-datedelivery" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 307 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.datedelivery', ''))); ?>" |
|
| 308 | + value="<?= $enc->attr(str_replace(' ', 'T', $this->get('invoiceData/order.datedelivery/' . $idx))); ?>" |
|
| 309 | + <?= $this->site()->readonly($siteId); ?> disabled="disabled" /> |
|
| 310 | 310 | </td> |
| 311 | 311 | <?php endif; ?> |
| 312 | - <?php if( in_array( 'order.statusdelivery', $fields ) ) : ?> |
|
| 312 | + <?php if (in_array('order.statusdelivery', $fields)) : ?> |
|
| 313 | 313 | <td class="order-statusdelivery"> |
| 314 | - <select class="form-control custom-select order-statusdelivery" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 315 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.statusdelivery', '' ) ) ); ?>" |
|
| 316 | - <?= $this->site()->readonly( $siteId ); ?> disabled="disabled" > |
|
| 314 | + <select class="form-control custom-select order-statusdelivery" required="required" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 315 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.statusdelivery', ''))); ?>" |
|
| 316 | + <?= $this->site()->readonly($siteId); ?> disabled="disabled" > |
|
| 317 | 317 | <option value=""> |
| 318 | - <?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 318 | + <?= $enc->html($this->translate('admin', 'Please select')); ?> |
|
| 319 | 319 | </option> |
| 320 | - <?php foreach( $statusList as $code => $label ) : ?> |
|
| 321 | - <option value="<?= $code ?>" <?= $selected( $this->get( 'invoiceData/order.statusdelivery/' . $idx ), $code ); ?> > |
|
| 322 | - <?= $enc->html( $label ); ?> |
|
| 320 | + <?php foreach ($statusList as $code => $label) : ?> |
|
| 321 | + <option value="<?= $code ?>" <?= $selected($this->get('invoiceData/order.statusdelivery/' . $idx), $code); ?> > |
|
| 322 | + <?= $enc->html($label); ?> |
|
| 323 | 323 | </option> |
| 324 | 324 | <?php endforeach; ?> |
| 325 | 325 | </select> |
| 326 | 326 | </td> |
| 327 | 327 | <?php endif; ?> |
| 328 | - <?php if( in_array( 'order.relatedid', $fields ) ) : ?> |
|
| 328 | + <?php if (in_array('order.relatedid', $fields)) : ?> |
|
| 329 | 329 | <td class="order-relatedid"> |
| 330 | - <input class="form-control order-relatedid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
| 331 | - name="<?= $enc->attr( $this->formparam( array( 'invoice', 'order.relatedid', '' ) ) ); ?>" |
|
| 332 | - value="<?= $enc->attr( $this->get( 'invoiceData/order.relatedid/' . $idx ) ); ?>" |
|
| 333 | - <?= $this->site()->readonly( $siteId ); ?> disabled="disabled" /> |
|
| 330 | + <input class="form-control order-relatedid" type="text" tabindex="<?= $this->get('tabindex'); ?>" |
|
| 331 | + name="<?= $enc->attr($this->formparam(array('invoice', 'order.relatedid', ''))); ?>" |
|
| 332 | + value="<?= $enc->attr($this->get('invoiceData/order.relatedid/' . $idx)); ?>" |
|
| 333 | + <?= $this->site()->readonly($siteId); ?> disabled="disabled" /> |
|
| 334 | 334 | </td> |
| 335 | 335 | <?php endif; ?> |
| 336 | - <?php if( in_array( 'order.ctime', $fields ) ) : ?> |
|
| 337 | - <td class="order-ctime"><?= $enc->html( $this->get( 'invoiceData/order.ctime/' . $idx ) ); ?></td> |
|
| 336 | + <?php if (in_array('order.ctime', $fields)) : ?> |
|
| 337 | + <td class="order-ctime"><?= $enc->html($this->get('invoiceData/order.ctime/' . $idx)); ?></td> |
|
| 338 | 338 | <?php endif; ?> |
| 339 | - <?php if( in_array( 'order.mtime', $fields ) ) : ?> |
|
| 340 | - <td class="order-mtime"><?= $enc->html( $this->get( 'invoiceData/order.mtime/' . $idx ) ); ?></td> |
|
| 339 | + <?php if (in_array('order.mtime', $fields)) : ?> |
|
| 340 | + <td class="order-mtime"><?= $enc->html($this->get('invoiceData/order.mtime/' . $idx)); ?></td> |
|
| 341 | 341 | <?php endif; ?> |
| 342 | - <?php if( in_array( 'order.editor', $fields ) ) : ?> |
|
| 343 | - <td class="order-editor"><?= $enc->html( $this->get( 'invoiceData/order.editor/' . $idx ) ); ?></td> |
|
| 342 | + <?php if (in_array('order.editor', $fields)) : ?> |
|
| 343 | + <td class="order-editor"><?= $enc->html($this->get('invoiceData/order.editor/' . $idx)); ?></td> |
|
| 344 | 344 | <?php endif; ?> |
| 345 | 345 | <td class="actions"> |
| 346 | - <?php if( !$this->site()->readonly( $siteId ) ) : ?> |
|
| 347 | - <a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#" |
|
| 348 | - title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>" |
|
| 349 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a> |
|
| 346 | + <?php if (!$this->site()->readonly($siteId)) : ?> |
|
| 347 | + <a class="btn act-edit fa" tabindex="<?= $this->get('tabindex'); ?>" href="#" |
|
| 348 | + title="<?= $enc->attr($this->translate('admin', 'Edit this entry')); ?>" |
|
| 349 | + aria-label="<?= $enc->attr($this->translate('admin', 'Edit')); ?>"></a> |
|
| 350 | 350 | <?php endif; ?> |
| 351 | 351 | </td> |
| 352 | 352 | </tr> |
@@ -354,17 +354,17 @@ discard block |
||
| 354 | 354 | </tbody> |
| 355 | 355 | </table> |
| 356 | 356 | |
| 357 | - <?php if( $this->get( 'invoiceData/order.id', [] ) === [] ) : ?> |
|
| 358 | - <div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div> |
|
| 357 | + <?php if ($this->get('invoiceData/order.id', []) === []) : ?> |
|
| 358 | + <div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div> |
|
| 359 | 359 | <?php endif; ?> |
| 360 | 360 | |
| 361 | 361 | <?= $this->partial( |
| 362 | - $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
|
| 363 | - ['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'invoiceTotal' ), |
|
| 362 | + $this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'), |
|
| 363 | + ['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('invoiceTotal'), |
|
| 364 | 364 | 'group' => 'oi', 'action' => 'get', 'fragment' => 'invoice', |
| 365 | - 'page' =>$this->session( 'aimeos/admin/jqadm/orderinvoice/page', [] )] |
|
| 365 | + 'page' =>$this->session('aimeos/admin/jqadm/orderinvoice/page', [])] |
|
| 366 | 366 | ); |
| 367 | 367 | ?> |
| 368 | 368 | |
| 369 | 369 | </div> |
| 370 | -<?= $this->get( 'invoiceIBody' ); ?> |
|
| 370 | +<?= $this->get('invoiceIBody'); ?> |
|
@@ -8,20 +8,20 @@ discard block |
||
| 8 | 8 | $enc = $this->encoder(); |
| 9 | 9 | |
| 10 | 10 | |
| 11 | -$target = $this->config( 'admin/jqadm/url/search/target' ); |
|
| 12 | -$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
|
| 13 | -$action = $this->config( 'admin/jqadm/url/search/action', 'search' ); |
|
| 14 | -$config = $this->config( 'admin/jqadm/url/search/config', [] ); |
|
| 11 | +$target = $this->config('admin/jqadm/url/search/target'); |
|
| 12 | +$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm'); |
|
| 13 | +$action = $this->config('admin/jqadm/url/search/action', 'search'); |
|
| 14 | +$config = $this->config('admin/jqadm/url/search/config', []); |
|
| 15 | 15 | |
| 16 | -$getTarget = $this->config( 'admin/jqadm/url/get/target' ); |
|
| 17 | -$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
|
| 18 | -$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
|
| 19 | -$getConfig = $this->config( 'admin/jqadm/url/get/config', [] ); |
|
| 16 | +$getTarget = $this->config('admin/jqadm/url/get/target'); |
|
| 17 | +$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm'); |
|
| 18 | +$getAction = $this->config('admin/jqadm/url/get/action', 'get'); |
|
| 19 | +$getConfig = $this->config('admin/jqadm/url/get/config', []); |
|
| 20 | 20 | |
| 21 | -$copyTarget = $this->config( 'admin/jqadm/url/copy/target' ); |
|
| 22 | -$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' ); |
|
| 23 | -$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' ); |
|
| 24 | -$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] ); |
|
| 21 | +$copyTarget = $this->config('admin/jqadm/url/copy/target'); |
|
| 22 | +$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm'); |
|
| 23 | +$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy'); |
|
| 24 | +$copyConfig = $this->config('admin/jqadm/url/copy/config', []); |
|
| 25 | 25 | |
| 26 | 26 | /** admin/jqadm/url/export/target |
| 27 | 27 | * Destination of the URL where the controller specified in the URL is known |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @see admin/jqadm/url/export/action |
| 38 | 38 | * @see admin/jqadm/url/export/config |
| 39 | 39 | */ |
| 40 | -$expTarget = $this->config( 'admin/jqadm/url/export/target' ); |
|
| 40 | +$expTarget = $this->config('admin/jqadm/url/export/target'); |
|
| 41 | 41 | |
| 42 | 42 | /** admin/jqadm/url/export/controller |
| 43 | 43 | * Name of the controller whose action should be called |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * @see admin/jqadm/url/export/action |
| 54 | 54 | * @see admin/jqadm/url/export/config |
| 55 | 55 | */ |
| 56 | -$expCntl = $this->config( 'admin/jqadm/url/export/controller', 'Jqadm' ); |
|
| 56 | +$expCntl = $this->config('admin/jqadm/url/export/controller', 'Jqadm'); |
|
| 57 | 57 | |
| 58 | 58 | /** admin/jqadm/url/export/action |
| 59 | 59 | * Name of the action that should create the output |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @see admin/jqadm/url/export/controller |
| 70 | 70 | * @see admin/jqadm/url/export/config |
| 71 | 71 | */ |
| 72 | -$expAction = $this->config( 'admin/jqadm/url/export/action', 'export' ); |
|
| 72 | +$expAction = $this->config('admin/jqadm/url/export/action', 'export'); |
|
| 73 | 73 | |
| 74 | 74 | /** admin/jqadm/url/export/config |
| 75 | 75 | * Associative list of configuration options used for generating the URL |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @see admin/jqadm/url/export/controller |
| 92 | 92 | * @see admin/jqadm/url/export/action |
| 93 | 93 | */ |
| 94 | -$expConfig = $this->config( 'admin/jqadm/url/export/config', [] ); |
|
| 94 | +$expConfig = $this->config('admin/jqadm/url/export/config', []); |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | /** admin/jqadm/order/fields |
@@ -108,105 +108,105 @@ discard block |
||
| 108 | 108 | * @since 2017.07 |
| 109 | 109 | * @category Developer |
| 110 | 110 | */ |
| 111 | -$default = $this->config( 'admin/jqadm/order/fields', ['order.id', 'order.ctime', 'order.statuspayment', 'order.base.address.lastname'] ); |
|
| 112 | -$fields = $this->session( 'aimeos/admin/jqadm/order/fields', $default ); |
|
| 111 | +$default = $this->config('admin/jqadm/order/fields', ['order.id', 'order.ctime', 'order.statuspayment', 'order.base.address.lastname']); |
|
| 112 | +$fields = $this->session('aimeos/admin/jqadm/order/fields', $default); |
|
| 113 | 113 | |
| 114 | -$searchParams = $params = $this->get( 'pageParams', [] ); |
|
| 114 | +$searchParams = $params = $this->get('pageParams', []); |
|
| 115 | 115 | $searchParams['page']['start'] = 0; |
| 116 | 116 | |
| 117 | -$baseItems = $this->get( 'baseItems', [] ); |
|
| 117 | +$baseItems = $this->get('baseItems', []); |
|
| 118 | 118 | |
| 119 | 119 | |
| 120 | 120 | $columnList = [ |
| 121 | - 'order.id' => $this->translate( 'admin', 'Invoice' ), |
|
| 122 | - 'order.type' => $this->translate( 'admin', 'Type' ), |
|
| 123 | - 'order.statuspayment' => $this->translate( 'admin', 'Pay status' ), |
|
| 124 | - 'order.datepayment' => $this->translate( 'admin', 'Pay date' ), |
|
| 125 | - 'order.statusdelivery' => $this->translate( 'admin', 'Ship status' ), |
|
| 126 | - 'order.datedelivery' => $this->translate( 'admin', 'Ship date' ), |
|
| 127 | - 'order.relatedid' => $this->translate( 'admin', 'Related order' ), |
|
| 128 | - 'order.ctime' => $this->translate( 'admin', 'Created' ), |
|
| 129 | - 'order.mtime' => $this->translate( 'admin', 'Modified' ), |
|
| 130 | - 'order.editor' => $this->translate( 'admin', 'Editor' ), |
|
| 131 | - 'order.base.customerid' => $this->translate( 'admin', 'Customer ID' ), |
|
| 132 | - 'order.base.sitecode' => $this->translate( 'admin', 'Site' ), |
|
| 133 | - 'order.base.languageid' => $this->translate( 'admin', 'Language' ), |
|
| 134 | - 'order.base.currencyid' => $this->translate( 'admin', 'Currency' ), |
|
| 135 | - 'order.base.price' => $this->translate( 'admin', 'Price' ), |
|
| 136 | - 'order.base.costs' => $this->translate( 'admin', 'Costs' ), |
|
| 137 | - 'order.base.rebate' => $this->translate( 'admin', 'Rebate' ), |
|
| 138 | - 'order.base.taxvalue' => $this->translate( 'admin', 'Tax' ), |
|
| 139 | - 'order.base.taxflag' => $this->translate( 'admin', 'Incl. tax' ), |
|
| 140 | - 'order.base.comment' => $this->translate( 'admin', 'Comment' ), |
|
| 141 | - 'order.base.address.salutation' => $this->translate( 'admin', 'Salutation' ), |
|
| 142 | - 'order.base.address.company' => $this->translate( 'admin', 'Company' ), |
|
| 143 | - 'order.base.address.vatid' => $this->translate( 'admin', 'VAT ID' ), |
|
| 144 | - 'order.base.address.title' => $this->translate( 'admin', 'Title' ), |
|
| 145 | - 'order.base.address.firstname' => $this->translate( 'admin', 'First name' ), |
|
| 146 | - 'order.base.address.lastname' => $this->translate( 'admin', 'Last name' ), |
|
| 147 | - 'order.base.address.address1' => $this->translate( 'admin', 'Street' ), |
|
| 148 | - 'order.base.address.address2' => $this->translate( 'admin', 'House number' ), |
|
| 149 | - 'order.base.address.address3' => $this->translate( 'admin', 'Floor' ), |
|
| 150 | - 'order.base.address.postal' => $this->translate( 'admin', 'Zip code' ), |
|
| 151 | - 'order.base.address.city' => $this->translate( 'admin', 'City' ), |
|
| 152 | - 'order.base.address.state' => $this->translate( 'admin', 'State' ), |
|
| 153 | - 'order.base.address.countryid' => $this->translate( 'admin', 'Country' ), |
|
| 154 | - 'order.base.address.languageid' => $this->translate( 'admin', 'Language' ), |
|
| 155 | - 'order.base.address.telephone' => $this->translate( 'admin', 'Telephone' ), |
|
| 156 | - 'order.base.address.telefax' => $this->translate( 'admin', 'Facsimile' ), |
|
| 157 | - 'order.base.address.email' => $this->translate( 'admin', 'E-Mail' ), |
|
| 158 | - 'order.base.address.website' => $this->translate( 'admin', 'Web site' ), |
|
| 159 | - 'order.base.service.code' => $this->translate( 'admin', 'Service' ), |
|
| 160 | - 'order.base.service.name' => $this->translate( 'admin', 'Service name' ), |
|
| 161 | - 'order.base.service.price' => $this->translate( 'admin', 'Service price' ), |
|
| 162 | - 'order.base.service.costs' => $this->translate( 'admin', 'Service costs' ), |
|
| 163 | - 'order.base.service.rebate' => $this->translate( 'admin', 'Service rebate' ), |
|
| 121 | + 'order.id' => $this->translate('admin', 'Invoice'), |
|
| 122 | + 'order.type' => $this->translate('admin', 'Type'), |
|
| 123 | + 'order.statuspayment' => $this->translate('admin', 'Pay status'), |
|
| 124 | + 'order.datepayment' => $this->translate('admin', 'Pay date'), |
|
| 125 | + 'order.statusdelivery' => $this->translate('admin', 'Ship status'), |
|
| 126 | + 'order.datedelivery' => $this->translate('admin', 'Ship date'), |
|
| 127 | + 'order.relatedid' => $this->translate('admin', 'Related order'), |
|
| 128 | + 'order.ctime' => $this->translate('admin', 'Created'), |
|
| 129 | + 'order.mtime' => $this->translate('admin', 'Modified'), |
|
| 130 | + 'order.editor' => $this->translate('admin', 'Editor'), |
|
| 131 | + 'order.base.customerid' => $this->translate('admin', 'Customer ID'), |
|
| 132 | + 'order.base.sitecode' => $this->translate('admin', 'Site'), |
|
| 133 | + 'order.base.languageid' => $this->translate('admin', 'Language'), |
|
| 134 | + 'order.base.currencyid' => $this->translate('admin', 'Currency'), |
|
| 135 | + 'order.base.price' => $this->translate('admin', 'Price'), |
|
| 136 | + 'order.base.costs' => $this->translate('admin', 'Costs'), |
|
| 137 | + 'order.base.rebate' => $this->translate('admin', 'Rebate'), |
|
| 138 | + 'order.base.taxvalue' => $this->translate('admin', 'Tax'), |
|
| 139 | + 'order.base.taxflag' => $this->translate('admin', 'Incl. tax'), |
|
| 140 | + 'order.base.comment' => $this->translate('admin', 'Comment'), |
|
| 141 | + 'order.base.address.salutation' => $this->translate('admin', 'Salutation'), |
|
| 142 | + 'order.base.address.company' => $this->translate('admin', 'Company'), |
|
| 143 | + 'order.base.address.vatid' => $this->translate('admin', 'VAT ID'), |
|
| 144 | + 'order.base.address.title' => $this->translate('admin', 'Title'), |
|
| 145 | + 'order.base.address.firstname' => $this->translate('admin', 'First name'), |
|
| 146 | + 'order.base.address.lastname' => $this->translate('admin', 'Last name'), |
|
| 147 | + 'order.base.address.address1' => $this->translate('admin', 'Street'), |
|
| 148 | + 'order.base.address.address2' => $this->translate('admin', 'House number'), |
|
| 149 | + 'order.base.address.address3' => $this->translate('admin', 'Floor'), |
|
| 150 | + 'order.base.address.postal' => $this->translate('admin', 'Zip code'), |
|
| 151 | + 'order.base.address.city' => $this->translate('admin', 'City'), |
|
| 152 | + 'order.base.address.state' => $this->translate('admin', 'State'), |
|
| 153 | + 'order.base.address.countryid' => $this->translate('admin', 'Country'), |
|
| 154 | + 'order.base.address.languageid' => $this->translate('admin', 'Language'), |
|
| 155 | + 'order.base.address.telephone' => $this->translate('admin', 'Telephone'), |
|
| 156 | + 'order.base.address.telefax' => $this->translate('admin', 'Facsimile'), |
|
| 157 | + 'order.base.address.email' => $this->translate('admin', 'E-Mail'), |
|
| 158 | + 'order.base.address.website' => $this->translate('admin', 'Web site'), |
|
| 159 | + 'order.base.service.code' => $this->translate('admin', 'Service'), |
|
| 160 | + 'order.base.service.name' => $this->translate('admin', 'Service name'), |
|
| 161 | + 'order.base.service.price' => $this->translate('admin', 'Service price'), |
|
| 162 | + 'order.base.service.costs' => $this->translate('admin', 'Service costs'), |
|
| 163 | + 'order.base.service.rebate' => $this->translate('admin', 'Service rebate'), |
|
| 164 | 164 | ]; |
| 165 | 165 | |
| 166 | 166 | $paymentStatusList = [ |
| 167 | - '-1' => $this->translate( 'mshop/code', 'pay:-1' ), |
|
| 168 | - '0' => $this->translate( 'mshop/code', 'pay:0' ), |
|
| 169 | - '1' => $this->translate( 'mshop/code', 'pay:1' ), |
|
| 170 | - '2' => $this->translate( 'mshop/code', 'pay:2' ), |
|
| 171 | - '3' => $this->translate( 'mshop/code', 'pay:3' ), |
|
| 172 | - '4' => $this->translate( 'mshop/code', 'pay:4' ), |
|
| 173 | - '5' => $this->translate( 'mshop/code', 'pay:5' ), |
|
| 174 | - '6' => $this->translate( 'mshop/code', 'pay:6' ), |
|
| 167 | + '-1' => $this->translate('mshop/code', 'pay:-1'), |
|
| 168 | + '0' => $this->translate('mshop/code', 'pay:0'), |
|
| 169 | + '1' => $this->translate('mshop/code', 'pay:1'), |
|
| 170 | + '2' => $this->translate('mshop/code', 'pay:2'), |
|
| 171 | + '3' => $this->translate('mshop/code', 'pay:3'), |
|
| 172 | + '4' => $this->translate('mshop/code', 'pay:4'), |
|
| 173 | + '5' => $this->translate('mshop/code', 'pay:5'), |
|
| 174 | + '6' => $this->translate('mshop/code', 'pay:6'), |
|
| 175 | 175 | ]; |
| 176 | 176 | |
| 177 | 177 | $deliveryStatusList = [ |
| 178 | - '-1' => $this->translate( 'mshop/code', 'stat:-1' ), |
|
| 179 | - '0' => $this->translate( 'mshop/code', 'stat:0' ), |
|
| 180 | - '1' => $this->translate( 'mshop/code', 'stat:1' ), |
|
| 181 | - '2' => $this->translate( 'mshop/code', 'stat:2' ), |
|
| 182 | - '3' => $this->translate( 'mshop/code', 'stat:3' ), |
|
| 183 | - '4' => $this->translate( 'mshop/code', 'stat:4' ), |
|
| 184 | - '5' => $this->translate( 'mshop/code', 'stat:5' ), |
|
| 185 | - '6' => $this->translate( 'mshop/code', 'stat:6' ), |
|
| 186 | - '7' => $this->translate( 'mshop/code', 'stat:7' ), |
|
| 178 | + '-1' => $this->translate('mshop/code', 'stat:-1'), |
|
| 179 | + '0' => $this->translate('mshop/code', 'stat:0'), |
|
| 180 | + '1' => $this->translate('mshop/code', 'stat:1'), |
|
| 181 | + '2' => $this->translate('mshop/code', 'stat:2'), |
|
| 182 | + '3' => $this->translate('mshop/code', 'stat:3'), |
|
| 183 | + '4' => $this->translate('mshop/code', 'stat:4'), |
|
| 184 | + '5' => $this->translate('mshop/code', 'stat:5'), |
|
| 185 | + '6' => $this->translate('mshop/code', 'stat:6'), |
|
| 186 | + '7' => $this->translate('mshop/code', 'stat:7'), |
|
| 187 | 187 | ]; |
| 188 | 188 | |
| 189 | 189 | $statusList = [ |
| 190 | - 0 => $this->translate( 'admin', 'no' ), |
|
| 191 | - 1 => $this->translate( 'admin', 'yes' ), |
|
| 190 | + 0 => $this->translate('admin', 'no'), |
|
| 191 | + 1 => $this->translate('admin', 'yes'), |
|
| 192 | 192 | ]; |
| 193 | 193 | |
| 194 | 194 | |
| 195 | 195 | ?> |
| 196 | -<?php $this->block()->start( 'jqadm_content' ); ?> |
|
| 196 | +<?php $this->block()->start('jqadm_content'); ?> |
|
| 197 | 197 | |
| 198 | 198 | <nav class="main-navbar"> |
| 199 | 199 | |
| 200 | 200 | <span class="navbar-brand"> |
| 201 | - <?= $enc->html( $this->translate( 'admin', 'Order' ) ); ?> |
|
| 202 | - <span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span> |
|
| 201 | + <?= $enc->html($this->translate('admin', 'Order')); ?> |
|
| 202 | + <span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span> |
|
| 203 | 203 | </span> |
| 204 | 204 | |
| 205 | 205 | <?= $this->partial( |
| 206 | - $this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [ |
|
| 207 | - 'filter' => $this->session( 'aimeos/admin/jqadm/order/filter', [] ), |
|
| 208 | - 'filterAttributes' => $this->get( 'filterAttributes', [] ), |
|
| 209 | - 'filterOperators' => $this->get( 'filterOperators', [] ), |
|
| 206 | + $this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [ |
|
| 207 | + 'filter' => $this->session('aimeos/admin/jqadm/order/filter', []), |
|
| 208 | + 'filterAttributes' => $this->get('filterAttributes', []), |
|
| 209 | + 'filterOperators' => $this->get('filterOperators', []), |
|
| 210 | 210 | 'params' => $params, |
| 211 | 211 | ] |
| 212 | 212 | ); ?> |
@@ -214,34 +214,34 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | |
| 216 | 216 | <?= $this->partial( |
| 217 | - $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
|
| 218 | - ['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ), |
|
| 219 | - 'page' => $this->session( 'aimeos/admin/jqadm/order/page', [] )] |
|
| 217 | + $this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'), |
|
| 218 | + ['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'), |
|
| 219 | + 'page' => $this->session('aimeos/admin/jqadm/order/page', [])] |
|
| 220 | 220 | ); |
| 221 | 221 | ?> |
| 222 | 222 | |
| 223 | -<?php $searchParam = $params; unset( $searchParam['filter'] ); ?> |
|
| 224 | -<form class="list list-order" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>"> |
|
| 223 | +<?php $searchParam = $params; unset($searchParam['filter']); ?> |
|
| 224 | +<form class="list list-order" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>"> |
|
| 225 | 225 | <?= $this->csrf()->formfield(); ?> |
| 226 | 226 | |
| 227 | 227 | <table class="list-items table table-hover table-striped"> |
| 228 | 228 | <thead class="list-header"> |
| 229 | 229 | <tr> |
| 230 | 230 | <?= $this->partial( |
| 231 | - $this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), |
|
| 232 | - ['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/order/sort' )] |
|
| 231 | + $this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), |
|
| 232 | + ['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/order/sort')] |
|
| 233 | 233 | ); |
| 234 | 234 | ?> |
| 235 | 235 | |
| 236 | 236 | <th class="actions"> |
| 237 | 237 | <a class="btn fa act-download" tabindex="1" |
| 238 | - href="<?= $enc->attr( $this->url( $expTarget, $expCntl, $expAction, $params, [], $expConfig ) ); ?>" |
|
| 239 | - title="<?= $enc->attr( $this->translate( 'admin', 'Download') ); ?>" |
|
| 240 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>"> |
|
| 238 | + href="<?= $enc->attr($this->url($expTarget, $expCntl, $expAction, $params, [], $expConfig)); ?>" |
|
| 239 | + title="<?= $enc->attr($this->translate('admin', 'Download')); ?>" |
|
| 240 | + aria-label="<?= $enc->attr($this->translate('admin', 'Download')); ?>"> |
|
| 241 | 241 | </a> |
| 242 | 242 | |
| 243 | 243 | <?= $this->partial( |
| 244 | - $this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ), |
|
| 244 | + $this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), |
|
| 245 | 245 | ['fields' => $fields, 'data' => $columnList] |
| 246 | 246 | ); |
| 247 | 247 | ?> |
@@ -251,8 +251,8 @@ discard block |
||
| 251 | 251 | <tbody> |
| 252 | 252 | |
| 253 | 253 | <?= $this->partial( |
| 254 | - $this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [ |
|
| 255 | - 'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/order/filter', [] ), |
|
| 254 | + $this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [ |
|
| 255 | + 'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/order/filter', []), |
|
| 256 | 256 | 'data' => [ |
| 257 | 257 | 'order.id' => ['op' => '=='], |
| 258 | 258 | 'order.type' => [], |
@@ -303,186 +303,186 @@ discard block |
||
| 303 | 303 | ] ); |
| 304 | 304 | ?> |
| 305 | 305 | |
| 306 | - <?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?> |
|
| 307 | - <?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?> |
|
| 308 | - <tr class="list-item <?= $this->site()->readonly( $item->getSiteId() ); ?>"> |
|
| 309 | - <?php if( in_array( 'order.id', $fields ) ) : ?> |
|
| 310 | - <td class="order-id"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getId() ); ?></a></td> |
|
| 306 | + <?php foreach ($this->get('items', []) as $id => $item) : ?> |
|
| 307 | + <?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $item->getBaseId()] + $params, [], $getConfig)); ?> |
|
| 308 | + <tr class="list-item <?= $this->site()->readonly($item->getSiteId()); ?>"> |
|
| 309 | + <?php if (in_array('order.id', $fields)) : ?> |
|
| 310 | + <td class="order-id"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getId()); ?></a></td> |
|
| 311 | 311 | <?php endif; ?> |
| 312 | - <?php if( in_array( 'order.type', $fields ) ) : ?> |
|
| 313 | - <td class="order-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getType() ); ?></a></td> |
|
| 312 | + <?php if (in_array('order.type', $fields)) : ?> |
|
| 313 | + <td class="order-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getType()); ?></a></td> |
|
| 314 | 314 | <?php endif; ?> |
| 315 | - <?php if( in_array( 'order.statuspayment', $fields ) ) : ?> |
|
| 316 | - <td class="order-statuspayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $paymentStatusList[$item->getPaymentStatus()] ); ?></a></td> |
|
| 315 | + <?php if (in_array('order.statuspayment', $fields)) : ?> |
|
| 316 | + <td class="order-statuspayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($paymentStatusList[$item->getPaymentStatus()]); ?></a></td> |
|
| 317 | 317 | <?php endif; ?> |
| 318 | - <?php if( in_array( 'order.datepayment', $fields ) ) : ?> |
|
| 319 | - <td class="order-datepayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDatePayment() ); ?></a></td> |
|
| 318 | + <?php if (in_array('order.datepayment', $fields)) : ?> |
|
| 319 | + <td class="order-datepayment"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDatePayment()); ?></a></td> |
|
| 320 | 320 | <?php endif; ?> |
| 321 | - <?php if( in_array( 'order.statusdelivery', $fields ) ) : ?> |
|
| 322 | - <td class="order-statusdelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $deliveryStatusList[$item->getDeliveryStatus()] ); ?></a></td> |
|
| 321 | + <?php if (in_array('order.statusdelivery', $fields)) : ?> |
|
| 322 | + <td class="order-statusdelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($deliveryStatusList[$item->getDeliveryStatus()]); ?></a></td> |
|
| 323 | 323 | <?php endif; ?> |
| 324 | - <?php if( in_array( 'order.datedelivery', $fields ) ) : ?> |
|
| 325 | - <td class="order-datedelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDateDelivery() ); ?></a></td> |
|
| 324 | + <?php if (in_array('order.datedelivery', $fields)) : ?> |
|
| 325 | + <td class="order-datedelivery"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDateDelivery()); ?></a></td> |
|
| 326 | 326 | <?php endif; ?> |
| 327 | - <?php if( in_array( 'order.relatedid', $fields ) ) : ?> |
|
| 328 | - <td class="order-relatedid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getRelatedId() ); ?></a></td> |
|
| 327 | + <?php if (in_array('order.relatedid', $fields)) : ?> |
|
| 328 | + <td class="order-relatedid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getRelatedId()); ?></a></td> |
|
| 329 | 329 | <?php endif; ?> |
| 330 | - <?php if( in_array( 'order.ctime', $fields ) ) : ?> |
|
| 331 | - <td class="order-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td> |
|
| 330 | + <?php if (in_array('order.ctime', $fields)) : ?> |
|
| 331 | + <td class="order-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td> |
|
| 332 | 332 | <?php endif; ?> |
| 333 | - <?php if( in_array( 'order.mtime', $fields ) ) : ?> |
|
| 334 | - <td class="order-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td> |
|
| 333 | + <?php if (in_array('order.mtime', $fields)) : ?> |
|
| 334 | + <td class="order-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td> |
|
| 335 | 335 | <?php endif; ?> |
| 336 | - <?php if( in_array( 'order.editor', $fields ) ) : ?> |
|
| 337 | - <td class="order-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td> |
|
| 336 | + <?php if (in_array('order.editor', $fields)) : ?> |
|
| 337 | + <td class="order-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td> |
|
| 338 | 338 | <?php endif; ?> |
| 339 | 339 | |
| 340 | - <?php $baseItem = ( isset( $baseItems[$item->getBaseId()] ) ? $baseItems[$item->getBaseId()] : null ); ?> |
|
| 340 | + <?php $baseItem = (isset($baseItems[$item->getBaseId()]) ? $baseItems[$item->getBaseId()] : null); ?> |
|
| 341 | 341 | |
| 342 | - <?php if( in_array( 'order.base.customerid', $fields ) ) : ?> |
|
| 343 | - <td class="order-base-customerid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getCustomerId() ) : ''; ?></a></td> |
|
| 342 | + <?php if (in_array('order.base.customerid', $fields)) : ?> |
|
| 343 | + <td class="order-base-customerid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getCustomerId()) : ''; ?></a></td> |
|
| 344 | 344 | <?php endif; ?> |
| 345 | - <?php if( in_array( 'order.base.sitecode', $fields ) ) : ?> |
|
| 346 | - <td class="order-base-sitecode"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getSiteCode() ) : ''; ?></a></td> |
|
| 345 | + <?php if (in_array('order.base.sitecode', $fields)) : ?> |
|
| 346 | + <td class="order-base-sitecode"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getSiteCode()) : ''; ?></a></td> |
|
| 347 | 347 | <?php endif; ?> |
| 348 | - <?php if( in_array( 'order.base.languageid', $fields ) ) : ?> |
|
| 349 | - <td class="order-base-languageid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getLocale()->getLanguageId() ) : ''; ?></a></td> |
|
| 348 | + <?php if (in_array('order.base.languageid', $fields)) : ?> |
|
| 349 | + <td class="order-base-languageid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getLocale()->getLanguageId()) : ''; ?></a></td> |
|
| 350 | 350 | <?php endif; ?> |
| 351 | - <?php if( in_array( 'order.base.currencyid', $fields ) ) : ?> |
|
| 352 | - <td class="order-base-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getLocale()->getCurrencyId() ) : ''; ?></a></td> |
|
| 351 | + <?php if (in_array('order.base.currencyid', $fields)) : ?> |
|
| 352 | + <td class="order-base-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getLocale()->getCurrencyId()) : ''; ?></a></td> |
|
| 353 | 353 | <?php endif; ?> |
| 354 | - <?php if( in_array( 'order.base.price', $fields ) ) : ?> |
|
| 355 | - <td class="order-base-price"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getValue() ) : ''; ?></a></td> |
|
| 354 | + <?php if (in_array('order.base.price', $fields)) : ?> |
|
| 355 | + <td class="order-base-price"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getValue()) : ''; ?></a></td> |
|
| 356 | 356 | <?php endif; ?> |
| 357 | - <?php if( in_array( 'order.base.costs', $fields ) ) : ?> |
|
| 358 | - <td class="order-base-costs"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getCosts() ) : ''; ?></a></td> |
|
| 357 | + <?php if (in_array('order.base.costs', $fields)) : ?> |
|
| 358 | + <td class="order-base-costs"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getCosts()) : ''; ?></a></td> |
|
| 359 | 359 | <?php endif; ?> |
| 360 | - <?php if( in_array( 'order.base.rebate', $fields ) ) : ?> |
|
| 361 | - <td class="order-base-rebate"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getRebate() ) : ''; ?></a></td> |
|
| 360 | + <?php if (in_array('order.base.rebate', $fields)) : ?> |
|
| 361 | + <td class="order-base-rebate"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getRebate()) : ''; ?></a></td> |
|
| 362 | 362 | <?php endif; ?> |
| 363 | - <?php if( in_array( 'order.base.taxvalue', $fields ) ) : ?> |
|
| 364 | - <td class="order-base-taxvalue"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getPrice()->getTaxValue() ) : ''; ?></a></td> |
|
| 363 | + <?php if (in_array('order.base.taxvalue', $fields)) : ?> |
|
| 364 | + <td class="order-base-taxvalue"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getPrice()->getTaxValue()) : ''; ?></a></td> |
|
| 365 | 365 | <?php endif; ?> |
| 366 | - <?php if( in_array( 'order.base.taxflag', $fields ) ) : ?> |
|
| 367 | - <td class="order-base-taxflag"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $statusList[$baseItem->getPrice()->getTaxFlag()] ) : ''; ?></a></td> |
|
| 366 | + <?php if (in_array('order.base.taxflag', $fields)) : ?> |
|
| 367 | + <td class="order-base-taxflag"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($statusList[$baseItem->getPrice()->getTaxFlag()]) : ''; ?></a></td> |
|
| 368 | 368 | <?php endif; ?> |
| 369 | - <?php if( in_array( 'order.base.comment', $fields ) ) : ?> |
|
| 370 | - <td class="order-base-comment"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html( $baseItem->getComment() ) : ''; ?></a></td> |
|
| 369 | + <?php if (in_array('order.base.comment', $fields)) : ?> |
|
| 370 | + <td class="order-base-comment"><a class="items-field" href="<?= $url; ?>"><?= $baseItem ? $enc->html($baseItem->getComment()) : ''; ?></a></td> |
|
| 371 | 371 | <?php endif; ?> |
| 372 | 372 | |
| 373 | 373 | <?php $addrItem = null; |
| 374 | - if( $baseItem && ( $addresses = $baseItem->getAddresses() ) && isset( $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT] ) ) { |
|
| 374 | + if ($baseItem && ($addresses = $baseItem->getAddresses()) && isset($addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT])) { |
|
| 375 | 375 | $addrItem = $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT]; |
| 376 | 376 | } |
| 377 | 377 | ?> |
| 378 | 378 | |
| 379 | - <?php if( in_array( 'order.base.address.salutation', $fields ) ) : ?> |
|
| 380 | - <td class="order-base-address-salutation"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getSalutation() ) : ''; ?></a></td> |
|
| 379 | + <?php if (in_array('order.base.address.salutation', $fields)) : ?> |
|
| 380 | + <td class="order-base-address-salutation"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getSalutation()) : ''; ?></a></td> |
|
| 381 | 381 | <?php endif; ?> |
| 382 | - <?php if( in_array( 'order.base.address.company', $fields ) ) : ?> |
|
| 383 | - <td class="order-base-address-company"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCompany() ) : ''; ?></a></td> |
|
| 382 | + <?php if (in_array('order.base.address.company', $fields)) : ?> |
|
| 383 | + <td class="order-base-address-company"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCompany()) : ''; ?></a></td> |
|
| 384 | 384 | <?php endif; ?> |
| 385 | - <?php if( in_array( 'order.base.address.vatid', $fields ) ) : ?> |
|
| 386 | - <td class="order-base-address-vatid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getVatID() ) : ''; ?></a></td> |
|
| 385 | + <?php if (in_array('order.base.address.vatid', $fields)) : ?> |
|
| 386 | + <td class="order-base-address-vatid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getVatID()) : ''; ?></a></td> |
|
| 387 | 387 | <?php endif; ?> |
| 388 | - <?php if( in_array( 'order.base.address.title', $fields ) ) : ?> |
|
| 389 | - <td class="order-base-address-title"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTitle() ) : ''; ?></a></td> |
|
| 388 | + <?php if (in_array('order.base.address.title', $fields)) : ?> |
|
| 389 | + <td class="order-base-address-title"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTitle()) : ''; ?></a></td> |
|
| 390 | 390 | <?php endif; ?> |
| 391 | - <?php if( in_array( 'order.base.address.firstname', $fields ) ) : ?> |
|
| 392 | - <td class="order-base-address-firstname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getFirstname() ) : ''; ?></a></td> |
|
| 391 | + <?php if (in_array('order.base.address.firstname', $fields)) : ?> |
|
| 392 | + <td class="order-base-address-firstname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getFirstname()) : ''; ?></a></td> |
|
| 393 | 393 | <?php endif; ?> |
| 394 | - <?php if( in_array( 'order.base.address.lastname', $fields ) ) : ?> |
|
| 395 | - <td class="order-base-address-lastname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getLastname() ) : ''; ?></a></td> |
|
| 394 | + <?php if (in_array('order.base.address.lastname', $fields)) : ?> |
|
| 395 | + <td class="order-base-address-lastname"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getLastname()) : ''; ?></a></td> |
|
| 396 | 396 | <?php endif; ?> |
| 397 | - <?php if( in_array( 'order.base.address.address1', $fields ) ) : ?> |
|
| 398 | - <td class="order-base-address-address1"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress1() ) : ''; ?></a></td> |
|
| 397 | + <?php if (in_array('order.base.address.address1', $fields)) : ?> |
|
| 398 | + <td class="order-base-address-address1"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress1()) : ''; ?></a></td> |
|
| 399 | 399 | <?php endif; ?> |
| 400 | - <?php if( in_array( 'order.base.address.address2', $fields ) ) : ?> |
|
| 401 | - <td class="order-base-address-address2"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress2() ) : ''; ?></a></td> |
|
| 400 | + <?php if (in_array('order.base.address.address2', $fields)) : ?> |
|
| 401 | + <td class="order-base-address-address2"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress2()) : ''; ?></a></td> |
|
| 402 | 402 | <?php endif; ?> |
| 403 | - <?php if( in_array( 'order.base.address.address3', $fields ) ) : ?> |
|
| 404 | - <td class="order-base-address-address3"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getAddress3() ) : ''; ?></a></td> |
|
| 403 | + <?php if (in_array('order.base.address.address3', $fields)) : ?> |
|
| 404 | + <td class="order-base-address-address3"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getAddress3()) : ''; ?></a></td> |
|
| 405 | 405 | <?php endif; ?> |
| 406 | - <?php if( in_array( 'order.base.address.postal', $fields ) ) : ?> |
|
| 407 | - <td class="order-base-address-postal"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getPostal() ) : ''; ?></a></td> |
|
| 406 | + <?php if (in_array('order.base.address.postal', $fields)) : ?> |
|
| 407 | + <td class="order-base-address-postal"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getPostal()) : ''; ?></a></td> |
|
| 408 | 408 | <?php endif; ?> |
| 409 | - <?php if( in_array( 'order.base.address.city', $fields ) ) : ?> |
|
| 410 | - <td class="order-base-address-city"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCity() ) : ''; ?></a></td> |
|
| 409 | + <?php if (in_array('order.base.address.city', $fields)) : ?> |
|
| 410 | + <td class="order-base-address-city"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCity()) : ''; ?></a></td> |
|
| 411 | 411 | <?php endif; ?> |
| 412 | - <?php if( in_array( 'order.base.address.state', $fields ) ) : ?> |
|
| 413 | - <td class="order-base-address-state"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getState() ) : ''; ?></a></td> |
|
| 412 | + <?php if (in_array('order.base.address.state', $fields)) : ?> |
|
| 413 | + <td class="order-base-address-state"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getState()) : ''; ?></a></td> |
|
| 414 | 414 | <?php endif; ?> |
| 415 | - <?php if( in_array( 'order.base.address.countryid', $fields ) ) : ?> |
|
| 416 | - <td class="order-base-address-countryid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getCountryId() ) : ''; ?></a></td> |
|
| 415 | + <?php if (in_array('order.base.address.countryid', $fields)) : ?> |
|
| 416 | + <td class="order-base-address-countryid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getCountryId()) : ''; ?></a></td> |
|
| 417 | 417 | <?php endif; ?> |
| 418 | - <?php if( in_array( 'order.base.address.languageid', $fields ) ) : ?> |
|
| 419 | - <td class="order-base-address-languageid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getLanguageId() ) : ''; ?></a></td> |
|
| 418 | + <?php if (in_array('order.base.address.languageid', $fields)) : ?> |
|
| 419 | + <td class="order-base-address-languageid"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getLanguageId()) : ''; ?></a></td> |
|
| 420 | 420 | <?php endif; ?> |
| 421 | - <?php if( in_array( 'order.base.address.telephone', $fields ) ) : ?> |
|
| 422 | - <td class="order-base-address-telephone"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTelephone() ) : ''; ?></a></td> |
|
| 421 | + <?php if (in_array('order.base.address.telephone', $fields)) : ?> |
|
| 422 | + <td class="order-base-address-telephone"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTelephone()) : ''; ?></a></td> |
|
| 423 | 423 | <?php endif; ?> |
| 424 | - <?php if( in_array( 'order.base.address.telefax', $fields ) ) : ?> |
|
| 425 | - <td class="order-base-address-telefax"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getTelefax() ) : ''; ?></a></td> |
|
| 424 | + <?php if (in_array('order.base.address.telefax', $fields)) : ?> |
|
| 425 | + <td class="order-base-address-telefax"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getTelefax()) : ''; ?></a></td> |
|
| 426 | 426 | <?php endif; ?> |
| 427 | - <?php if( in_array( 'order.base.address.email', $fields ) ) : ?> |
|
| 428 | - <td class="order-base-address-email"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getEmail() ) : ''; ?></a></td> |
|
| 427 | + <?php if (in_array('order.base.address.email', $fields)) : ?> |
|
| 428 | + <td class="order-base-address-email"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getEmail()) : ''; ?></a></td> |
|
| 429 | 429 | <?php endif; ?> |
| 430 | - <?php if( in_array( 'order.base.address.website', $fields ) ) : ?> |
|
| 431 | - <td class="order-base-address-website"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html( $addrItem->getWebsite() ) : ''; ?></a></td> |
|
| 430 | + <?php if (in_array('order.base.address.website', $fields)) : ?> |
|
| 431 | + <td class="order-base-address-website"><a class="items-field" href="<?= $url; ?>"><?= $addrItem ? $enc->html($addrItem->getWebsite()) : ''; ?></a></td> |
|
| 432 | 432 | <?php endif; ?> |
| 433 | 433 | |
| 434 | - <?php $services = ( $baseItem ? $baseItem->getServices() : [] ); ?> |
|
| 434 | + <?php $services = ($baseItem ? $baseItem->getServices() : []); ?> |
|
| 435 | 435 | |
| 436 | - <?php if( in_array( 'order.base.service.code', $fields ) ) : ?> |
|
| 436 | + <?php if (in_array('order.base.service.code', $fields)) : ?> |
|
| 437 | 437 | <td class="order-base-service-code"> |
| 438 | 438 | <a class="items-field" href="<?= $url; ?>"> |
| 439 | - <?php foreach( $services as $type => $list ) : ?> |
|
| 440 | - <?php foreach( $list as $serviceItem ) : ?> |
|
| 441 | - <span class="line"><?= $enc->html( $serviceItem->getCode() ); ?></span> |
|
| 439 | + <?php foreach ($services as $type => $list) : ?> |
|
| 440 | + <?php foreach ($list as $serviceItem) : ?> |
|
| 441 | + <span class="line"><?= $enc->html($serviceItem->getCode()); ?></span> |
|
| 442 | 442 | <?php endforeach; ?> |
| 443 | 443 | <?php endforeach; ?> |
| 444 | 444 | </a> |
| 445 | 445 | </td> |
| 446 | 446 | <?php endif; ?> |
| 447 | - <?php if( in_array( 'order.base.service.name', $fields ) ) : ?> |
|
| 447 | + <?php if (in_array('order.base.service.name', $fields)) : ?> |
|
| 448 | 448 | <td class="order-base-service-name"> |
| 449 | 449 | <a class="items-field" href="<?= $url; ?>"> |
| 450 | - <?php foreach( $services as $type => $list ) : ?> |
|
| 451 | - <?php foreach( $list as $serviceItem ) : ?> |
|
| 452 | - <span class="line"><?= $enc->html( $serviceItem->getName() ); ?></span> |
|
| 450 | + <?php foreach ($services as $type => $list) : ?> |
|
| 451 | + <?php foreach ($list as $serviceItem) : ?> |
|
| 452 | + <span class="line"><?= $enc->html($serviceItem->getName()); ?></span> |
|
| 453 | 453 | <?php endforeach; ?> |
| 454 | 454 | <?php endforeach; ?> |
| 455 | 455 | </a> |
| 456 | 456 | </td> |
| 457 | 457 | <?php endif; ?> |
| 458 | - <?php if( in_array( 'order.base.service.price', $fields ) ) : ?> |
|
| 458 | + <?php if (in_array('order.base.service.price', $fields)) : ?> |
|
| 459 | 459 | <td class="order-base-service-price"> |
| 460 | 460 | <a class="items-field" href="<?= $url; ?>"> |
| 461 | - <?php foreach( $services as $type => $list ) : ?> |
|
| 462 | - <?php foreach( $list as $serviceItem ) : ?> |
|
| 463 | - <span class="line"><?= $enc->html( $serviceItem->getPrice()->getValue() ); ?></span> |
|
| 461 | + <?php foreach ($services as $type => $list) : ?> |
|
| 462 | + <?php foreach ($list as $serviceItem) : ?> |
|
| 463 | + <span class="line"><?= $enc->html($serviceItem->getPrice()->getValue()); ?></span> |
|
| 464 | 464 | <?php endforeach; ?> |
| 465 | 465 | <?php endforeach; ?> |
| 466 | 466 | </a> |
| 467 | 467 | </td> |
| 468 | 468 | <?php endif; ?> |
| 469 | - <?php if( in_array( 'order.base.service.costs', $fields ) ) : ?> |
|
| 469 | + <?php if (in_array('order.base.service.costs', $fields)) : ?> |
|
| 470 | 470 | <td class="order-base-service-costs"> |
| 471 | 471 | <a class="items-field" href="<?= $url; ?>"> |
| 472 | - <?php foreach( $services as $type => $list ) : ?> |
|
| 473 | - <?php foreach( $list as $serviceItem ) : ?> |
|
| 474 | - <span class="line"><?= $enc->html( $serviceItem->getPrice()->getCosts() ); ?></span> |
|
| 472 | + <?php foreach ($services as $type => $list) : ?> |
|
| 473 | + <?php foreach ($list as $serviceItem) : ?> |
|
| 474 | + <span class="line"><?= $enc->html($serviceItem->getPrice()->getCosts()); ?></span> |
|
| 475 | 475 | <?php endforeach; ?> |
| 476 | 476 | <?php endforeach; ?> |
| 477 | 477 | </a> |
| 478 | 478 | </td> |
| 479 | 479 | <?php endif; ?> |
| 480 | - <?php if( in_array( 'order.base.service.rebate', $fields ) ) : ?> |
|
| 480 | + <?php if (in_array('order.base.service.rebate', $fields)) : ?> |
|
| 481 | 481 | <td class="order-base-service-rebate"> |
| 482 | 482 | <a class="items-field" href="<?= $url; ?>"> |
| 483 | - <?php foreach( $services as $type => $list ) : ?> |
|
| 484 | - <?php foreach( $list as $serviceItem ) : ?> |
|
| 485 | - <span class="line"><?= $enc->html( $serviceItem->getPrice()->getRebate() ); ?></span> |
|
| 483 | + <?php foreach ($services as $type => $list) : ?> |
|
| 484 | + <?php foreach ($list as $serviceItem) : ?> |
|
| 485 | + <span class="line"><?= $enc->html($serviceItem->getPrice()->getRebate()); ?></span> |
|
| 486 | 486 | <?php endforeach; ?> |
| 487 | 487 | <?php endforeach; ?> |
| 488 | 488 | </a> |
@@ -491,27 +491,27 @@ discard block |
||
| 491 | 491 | |
| 492 | 492 | <td class="actions"> |
| 493 | 493 | <a class="btn act-copy fa" |
| 494 | - href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $item->getBaseId()] + $params, [], $copyConfig ) ); ?>" |
|
| 495 | - title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>" |
|
| 496 | - aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a> |
|
| 494 | + href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $item->getBaseId()] + $params, [], $copyConfig)); ?>" |
|
| 495 | + title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>" |
|
| 496 | + aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a> |
|
| 497 | 497 | </td> |
| 498 | 498 | </tr> |
| 499 | 499 | <?php endforeach; ?> |
| 500 | 500 | </tbody> |
| 501 | 501 | </table> |
| 502 | 502 | |
| 503 | - <?php if( $this->get( 'items', [] ) === [] ) : ?> |
|
| 504 | - <?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?> |
|
| 503 | + <?php if ($this->get('items', []) === []) : ?> |
|
| 504 | + <?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?> |
|
| 505 | 505 | <?php endif; ?> |
| 506 | 506 | </form> |
| 507 | 507 | |
| 508 | 508 | <?= $this->partial( |
| 509 | - $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
|
| 510 | - ['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ), |
|
| 511 | - 'page' => $this->session( 'aimeos/admin/jqadm/order/page', [] )] |
|
| 509 | + $this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'), |
|
| 510 | + ['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'), |
|
| 511 | + 'page' => $this->session('aimeos/admin/jqadm/order/page', [])] |
|
| 512 | 512 | ); |
| 513 | 513 | ?> |
| 514 | 514 | |
| 515 | 515 | <?php $this->block()->stop(); ?> |
| 516 | 516 | |
| 517 | -<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?> |
|
| 517 | +<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?> |
|
@@ -9,18 +9,18 @@ |
||
| 9 | 9 | |
| 10 | 10 | |
| 11 | 11 | ?> |
| 12 | -<?php $this->block()->start( 'jqadm_content' ); ?> |
|
| 12 | +<?php $this->block()->start('jqadm_content'); ?> |
|
| 13 | 13 | <nav class="main-navbar"> |
| 14 | 14 | <span class="navbar-brand"> |
| 15 | - <?= $enc->html( $this->translate( 'admin', 'Dashboard' ) ); ?> |
|
| 16 | - <span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span> |
|
| 15 | + <?= $enc->html($this->translate('admin', 'Dashboard')); ?> |
|
| 16 | + <span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span> |
|
| 17 | 17 | </span> |
| 18 | 18 | <div class="btn act-show fa" style="visibility: hidden"></div> |
| 19 | 19 | </nav> |
| 20 | 20 | |
| 21 | 21 | <div class="dashboard"> |
| 22 | - <?= $this->get( 'listBody' ); ?> |
|
| 22 | + <?= $this->get('listBody'); ?> |
|
| 23 | 23 | </div> |
| 24 | 24 | <?php $this->block()->stop(); ?> |
| 25 | 25 | |
| 26 | -<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?> |
|
| 26 | +<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?> |
|
@@ -8,10 +8,10 @@ discard block |
||
| 8 | 8 | $enc = $this->encoder(); |
| 9 | 9 | |
| 10 | 10 | $target = $this->request()->getTarget(); |
| 11 | -$searchTarget = $this->config( 'admin/jqadm/url/search/target' ); |
|
| 12 | -$cntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
|
| 13 | -$action = $this->config( 'admin/jqadm/url/search/action', 'search' ); |
|
| 14 | -$config = $this->config( 'admin/jqadm/url/search/config', [] ); |
|
| 11 | +$searchTarget = $this->config('admin/jqadm/url/search/target'); |
|
| 12 | +$cntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm'); |
|
| 13 | +$action = $this->config('admin/jqadm/url/search/action', 'search'); |
|
| 14 | +$config = $this->config('admin/jqadm/url/search/config', []); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | /** admin/jsonadm/url/options/target |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @see admin/jsonadm/url/options/action |
| 29 | 29 | * @see admin/jsonadm/url/options/config |
| 30 | 30 | */ |
| 31 | -$jsonTarget = $this->config( 'admin/jsonadm/url/options/target' ); |
|
| 31 | +$jsonTarget = $this->config('admin/jsonadm/url/options/target'); |
|
| 32 | 32 | |
| 33 | 33 | /** admin/jsonadm/url/options/controller |
| 34 | 34 | * Name of the controller whose action should be called |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * @see admin/jsonadm/url/options/action |
| 45 | 45 | * @see admin/jsonadm/url/options/config |
| 46 | 46 | */ |
| 47 | -$jsonCntl = $this->config( 'admin/jsonadm/url/options/controller', 'Jsonadm' ); |
|
| 47 | +$jsonCntl = $this->config('admin/jsonadm/url/options/controller', 'Jsonadm'); |
|
| 48 | 48 | |
| 49 | 49 | /** admin/jsonadm/url/options/action |
| 50 | 50 | * Name of the action that should create the output |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @see admin/jsonadm/url/options/controller |
| 61 | 61 | * @see admin/jsonadm/url/options/config |
| 62 | 62 | */ |
| 63 | -$jsonAction = $this->config( 'admin/jsonadm/url/options/action', 'options' ); |
|
| 63 | +$jsonAction = $this->config('admin/jsonadm/url/options/action', 'options'); |
|
| 64 | 64 | |
| 65 | 65 | /** admin/jsonadm/url/options/config |
| 66 | 66 | * Associative list of configuration options used for generating the URL |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @see admin/jsonadm/url/options/controller |
| 83 | 83 | * @see admin/jsonadm/url/options/action |
| 84 | 84 | */ |
| 85 | -$jsonConfig = $this->config( 'admin/jsonadm/url/options/config', [] ); |
|
| 85 | +$jsonConfig = $this->config('admin/jsonadm/url/options/config', []); |
|
| 86 | 86 | |
| 87 | 87 | |
| 88 | 88 | /** admin/jqadm/navbar |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * @category Developer |
| 107 | 107 | * @see admin/jqadm/navbar-limit |
| 108 | 108 | */ |
| 109 | -$navlist = $this->config( 'admin/jqadm/navbar', [] ); |
|
| 109 | +$navlist = $this->config('admin/jqadm/navbar', []); |
|
| 110 | 110 | |
| 111 | 111 | /** admin/jqadm/navbar-limit |
| 112 | 112 | * Number of JQAdm client links in the navigation bar shown by default |
@@ -122,26 +122,26 @@ discard block |
||
| 122 | 122 | * @category Developer |
| 123 | 123 | * @see admin/jqadm/navbar |
| 124 | 124 | */ |
| 125 | -$navlimit = $this->config( 'admin/jqadm/navbar-limit', 7 ); |
|
| 125 | +$navlimit = $this->config('admin/jqadm/navbar-limit', 7); |
|
| 126 | 126 | |
| 127 | 127 | |
| 128 | -$navfirst = reset( $navlist ); |
|
| 129 | -if( is_array( $navfirst ) ) { |
|
| 130 | - $navfirst = key( $navlist ); |
|
| 128 | +$navfirst = reset($navlist); |
|
| 129 | +if (is_array($navfirst)) { |
|
| 130 | + $navfirst = key($navlist); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | -$resource = $this->param( 'resource', 'dashboard' ); |
|
| 134 | -$site = $this->param( 'site', 'default' ); |
|
| 135 | -$lang = $this->param( 'lang' ); |
|
| 133 | +$resource = $this->param('resource', 'dashboard'); |
|
| 134 | +$site = $this->param('site', 'default'); |
|
| 135 | +$lang = $this->param('lang'); |
|
| 136 | 136 | |
| 137 | 137 | $params = ['resource' => $resource, 'site' => $site]; |
| 138 | 138 | $extParams = ['site' => $site]; |
| 139 | 139 | |
| 140 | -if( $lang ) { |
|
| 140 | +if ($lang) { |
|
| 141 | 141 | $params['lang'] = $extParams['lang'] = $lang; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | -$title = $this->translate( 'admin', '%1$s (Ctrl+Alt+%2$s)' ); |
|
| 144 | +$title = $this->translate('admin', '%1$s (Ctrl+Alt+%2$s)'); |
|
| 145 | 145 | |
| 146 | 146 | |
| 147 | 147 | /** admin/jqadm/partial/confirm |
@@ -211,82 +211,82 @@ discard block |
||
| 211 | 211 | */ |
| 212 | 212 | |
| 213 | 213 | |
| 214 | -$infoMsgs = $this->get( 'info', [] ); |
|
| 214 | +$infoMsgs = $this->get('info', []); |
|
| 215 | 215 | |
| 216 | -switch( $this->param( 'act' ) ) |
|
| 216 | +switch ($this->param('act')) |
|
| 217 | 217 | { |
| 218 | 218 | case 'save': |
| 219 | - $infoMsgs[] = $this->translate( 'admin', 'Item saved successfully' ); break; |
|
| 219 | + $infoMsgs[] = $this->translate('admin', 'Item saved successfully'); break; |
|
| 220 | 220 | case 'delete': |
| 221 | - $infoMsgs[] = $this->translate( 'admin', 'Item deleted successfully' ); break; |
|
| 221 | + $infoMsgs[] = $this->translate('admin', 'Item deleted successfully'); break; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | |
| 225 | 225 | ?> |
| 226 | -<div class="aimeos" lang="<?= $this->param( 'lang' ); ?>" data-url="<?= $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, array( 'site' => $site ), [], $jsonConfig ) ); ?>"> |
|
| 226 | +<div class="aimeos" lang="<?= $this->param('lang'); ?>" data-url="<?= $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, array('site' => $site), [], $jsonConfig)); ?>"> |
|
| 227 | 227 | |
| 228 | 228 | <nav class="main-sidebar"> |
| 229 | 229 | <div class="sidebar-wrapper"> |
| 230 | 230 | |
| 231 | - <a class="logo" target="_blank" href="https://aimeos.org/update/?type=<?= $this->get( 'aimeosType' ) ?>&version=<?= $this->get( 'aimeosVersion' ) ?>"> |
|
| 232 | - <img src="https://aimeos.org/check/?type=<?= $this->get( 'aimeosType' ) ?>&version=<?= $this->get( 'aimeosVersion' ) ?>&extensions=<?= $this->get( 'aimeosExtensions' ) ?>" alt="Aimeos update" title="Aimeos update"> |
|
| 231 | + <a class="logo" target="_blank" href="https://aimeos.org/update/?type=<?= $this->get('aimeosType') ?>&version=<?= $this->get('aimeosVersion') ?>"> |
|
| 232 | + <img src="https://aimeos.org/check/?type=<?= $this->get('aimeosType') ?>&version=<?= $this->get('aimeosVersion') ?>&extensions=<?= $this->get('aimeosExtensions') ?>" alt="Aimeos update" title="Aimeos update"> |
|
| 233 | 233 | </a> |
| 234 | 234 | |
| 235 | 235 | <ul class="sidebar-menu basic"> |
| 236 | 236 | |
| 237 | - <?php if( ( count( $this->get( 'pageSiteList', [] ) ) > 1 || $this->pageSiteTree->getChildren() !== [] || count( $this->get( 'pageSitePath', [] ) ) > 1 ) && $this->access( $this->config( 'admin/jqadm/resource/site/groups', [] ) ) ) : ?> |
|
| 237 | + <?php if ((count($this->get('pageSiteList', [])) > 1 || $this->pageSiteTree->getChildren() !== [] || count($this->get('pageSitePath', [])) > 1) && $this->access($this->config('admin/jqadm/resource/site/groups', []))) : ?> |
|
| 238 | 238 | <li class="site treeview"> |
| 239 | 239 | <a href="#"> |
| 240 | 240 | <i class="icon"></i> |
| 241 | - <span class="title"><?= $enc->html( $this->site()->label() ); ?></span> |
|
| 241 | + <span class="title"><?= $enc->html($this->site()->label()); ?></span> |
|
| 242 | 242 | </a> |
| 243 | 243 | <ul class="tree-menu"> |
| 244 | - <li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', 'Site' ) ); ?></strong></li> |
|
| 244 | + <li class="menu-header"><strong><?= $enc->html($this->translate('admin', 'Site')); ?></strong></li> |
|
| 245 | 245 | |
| 246 | - <?php $siteFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $site ) use ( &$siteFcn, $enc, $searchTarget, $cntl, $action, $params, $config ) { ?> |
|
| 246 | + <?php $siteFcn = function(\Aimeos\MShop\Locale\Item\Site\Iface $site) use (&$siteFcn, $enc, $searchTarget, $cntl, $action, $params, $config) { ?> |
|
| 247 | 247 | |
| 248 | - <li class="site-<?= $enc->attr( $site->getCode() ) ?>"> |
|
| 249 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'site' => $site->getCode() ) + $params, [], $config ) ); ?>"> |
|
| 250 | - <span class="name"><?= $enc->html( $site->getLabel() ); ?></span> |
|
| 248 | + <li class="site-<?= $enc->attr($site->getCode()) ?>"> |
|
| 249 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('site' => $site->getCode()) + $params, [], $config)); ?>"> |
|
| 250 | + <span class="name"><?= $enc->html($site->getLabel()); ?></span> |
|
| 251 | 251 | </a> |
| 252 | 252 | |
| 253 | - <?php if( $site->getChildren() !== [] ) : ?> |
|
| 253 | + <?php if ($site->getChildren() !== []) : ?> |
|
| 254 | 254 | <ul class="menu-sub"> |
| 255 | - <?php foreach( $site->getChildren() as $site ) { $siteFcn( $site ); } ?> |
|
| 255 | + <?php foreach ($site->getChildren() as $site) { $siteFcn($site); } ?> |
|
| 256 | 256 | </ul> |
| 257 | 257 | <?php endif; ?> |
| 258 | 258 | </li> |
| 259 | 259 | |
| 260 | 260 | <?php }; ?> |
| 261 | 261 | |
| 262 | - <?php foreach( $this->pageSiteList as $siteItem ) : ?> |
|
| 263 | - <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> |
|
| 264 | - <?php $siteFcn( $this->pageSiteTree ); ?> |
|
| 262 | + <?php foreach ($this->pageSiteList as $siteItem) : ?> |
|
| 263 | + <?php if ($siteItem->getId() === $this->pageSiteTree->getId()) : ?> |
|
| 264 | + <?php $siteFcn($this->pageSiteTree); ?> |
|
| 265 | 265 | <?php else : ?> |
| 266 | - <?php $siteFcn( $siteItem ); ?> |
|
| 266 | + <?php $siteFcn($siteItem); ?> |
|
| 267 | 267 | <?php endif; ?> |
| 268 | 268 | <?php endforeach; ?> |
| 269 | 269 | </ul> |
| 270 | 270 | </li> |
| 271 | 271 | <?php endif; ?> |
| 272 | 272 | |
| 273 | - <?php foreach( array_splice( $navlist, 0, $navlimit ) as $nav => $navitem ) : ?> |
|
| 274 | - <?php if( is_array( $navitem ) ) : ?> |
|
| 275 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $nav . '/groups', [] ) ) ) : ?> |
|
| 273 | + <?php foreach (array_splice($navlist, 0, $navlimit) as $nav => $navitem) : ?> |
|
| 274 | + <?php if (is_array($navitem)) : ?> |
|
| 275 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $nav . '/groups', []))) : ?> |
|
| 276 | 276 | |
| 277 | - <li class="treeview <?= $enc->attr( $nav ) ?> <?= strncmp( $this->param( 'resource' ), $nav, strlen( $nav ) ) ? '' : 'active' ?>"> |
|
| 277 | + <li class="treeview <?= $enc->attr($nav) ?> <?= strncmp($this->param('resource'), $nav, strlen($nav)) ? '' : 'active' ?>"> |
|
| 278 | 278 | <span> |
| 279 | 279 | <i class="icon"></i> |
| 280 | - <span class="title"><?= $enc->attr( $this->translate( 'admin', $nav ) ); ?></span> |
|
| 280 | + <span class="title"><?= $enc->attr($this->translate('admin', $nav)); ?></span> |
|
| 281 | 281 | </span> |
| 282 | 282 | <ul class="tree-menu"> |
| 283 | - <li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', $nav ) ); ?></strong></li> |
|
| 283 | + <li class="menu-header"><strong><?= $enc->html($this->translate('admin', $nav)); ?></strong></li> |
|
| 284 | 284 | |
| 285 | - <?php foreach( $navitem as $subresource ) : ?> |
|
| 286 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?> |
|
| 287 | - <li class="<?= str_replace( '/', '-', $subresource); ?>"> |
|
| 288 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>"> |
|
| 289 | - <span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span> |
|
| 285 | + <?php foreach ($navitem as $subresource) : ?> |
|
| 286 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $subresource . '/groups', []))) : ?> |
|
| 287 | + <li class="<?= str_replace('/', '-', $subresource); ?>"> |
|
| 288 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config)); ?>"> |
|
| 289 | + <span class="name"><?= $enc->html($this->translate('admin', $subresource)); ?></span> |
|
| 290 | 290 | </a> |
| 291 | 291 | </li> |
| 292 | 292 | <?php endif; ?> |
@@ -296,15 +296,15 @@ discard block |
||
| 296 | 296 | |
| 297 | 297 | <?php endif; ?> |
| 298 | 298 | <?php else : ?> |
| 299 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
|
| 300 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 299 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $navitem . '/groups', []))) : ?> |
|
| 300 | + <?php $key = $this->config('admin/jqadm/resource/' . $navitem . '/key'); ?> |
|
| 301 | 301 | |
| 302 | - <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
|
| 303 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
|
| 304 | - title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |
|
| 305 | - data-ctrlkey="<?= $enc->attr( strtolower( $key ) ); ?>"> |
|
| 302 | + <li class="<?= $enc->attr($navitem); ?> <?= $this->param('resource', $navfirst) === $navitem ? 'active' : '' ?>"> |
|
| 303 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('resource' => $navitem) + $params, [], $config)); ?>" |
|
| 304 | + title="<?= $enc->attr(sprintf($title, $this->translate('admin', $navitem), $key)); ?>" |
|
| 305 | + data-ctrlkey="<?= $enc->attr(strtolower($key)); ?>"> |
|
| 306 | 306 | <i class="icon"></i> |
| 307 | - <span class="title"><?= $enc->html( $this->translate( 'admin', $navitem ) ); ?></span> |
|
| 307 | + <span class="title"><?= $enc->html($this->translate('admin', $navitem)); ?></span> |
|
| 308 | 308 | </a> |
| 309 | 309 | </li> |
| 310 | 310 | |
@@ -318,23 +318,23 @@ discard block |
||
| 318 | 318 | |
| 319 | 319 | <ul class="sidebar-menu advanced"> |
| 320 | 320 | |
| 321 | - <?php foreach( $navlist as $nav => $navitem ) : ?> |
|
| 322 | - <?php if( is_array( $navitem ) ) : ?> |
|
| 323 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $nav . '/groups', [] ) ) ) : ?> |
|
| 321 | + <?php foreach ($navlist as $nav => $navitem) : ?> |
|
| 322 | + <?php if (is_array($navitem)) : ?> |
|
| 323 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $nav . '/groups', []))) : ?> |
|
| 324 | 324 | |
| 325 | - <li class="treeview <?= $enc->attr( $nav ) ?> <?= strncmp( $this->param( 'resource' ), $nav, strlen( $nav ) ) ? '' : 'active' ?>"> |
|
| 325 | + <li class="treeview <?= $enc->attr($nav) ?> <?= strncmp($this->param('resource'), $nav, strlen($nav)) ? '' : 'active' ?>"> |
|
| 326 | 326 | <span> |
| 327 | 327 | <i class="icon"></i> |
| 328 | - <span class="title"><?= $enc->attr( $this->translate( 'admin', $nav ) ); ?></span> |
|
| 328 | + <span class="title"><?= $enc->attr($this->translate('admin', $nav)); ?></span> |
|
| 329 | 329 | </span> |
| 330 | 330 | <ul class="tree-menu"> |
| 331 | - <li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', $nav ) ); ?></strong></li> |
|
| 331 | + <li class="menu-header"><strong><?= $enc->html($this->translate('admin', $nav)); ?></strong></li> |
|
| 332 | 332 | |
| 333 | - <?php foreach( $navitem as $subresource ) : ?> |
|
| 334 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?> |
|
| 335 | - <li class="<?= str_replace( '/', '-', $subresource); ?>"> |
|
| 336 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>"> |
|
| 337 | - <span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span> |
|
| 333 | + <?php foreach ($navitem as $subresource) : ?> |
|
| 334 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $subresource . '/groups', []))) : ?> |
|
| 335 | + <li class="<?= str_replace('/', '-', $subresource); ?>"> |
|
| 336 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config)); ?>"> |
|
| 337 | + <span class="name"><?= $enc->html($this->translate('admin', $subresource)); ?></span> |
|
| 338 | 338 | </a> |
| 339 | 339 | </li> |
| 340 | 340 | <?php endif; ?> |
@@ -345,15 +345,15 @@ discard block |
||
| 345 | 345 | |
| 346 | 346 | <?php endif; ?> |
| 347 | 347 | <?php else : ?> |
| 348 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
|
| 348 | + <?php if ($this->access($this->config('admin/jqadm/resource/' . $navitem . '/groups', []))) : ?> |
|
| 349 | 349 | |
| 350 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 351 | - <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
|
| 352 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
|
| 353 | - title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |
|
| 354 | - data-ctrlkey="<?= $enc->attr( strtolower( $key ) ); ?>"> |
|
| 350 | + <?php $key = $this->config('admin/jqadm/resource/' . $navitem . '/key'); ?> |
|
| 351 | + <li class="<?= $enc->attr($navitem); ?> <?= $this->param('resource', $navfirst) === $navitem ? 'active' : '' ?>"> |
|
| 352 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('resource' => $navitem) + $params, [], $config)); ?>" |
|
| 353 | + title="<?= $enc->attr(sprintf($title, $this->translate('admin', $navitem), $key)); ?>" |
|
| 354 | + data-ctrlkey="<?= $enc->attr(strtolower($key)); ?>"> |
|
| 355 | 355 | <i class="icon"></i> |
| 356 | - <span class="title"><?= $enc->html( $this->translate( 'admin', $navitem ) ); ?></span> |
|
| 356 | + <span class="title"><?= $enc->html($this->translate('admin', $navitem)); ?></span> |
|
| 357 | 357 | </a> |
| 358 | 358 | </li> |
| 359 | 359 | |
@@ -361,18 +361,18 @@ discard block |
||
| 361 | 361 | <?php endif; ?> |
| 362 | 362 | <?php endforeach; ?> |
| 363 | 363 | |
| 364 | - <?php if( $this->access( $this->config( 'admin/jqadm/resource/language/groups', [] ) ) ) : ?> |
|
| 364 | + <?php if ($this->access($this->config('admin/jqadm/resource/language/groups', []))) : ?> |
|
| 365 | 365 | <li class="language treeview"> |
| 366 | 366 | <span> |
| 367 | 367 | <i class="icon"></i> |
| 368 | - <span class="title"><?= $enc->attr( $this->translate( 'language', $this->param( 'lang', $this->translate( 'admin', 'Language' ) ) ) ); ?></span> |
|
| 368 | + <span class="title"><?= $enc->attr($this->translate('language', $this->param('lang', $this->translate('admin', 'Language')))); ?></span> |
|
| 369 | 369 | </span> |
| 370 | 370 | <ul class="tree-menu"> |
| 371 | - <li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></strong></li> |
|
| 372 | - <?php foreach( $this->get( 'pageI18nList', [] ) as $langid ) : ?> |
|
| 373 | - <li class="lang-<?= $enc->attr( $langid ) ?>"> |
|
| 374 | - <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'lang' => $langid ) + $params, [], $config ) ); ?>"> |
|
| 375 | - <span class="name"><?= $enc->html( $this->translate( 'language', $langid ) ); ?> (<?= $langid ?>)</span> |
|
| 371 | + <li class="menu-header"><strong><?= $enc->html($this->translate('admin', 'Language')); ?></strong></li> |
|
| 372 | + <?php foreach ($this->get('pageI18nList', []) as $langid) : ?> |
|
| 373 | + <li class="lang-<?= $enc->attr($langid) ?>"> |
|
| 374 | + <a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('lang' => $langid) + $params, [], $config)); ?>"> |
|
| 375 | + <span class="name"><?= $enc->html($this->translate('language', $langid)); ?> (<?= $langid ?>)</span> |
|
| 376 | 376 | </a> |
| 377 | 377 | </li> |
| 378 | 378 | <?php endforeach; ?> |
@@ -386,20 +386,20 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | <main class="main-content"> |
| 388 | 388 | |
| 389 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/error', 'common/partials/error-standard' ), array( 'errors' => $this->get( 'errors', [] ) ) ); ?> |
|
| 390 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/info', 'common/partials/info-standard' ), array( 'info' => $infoMsgs ) ); ?> |
|
| 389 | + <?= $this->partial($this->config('admin/jqadm/partial/error', 'common/partials/error-standard'), array('errors' => $this->get('errors', []))); ?> |
|
| 390 | + <?= $this->partial($this->config('admin/jqadm/partial/info', 'common/partials/info-standard'), array('info' => $infoMsgs)); ?> |
|
| 391 | 391 | |
| 392 | - <?= $this->block()->get( 'jqadm_content' ); ?> |
|
| 392 | + <?= $this->block()->get('jqadm_content'); ?> |
|
| 393 | 393 | |
| 394 | 394 | </main> |
| 395 | 395 | |
| 396 | 396 | <footer class="main-footer"> |
| 397 | 397 | <a href="https://github.com/aimeos/ai-admin-jqadm/issues" target="_blank"> |
| 398 | - <?= $enc->html( $this->translate( 'admin', 'Bug or suggestion?' ) ); ?> |
|
| 398 | + <?= $enc->html($this->translate('admin', 'Bug or suggestion?')); ?> |
|
| 399 | 399 | </a> |
| 400 | 400 | </footer> |
| 401 | 401 | |
| 402 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/confirm', 'common/partials/confirm-standard' ) ); ?> |
|
| 403 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/problem', 'common/partials/problem-standard' ) ); ?> |
|
| 402 | + <?= $this->partial($this->config('admin/jqadm/partial/confirm', 'common/partials/confirm-standard')); ?> |
|
| 403 | + <?= $this->partial($this->config('admin/jqadm/partial/problem', 'common/partials/problem-standard')); ?> |
|
| 404 | 404 | |
| 405 | 405 | </div> |
@@ -5,37 +5,37 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$selected = function( $key, $code ) { |
|
| 9 | - return ( $key == $code ? 'selected="selected"' : '' ); |
|
| 8 | +$selected = function($key, $code) { |
|
| 9 | + return ($key == $code ? 'selected="selected"' : ''); |
|
| 10 | 10 | }; |
| 11 | 11 | |
| 12 | 12 | $enc = $this->encoder(); |
| 13 | 13 | |
| 14 | 14 | |
| 15 | -$target = $this->config( 'admin/jqadm/url/save/target' ); |
|
| 16 | -$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' ); |
|
| 17 | -$action = $this->config( 'admin/jqadm/url/save/action', 'save' ); |
|
| 18 | -$config = $this->config( 'admin/jqadm/url/save/config', [] ); |
|
| 15 | +$target = $this->config('admin/jqadm/url/save/target'); |
|
| 16 | +$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm'); |
|
| 17 | +$action = $this->config('admin/jqadm/url/save/action', 'save'); |
|
| 18 | +$config = $this->config('admin/jqadm/url/save/config', []); |
|
| 19 | 19 | |
| 20 | -$params = $this->get( 'pageParams', [] ); |
|
| 20 | +$params = $this->get('pageParams', []); |
|
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | ?> |
| 24 | -<?php $this->block()->start( 'jqadm_content' ); ?> |
|
| 24 | +<?php $this->block()->start('jqadm_content'); ?> |
|
| 25 | 25 | |
| 26 | -<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>"> |
|
| 27 | - <input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/locale.currency.id' ) ); ?>" /> |
|
| 28 | - <input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" /> |
|
| 26 | +<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>"> |
|
| 27 | + <input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.id'))); ?>" value="<?= $enc->attr($this->get('itemData/locale.currency.id')); ?>" /> |
|
| 28 | + <input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" /> |
|
| 29 | 29 | <?= $this->csrf()->formfield(); ?> |
| 30 | 30 | |
| 31 | 31 | <nav class="main-navbar"> |
| 32 | 32 | <span class="navbar-brand"> |
| 33 | - <?= $enc->html( $this->translate( 'admin', 'Currency' ) ); ?>: |
|
| 34 | - <?= $enc->html( $this->get( 'itemData/locale.currency.id' ) ); ?> - |
|
| 35 | - <?= $enc->html( $this->get( 'itemData/locale.currency.label', $this->translate( 'admin', 'New' ) ) ); ?> |
|
| 33 | + <?= $enc->html($this->translate('admin', 'Currency')); ?>: |
|
| 34 | + <?= $enc->html($this->get('itemData/locale.currency.id')); ?> - |
|
| 35 | + <?= $enc->html($this->get('itemData/locale.currency.label', $this->translate('admin', 'New'))); ?> |
|
| 36 | 36 | </span> |
| 37 | 37 | <div class="item-actions"> |
| 38 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> |
|
| 38 | + <?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?> |
|
| 39 | 39 | </div> |
| 40 | 40 | </nav> |
| 41 | 41 | |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | <li class="nav-item basic"> |
| 48 | 48 | <a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic"> |
| 49 | - <?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?> |
|
| 49 | + <?= $enc->html($this->translate('admin', 'Basic')); ?> |
|
| 50 | 50 | </a> |
| 51 | 51 | </li> |
| 52 | 52 | |
| 53 | - <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
|
| 54 | - <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
|
| 55 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 56 | - <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
|
| 53 | + <?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?> |
|
| 54 | + <li class="nav-item <?= $enc->attr($subpart); ?>"> |
|
| 55 | + <a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 56 | + <?= $enc->html($this->translate('admin', $subpart)); ?> |
|
| 57 | 57 | </a> |
| 58 | 58 | </li> |
| 59 | 59 | <?php endforeach; ?> |
@@ -62,16 +62,16 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | <div class="item-meta text-muted"> |
| 64 | 64 | <small> |
| 65 | - <?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>: |
|
| 66 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.mtime' ) ); ?></span> |
|
| 65 | + <?= $enc->html($this->translate('admin', 'Modified')); ?>: |
|
| 66 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.mtime')); ?></span> |
|
| 67 | 67 | </small> |
| 68 | 68 | <small> |
| 69 | - <?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>: |
|
| 70 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.ctime' ) ); ?></span> |
|
| 69 | + <?= $enc->html($this->translate('admin', 'Created')); ?>: |
|
| 70 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.ctime')); ?></span> |
|
| 71 | 71 | </small> |
| 72 | 72 | <small> |
| 73 | - <?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>: |
|
| 74 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.currency.editor' ) ); ?></span> |
|
| 73 | + <?= $enc->html($this->translate('admin', 'Editor')); ?>: |
|
| 74 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.currency.editor')); ?></span> |
|
| 75 | 75 | </small> |
| 76 | 76 | </div> |
| 77 | 77 | </div> |
@@ -81,62 +81,62 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | <div class="col-xl-6 content-block"> |
| 83 | 83 | <div class="form-group row mandatory"> |
| 84 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label> |
|
| 84 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label> |
|
| 85 | 85 | <div class="col-sm-8"> |
| 86 | 86 | <select class="form-control custom-select item-status" required="required" tabindex="1" |
| 87 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.status' ) ) ); ?>" > |
|
| 87 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.status'))); ?>" > |
|
| 88 | 88 | <option value=""> |
| 89 | - <?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 89 | + <?= $enc->attr($this->translate('admin', 'Please select')); ?> |
|
| 90 | 90 | </option> |
| 91 | - <option value="1" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), 1 ); ?> > |
|
| 92 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?> |
|
| 91 | + <option value="1" <?= $selected($this->get('itemData/locale.currency.status', 1), 1); ?> > |
|
| 92 | + <?= $enc->html($this->translate('mshop/code', 'status:1')); ?> |
|
| 93 | 93 | </option> |
| 94 | - <option value="0" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), 0 ); ?> > |
|
| 95 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?> |
|
| 94 | + <option value="0" <?= $selected($this->get('itemData/locale.currency.status', 1), 0); ?> > |
|
| 95 | + <?= $enc->html($this->translate('mshop/code', 'status:0')); ?> |
|
| 96 | 96 | </option> |
| 97 | - <option value="-1" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), -1 ); ?> > |
|
| 98 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?> |
|
| 97 | + <option value="-1" <?= $selected($this->get('itemData/locale.currency.status', 1), -1); ?> > |
|
| 98 | + <?= $enc->html($this->translate('mshop/code', 'status:-1')); ?> |
|
| 99 | 99 | </option> |
| 100 | - <option value="-2" <?= $selected( $this->get( 'itemData/locale.currency.status', 1 ), -2 ); ?> > |
|
| 101 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?> |
|
| 100 | + <option value="-2" <?= $selected($this->get('itemData/locale.currency.status', 1), -2); ?> > |
|
| 101 | + <?= $enc->html($this->translate('mshop/code', 'status:-2')); ?> |
|
| 102 | 102 | </option> |
| 103 | 103 | </select> |
| 104 | 104 | </div> |
| 105 | 105 | </div> |
| 106 | 106 | <div class="form-group row mandatory"> |
| 107 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label> |
|
| 107 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label> |
|
| 108 | 108 | <div class="col-sm-8"> |
| 109 | 109 | <input class="form-control item-code" required="required" tabindex="1" autocomplete="off" |
| 110 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.code' ) ) ); ?>" |
|
| 111 | - placeholder="<?= $enc->attr( $this->translate( 'admin', 'ISO currency code (required)' ) ); ?>" |
|
| 112 | - value="<?= $enc->attr( $this->get( 'itemData/locale.currency.code' ) ); ?>" /> |
|
| 110 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.code'))); ?>" |
|
| 111 | + placeholder="<?= $enc->attr($this->translate('admin', 'ISO currency code (required)')); ?>" |
|
| 112 | + value="<?= $enc->attr($this->get('itemData/locale.currency.code')); ?>" /> |
|
| 113 | 113 | </div> |
| 114 | 114 | <div class="col-sm-12 form-text text-muted help-text"> |
| 115 | - <?= $enc->html( $this->translate( 'admin', 'Three letter ISO currency code' ) ); ?> |
|
| 115 | + <?= $enc->html($this->translate('admin', 'Three letter ISO currency code')); ?> |
|
| 116 | 116 | </div> |
| 117 | 117 | </div> |
| 118 | 118 | <div class="form-group row mandatory"> |
| 119 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label> |
|
| 119 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label> |
|
| 120 | 120 | <div class="col-sm-8"> |
| 121 | 121 | <input class="form-control item-label" required="required" tabindex="1" autocomplete="off" |
| 122 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currency.label' ) ) ); ?>" |
|
| 123 | - placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label (required)' ) ); ?>" |
|
| 124 | - value="<?= $enc->attr( $this->get( 'itemData/locale.currency.label' ) ); ?>" /> |
|
| 122 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.currency.label'))); ?>" |
|
| 123 | + placeholder="<?= $enc->attr($this->translate('admin', 'Label (required)')); ?>" |
|
| 124 | + value="<?= $enc->attr($this->get('itemData/locale.currency.label')); ?>" /> |
|
| 125 | 125 | </div> |
| 126 | 126 | <div class="col-sm-12 form-text text-muted help-text"> |
| 127 | - <?= $enc->html( $this->translate( 'admin', 'Descritive name of the currency' ) ); ?> |
|
| 127 | + <?= $enc->html($this->translate('admin', 'Descritive name of the currency')); ?> |
|
| 128 | 128 | </div> |
| 129 | 129 | </div> |
| 130 | 130 | </div> |
| 131 | 131 | |
| 132 | 132 | </div> |
| 133 | 133 | |
| 134 | - <?= $this->get( 'itemBody' ); ?> |
|
| 134 | + <?= $this->get('itemBody'); ?> |
|
| 135 | 135 | |
| 136 | 136 | </div> |
| 137 | 137 | |
| 138 | 138 | <div class="item-actions"> |
| 139 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> |
|
| 139 | + <?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?> |
|
| 140 | 140 | </div> |
| 141 | 141 | </div> |
| 142 | 142 | </form> |
@@ -144,4 +144,4 @@ discard block |
||
| 144 | 144 | <?php $this->block()->stop(); ?> |
| 145 | 145 | |
| 146 | 146 | |
| 147 | -<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?> |
|
| 147 | +<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?> |
|
@@ -5,42 +5,42 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$selected = function( $key, $code ) { |
|
| 9 | - return ( $key == $code ? 'selected="selected"' : '' ); |
|
| 8 | +$selected = function($key, $code) { |
|
| 9 | + return ($key == $code ? 'selected="selected"' : ''); |
|
| 10 | 10 | }; |
| 11 | 11 | |
| 12 | 12 | $enc = $this->encoder(); |
| 13 | 13 | |
| 14 | 14 | |
| 15 | -$target = $this->config( 'admin/jqadm/url/save/target' ); |
|
| 16 | -$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' ); |
|
| 17 | -$action = $this->config( 'admin/jqadm/url/save/action', 'save' ); |
|
| 18 | -$config = $this->config( 'admin/jqadm/url/save/config', [] ); |
|
| 15 | +$target = $this->config('admin/jqadm/url/save/target'); |
|
| 16 | +$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm'); |
|
| 17 | +$action = $this->config('admin/jqadm/url/save/action', 'save'); |
|
| 18 | +$config = $this->config('admin/jqadm/url/save/config', []); |
|
| 19 | 19 | |
| 20 | -$params = $this->get( 'pageParams', [] ); |
|
| 20 | +$params = $this->get('pageParams', []); |
|
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | ?> |
| 24 | -<?php $this->block()->start( 'jqadm_content' ); ?> |
|
| 24 | +<?php $this->block()->start('jqadm_content'); ?> |
|
| 25 | 25 | |
| 26 | -<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>"> |
|
| 27 | - <input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/locale.id' ) ); ?>" /> |
|
| 28 | - <input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" /> |
|
| 26 | +<form class="item item-locale form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>"> |
|
| 27 | + <input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'locale.id'))); ?>" value="<?= $enc->attr($this->get('itemData/locale.id')); ?>" /> |
|
| 28 | + <input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" /> |
|
| 29 | 29 | <?= $this->csrf()->formfield(); ?> |
| 30 | 30 | |
| 31 | 31 | <nav class="main-navbar"> |
| 32 | 32 | <span class="navbar-brand"> |
| 33 | - <?= $enc->html( $this->translate( 'admin', 'Locale' ) ); ?>: |
|
| 34 | - <?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> - |
|
| 35 | - <?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?> |
|
| 36 | - <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
|
| 33 | + <?= $enc->html($this->translate('admin', 'Locale')); ?>: |
|
| 34 | + <?= $enc->html($this->get('itemData/locale.id')); ?> - |
|
| 35 | + <?php if ($this->get('itemData/locale.currencyid')) : ?> |
|
| 36 | + <?= $enc->html($this->get('itemData/locale.languageid') . '/' . $this->get('itemData/locale.currencyid')); ?> |
|
| 37 | 37 | <?php else : ?> |
| 38 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
| 38 | + <?= $enc->html($this->translate('admin', 'New')); ?> |
|
| 39 | 39 | <?php endif; ?> |
| 40 | - <span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span> |
|
| 40 | + <span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/locale.siteid'))); ?>)</span> |
|
| 41 | 41 | </span> |
| 42 | 42 | <div class="item-actions"> |
| 43 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> |
|
| 43 | + <?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?> |
|
| 44 | 44 | </div> |
| 45 | 45 | </nav> |
| 46 | 46 | |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | <li class="nav-item basic"> |
| 53 | 53 | <a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic"> |
| 54 | - <?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?> |
|
| 54 | + <?= $enc->html($this->translate('admin', 'Basic')); ?> |
|
| 55 | 55 | </a> |
| 56 | 56 | </li> |
| 57 | 57 | |
| 58 | - <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
|
| 59 | - <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
|
| 60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 61 | - <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
|
| 58 | + <?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?> |
|
| 59 | + <li class="nav-item <?= $enc->attr($subpart); ?>"> |
|
| 60 | + <a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 61 | + <?= $enc->html($this->translate('admin', $subpart)); ?> |
|
| 62 | 62 | </a> |
| 63 | 63 | </li> |
| 64 | 64 | <?php endforeach; ?> |
@@ -67,114 +67,114 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | <div class="item-meta text-muted"> |
| 69 | 69 | <small> |
| 70 | - <?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>: |
|
| 71 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.mtime' ) ); ?></span> |
|
| 70 | + <?= $enc->html($this->translate('admin', 'Modified')); ?>: |
|
| 71 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.mtime')); ?></span> |
|
| 72 | 72 | </small> |
| 73 | 73 | <small> |
| 74 | - <?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>: |
|
| 75 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.ctime' ) ); ?></span> |
|
| 74 | + <?= $enc->html($this->translate('admin', 'Created')); ?>: |
|
| 75 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.ctime')); ?></span> |
|
| 76 | 76 | </small> |
| 77 | 77 | <small> |
| 78 | - <?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>: |
|
| 79 | - <span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.editor' ) ); ?></span> |
|
| 78 | + <?= $enc->html($this->translate('admin', 'Editor')); ?>: |
|
| 79 | + <span class="meta-value"><?= $enc->html($this->get('itemData/locale.editor')); ?></span> |
|
| 80 | 80 | </small> |
| 81 | 81 | </div> |
| 82 | 82 | </div> |
| 83 | 83 | |
| 84 | 84 | <div class="col-md-9 item-content tab-content"> |
| 85 | - <?php $readonly = ( $this->access( 'admin' ) === false ? $this->site()->readonly( $this->get( 'itemData/locale.siteid' ) ) : '' ); ?> |
|
| 85 | + <?php $readonly = ($this->access('admin') === false ? $this->site()->readonly($this->get('itemData/locale.siteid')) : ''); ?> |
|
| 86 | 86 | |
| 87 | 87 | <div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic"> |
| 88 | 88 | |
| 89 | 89 | <div class="col-xl-6 content-block <?= $readonly ?>"> |
| 90 | 90 | <div class="form-group row mandatory"> |
| 91 | - <label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label> |
|
| 91 | + <label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label> |
|
| 92 | 92 | <div class="col-sm-8"> |
| 93 | 93 | <select class="form-control custom-select item-status" required="required" tabindex="1" |
| 94 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.status' ) ) ); ?>" |
|
| 95 | - <?= $this->site()->readonly( $this->get( 'itemData/locale.siteid' ) ); ?> > |
|
| 94 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.status'))); ?>" |
|
| 95 | + <?= $this->site()->readonly($this->get('itemData/locale.siteid')); ?> > |
|
| 96 | 96 | <option value=""> |
| 97 | - <?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 97 | + <?= $enc->attr($this->translate('admin', 'Please select')); ?> |
|
| 98 | 98 | </option> |
| 99 | - <option value="1" <?= $selected( $this->get( 'itemData/locale.status', 1 ), 1 ); ?> > |
|
| 100 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?> |
|
| 99 | + <option value="1" <?= $selected($this->get('itemData/locale.status', 1), 1); ?> > |
|
| 100 | + <?= $enc->html($this->translate('mshop/code', 'status:1')); ?> |
|
| 101 | 101 | </option> |
| 102 | - <option value="0" <?= $selected( $this->get( 'itemData/locale.status', 1 ), 0 ); ?> > |
|
| 103 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?> |
|
| 102 | + <option value="0" <?= $selected($this->get('itemData/locale.status', 1), 0); ?> > |
|
| 103 | + <?= $enc->html($this->translate('mshop/code', 'status:0')); ?> |
|
| 104 | 104 | </option> |
| 105 | - <option value="-1" <?= $selected( $this->get( 'itemData/locale.status', 1 ), -1 ); ?> > |
|
| 106 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?> |
|
| 105 | + <option value="-1" <?= $selected($this->get('itemData/locale.status', 1), -1); ?> > |
|
| 106 | + <?= $enc->html($this->translate('mshop/code', 'status:-1')); ?> |
|
| 107 | 107 | </option> |
| 108 | - <option value="-2" <?= $selected( $this->get( 'itemData/locale.status', 1 ), -2 ); ?> > |
|
| 109 | - <?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?> |
|
| 108 | + <option value="-2" <?= $selected($this->get('itemData/locale.status', 1), -2); ?> > |
|
| 109 | + <?= $enc->html($this->translate('mshop/code', 'status:-2')); ?> |
|
| 110 | 110 | </option> |
| 111 | 111 | </select> |
| 112 | 112 | </div> |
| 113 | 113 | </div> |
| 114 | 114 | <div class="form-group row mandatory"> |
| 115 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label> |
|
| 115 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Language')); ?></label> |
|
| 116 | 116 | <div class="col-sm-8"> |
| 117 | 117 | <select class="form-control custom-select item-languageid" required="required" tabindex="1" |
| 118 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.languageid' ) ) ); ?>" |
|
| 119 | - <?= $this->site()->readonly( $this->get( 'itemData/locale.siteid' ) ); ?> > |
|
| 118 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.languageid'))); ?>" |
|
| 119 | + <?= $this->site()->readonly($this->get('itemData/locale.siteid')); ?> > |
|
| 120 | 120 | <option value=""> |
| 121 | - <?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 121 | + <?= $enc->attr($this->translate('admin', 'Please select')); ?> |
|
| 122 | 122 | </option> |
| 123 | 123 | |
| 124 | - <?php foreach( $this->get( 'itemLanguages', [] ) as $id => $item ) : ?> |
|
| 125 | - <option value="<?= $enc->attr( $id ); ?>" <?= $selected( $this->get( 'itemData/locale.languageid' ), $id ); ?> > |
|
| 126 | - <?= $enc->html( $id ); ?> |
|
| 124 | + <?php foreach ($this->get('itemLanguages', []) as $id => $item) : ?> |
|
| 125 | + <option value="<?= $enc->attr($id); ?>" <?= $selected($this->get('itemData/locale.languageid'), $id); ?> > |
|
| 126 | + <?= $enc->html($id); ?> |
|
| 127 | 127 | </option> |
| 128 | 128 | <?php endforeach; ?> |
| 129 | 129 | </select> |
| 130 | 130 | </div> |
| 131 | 131 | <div class="col-sm-12 form-text text-muted help-text"> |
| 132 | - <?= $enc->html( $this->translate( 'admin', 'Available language for the current site' ) ); ?> |
|
| 132 | + <?= $enc->html($this->translate('admin', 'Available language for the current site')); ?> |
|
| 133 | 133 | </div> |
| 134 | 134 | </div> |
| 135 | 135 | <div class="form-group row mandatory"> |
| 136 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Currency' ) ); ?></label> |
|
| 136 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Currency')); ?></label> |
|
| 137 | 137 | <div class="col-sm-8"> |
| 138 | 138 | <select class="form-control custom-select item-currencyid" required="required" tabindex="1" |
| 139 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.currencyid' ) ) ); ?>" |
|
| 140 | - <?= $this->site()->readonly( $this->get( 'itemData/locale.siteid' ) ); ?> > |
|
| 139 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.currencyid'))); ?>" |
|
| 140 | + <?= $this->site()->readonly($this->get('itemData/locale.siteid')); ?> > |
|
| 141 | 141 | <option value=""> |
| 142 | - <?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?> |
|
| 142 | + <?= $enc->attr($this->translate('admin', 'Please select')); ?> |
|
| 143 | 143 | </option> |
| 144 | 144 | |
| 145 | - <?php foreach( $this->get( 'itemCurrencies', [] ) as $id => $item ) : ?> |
|
| 146 | - <option value="<?= $enc->attr( $id ); ?>" <?= $selected( $this->get( 'itemData/locale.currencyid' ), $id ); ?> > |
|
| 147 | - <?= $enc->html( $id ); ?> |
|
| 145 | + <?php foreach ($this->get('itemCurrencies', []) as $id => $item) : ?> |
|
| 146 | + <option value="<?= $enc->attr($id); ?>" <?= $selected($this->get('itemData/locale.currencyid'), $id); ?> > |
|
| 147 | + <?= $enc->html($id); ?> |
|
| 148 | 148 | </option> |
| 149 | 149 | <?php endforeach; ?> |
| 150 | 150 | </select> |
| 151 | 151 | </div> |
| 152 | 152 | <div class="col-sm-12 form-text text-muted help-text"> |
| 153 | - <?= $enc->html( $this->translate( 'admin', 'Available currency for the current site' ) ); ?> |
|
| 153 | + <?= $enc->html($this->translate('admin', 'Available currency for the current site')); ?> |
|
| 154 | 154 | </div> |
| 155 | 155 | </div> |
| 156 | 156 | <div class="form-group row mandatory"> |
| 157 | - <label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Position' ) ); ?></label> |
|
| 157 | + <label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Position')); ?></label> |
|
| 158 | 158 | <div class="col-sm-8"> |
| 159 | 159 | <input class="form-control item-position" required="required" tabindex="1" autocomplete="off" |
| 160 | - name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.position' ) ) ); ?>" |
|
| 161 | - placeholder="<?= $enc->attr( $this->translate( 'admin', 'Position (required)' ) ); ?>" |
|
| 162 | - value="<?= $enc->attr( $this->get( 'itemData/locale.position' ) ); ?>" |
|
| 163 | - <?= $this->site()->readonly( $this->get( 'itemData/locale.siteid' ) ); ?> /> |
|
| 160 | + name="<?= $enc->attr($this->formparam(array('item', 'locale.position'))); ?>" |
|
| 161 | + placeholder="<?= $enc->attr($this->translate('admin', 'Position (required)')); ?>" |
|
| 162 | + value="<?= $enc->attr($this->get('itemData/locale.position')); ?>" |
|
| 163 | + <?= $this->site()->readonly($this->get('itemData/locale.siteid')); ?> /> |
|
| 164 | 164 | </div> |
| 165 | 165 | <div class="col-sm-12 form-text text-muted help-text"> |
| 166 | - <?= $enc->html( $this->translate( 'admin', 'Order of the language/currency combinations' ) ); ?> |
|
| 166 | + <?= $enc->html($this->translate('admin', 'Order of the language/currency combinations')); ?> |
|
| 167 | 167 | </div> |
| 168 | 168 | </div> |
| 169 | 169 | </div> |
| 170 | 170 | </div> |
| 171 | 171 | |
| 172 | - <?= $this->get( 'itemBody' ); ?> |
|
| 172 | + <?= $this->get('itemBody'); ?> |
|
| 173 | 173 | |
| 174 | 174 | </div> |
| 175 | 175 | |
| 176 | 176 | <div class="item-actions"> |
| 177 | - <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> |
|
| 177 | + <?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?> |
|
| 178 | 178 | </div> |
| 179 | 179 | </div> |
| 180 | 180 | </form> |
@@ -182,4 +182,4 @@ discard block |
||
| 182 | 182 | <?php $this->block()->stop(); ?> |
| 183 | 183 | |
| 184 | 184 | |
| 185 | -<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?> |
|
| 185 | +<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?> |
|
