@@ -25,5 +25,5 @@ |
||
25 | 25 | * |
26 | 26 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
27 | 27 | */ |
28 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context ); |
|
28 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context); |
|
29 | 29 | } |
@@ -26,5 +26,5 @@ |
||
26 | 26 | * @param \Aimeos\Admin\JQAdm\Iface $client Admin object |
27 | 27 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects |
28 | 28 | */ |
29 | - public function __construct( \Aimeos\Admin\JQAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context ); |
|
29 | + public function __construct(\Aimeos\Admin\JQAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context); |
|
30 | 30 | } |
31 | 31 | \ No newline at end of file |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param string $siteid ID of a site item |
40 | 40 | * @return string|null Label of the site item or null if not found |
41 | 41 | */ |
42 | - public function match( $siteid ); |
|
42 | + public function match($siteid); |
|
43 | 43 | |
44 | 44 | /** |
45 | 45 | * Returns "readonly" if the item is inherited from another site |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * @param string $siteid ID of a site item |
48 | 48 | * @return string|null "readonly" if item is from a parent site, null if not |
49 | 49 | */ |
50 | - public function readonly( $siteid ); |
|
50 | + public function readonly($siteid); |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Returns the site ID of the current site |
@@ -19,44 +19,44 @@ |
||
19 | 19 | |
20 | 20 | protected function setUp() |
21 | 21 | { |
22 | - $this->cache = $this->getMockBuilder( 'Aimeos\MW\Cache\None' ) |
|
23 | - ->setMethods( array( 'deleteByTags' ) ) |
|
22 | + $this->cache = $this->getMockBuilder('Aimeos\MW\Cache\None') |
|
23 | + ->setMethods(array('deleteByTags')) |
|
24 | 24 | ->disableOriginalConstructor() |
25 | 25 | ->getMock(); |
26 | 26 | |
27 | - $this->mock = $this->getMockBuilder( 'Aimeos\Admin\JQAdm\Product\Category\Standard' ) |
|
28 | - ->setMethods( array( 'save' ) ) |
|
27 | + $this->mock = $this->getMockBuilder('Aimeos\Admin\JQAdm\Product\Category\Standard') |
|
28 | + ->setMethods(array('save')) |
|
29 | 29 | ->disableOriginalConstructor() |
30 | 30 | ->getMock(); |
31 | 31 | |
32 | 32 | $this->context = \TestHelperJqadm::getContext(); |
33 | - $this->context->setCache( $this->cache ); |
|
33 | + $this->context->setCache($this->cache); |
|
34 | 34 | |
35 | - $this->object = new \Aimeos\Admin\JQAdm\Product\Category\Decorator\Cache( $this->mock, $this->context ); |
|
35 | + $this->object = new \Aimeos\Admin\JQAdm\Product\Category\Decorator\Cache($this->mock, $this->context); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | protected function tearDown() |
40 | 40 | { |
41 | - unset( $this->object, $this->mock, $this->context, $this->cache ); |
|
41 | + unset($this->object, $this->mock, $this->context, $this->cache); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
45 | 45 | public function testSave() |
46 | 46 | { |
47 | 47 | $view = \TestHelperJqadm::getView(); |
48 | - $tags = array( 'catalog', 'catalog-1', 'catalog-2' ); |
|
48 | + $tags = array('catalog', 'catalog-1', 'catalog-2'); |
|
49 | 49 | |
50 | 50 | $param = ['site' => 'unittest', 'category' => ['catalog.id' => ['1', '2']]]; |
51 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $param ); |
|
52 | - $view->addHelper( 'param', $helper ); |
|
51 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $param); |
|
52 | + $view->addHelper('param', $helper); |
|
53 | 53 | |
54 | - $this->cache->expects( $this->once() )->method( 'deleteByTags' )->with( $this->equalTo( $tags ) ); |
|
55 | - $this->mock->expects( $this->once() )->method( 'save' )->will( $this->returnValue( 'test' ) ); |
|
54 | + $this->cache->expects($this->once())->method('deleteByTags')->with($this->equalTo($tags)); |
|
55 | + $this->mock->expects($this->once())->method('save')->will($this->returnValue('test')); |
|
56 | 56 | |
57 | - $this->object->setView( $view ); |
|
57 | + $this->object->setView($view); |
|
58 | 58 | $result = $this->object->save(); |
59 | 59 | |
60 | - $this->assertEquals( 'test', $result ); |
|
60 | + $this->assertEquals('test', $result); |
|
61 | 61 | } |
62 | 62 | } |
@@ -17,77 +17,77 @@ |
||
17 | 17 | |
18 | 18 | protected function setUp() |
19 | 19 | { |
20 | - $this->mock = $this->getMockBuilder( 'Aimeos\Admin\JQAdm\Product\Standard' ) |
|
21 | - ->setMethods( array( 'copy', 'create', 'delete', 'get', 'save', 'search', 'getSubClient' ) ) |
|
20 | + $this->mock = $this->getMockBuilder('Aimeos\Admin\JQAdm\Product\Standard') |
|
21 | + ->setMethods(array('copy', 'create', 'delete', 'get', 'save', 'search', 'getSubClient')) |
|
22 | 22 | ->disableOriginalConstructor() |
23 | 23 | ->getMock(); |
24 | 24 | |
25 | 25 | $context = \TestHelperJqadm::getContext(); |
26 | 26 | |
27 | - $this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page( $this->mock, $context ); |
|
28 | - $this->object->setAimeos( \TestHelperJqadm::getAimeos() ); |
|
29 | - $this->object->setView( \TestHelperJqadm::getView() ); |
|
27 | + $this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page($this->mock, $context); |
|
28 | + $this->object->setAimeos(\TestHelperJqadm::getAimeos()); |
|
29 | + $this->object->setView(\TestHelperJqadm::getView()); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | protected function tearDown() |
34 | 34 | { |
35 | - unset( $this->object, $this->mock ); |
|
35 | + unset($this->object, $this->mock); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testCopy() |
40 | 40 | { |
41 | - $this->mock->expects( $this->once() )->method( 'copy' )->will( $this->returnValue( 'test' ) ); |
|
41 | + $this->mock->expects($this->once())->method('copy')->will($this->returnValue('test')); |
|
42 | 42 | |
43 | - $this->assertEquals( 'test', $this->object->copy() ); |
|
43 | + $this->assertEquals('test', $this->object->copy()); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | public function testCreate() |
48 | 48 | { |
49 | - $this->mock->expects( $this->once() )->method( 'create' )->will( $this->returnValue( 'test' ) ); |
|
49 | + $this->mock->expects($this->once())->method('create')->will($this->returnValue('test')); |
|
50 | 50 | |
51 | - $this->assertEquals( 'test', $this->object->create() ); |
|
51 | + $this->assertEquals('test', $this->object->create()); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
55 | 55 | public function testDelete() |
56 | 56 | { |
57 | - $this->mock->expects( $this->once() )->method( 'delete' )->will( $this->returnValue( 'test' ) ); |
|
57 | + $this->mock->expects($this->once())->method('delete')->will($this->returnValue('test')); |
|
58 | 58 | |
59 | - $this->assertEquals( 'test', $this->object->delete() ); |
|
59 | + $this->assertEquals('test', $this->object->delete()); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | 63 | public function testGet() |
64 | 64 | { |
65 | - $this->mock->expects( $this->once() )->method( 'get' )->will( $this->returnValue( 'test' ) ); |
|
65 | + $this->mock->expects($this->once())->method('get')->will($this->returnValue('test')); |
|
66 | 66 | |
67 | - $this->assertEquals( 'test', $this->object->get() ); |
|
67 | + $this->assertEquals('test', $this->object->get()); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | |
71 | 71 | public function testSave() |
72 | 72 | { |
73 | - $this->mock->expects( $this->once() )->method( 'save' )->will( $this->returnValue( 'test' ) ); |
|
73 | + $this->mock->expects($this->once())->method('save')->will($this->returnValue('test')); |
|
74 | 74 | |
75 | - $this->assertEquals( 'test', $this->object->save() ); |
|
75 | + $this->assertEquals('test', $this->object->save()); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | |
79 | 79 | public function testSearch() |
80 | 80 | { |
81 | - $this->mock->expects( $this->once() )->method( 'search' )->will( $this->returnValue( 'test' ) ); |
|
81 | + $this->mock->expects($this->once())->method('search')->will($this->returnValue('test')); |
|
82 | 82 | |
83 | - $this->assertEquals( 'test', $this->object->search() ); |
|
83 | + $this->assertEquals('test', $this->object->search()); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | 87 | public function testGetSubClient() |
88 | 88 | { |
89 | - $this->mock->expects( $this->once() )->method( 'getSubClient' )->will( $this->returnValue( 'test' ) ); |
|
89 | + $this->mock->expects($this->once())->method('getSubClient')->will($this->returnValue('test')); |
|
90 | 90 | |
91 | - $this->assertEquals( 'test', $this->object->getSubClient( 'unknown' ) ); |
|
91 | + $this->assertEquals('test', $this->object->getSubClient('unknown')); |
|
92 | 92 | } |
93 | 93 | } |
@@ -35,8 +35,11 @@ |
||
35 | 35 | <?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> - |
36 | 36 | <?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?> |
37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
38 | - <?php else : ?> |
|
39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
41 | +} |
|
42 | +?> |
|
40 | 43 | <?php endif; ?> |
41 | 44 | <span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span> |
42 | 45 | </span> |
@@ -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')); ?> |
@@ -17,7 +17,7 @@ |
||
17 | 17 | <div class="btn btn-card-header act-show fa"></div> |
18 | 18 | </div> |
19 | 19 | <span class="item-label header-label"> |
20 | - <?= $enc->html( $this->translate( 'admin', 'Sales of the last 30 days' ) ); ?> |
|
20 | + <?= $enc->html($this->translate('admin', 'Sales of the last 30 days')); ?> |
|
21 | 21 | </span> |
22 | 22 | </div> |
23 | 23 | <div id="order-salesday-data" class="card-block collapse show content loading" role="tabpanel" |
@@ -7,14 +7,14 @@ discard block |
||
7 | 7 | |
8 | 8 | $enc = $this->encoder(); |
9 | 9 | $trans = array( |
10 | - '-1' => $this->translate( 'mshop/code', 'pay:-1' ), |
|
11 | - '0' => $this->translate( 'mshop/code', 'pay:0' ), |
|
12 | - '1' => $this->translate( 'mshop/code', 'pay:1' ), |
|
13 | - '2' => $this->translate( 'mshop/code', 'pay:2' ), |
|
14 | - '3' => $this->translate( 'mshop/code', 'pay:3' ), |
|
15 | - '4' => $this->translate( 'mshop/code', 'pay:4' ), |
|
16 | - '5' => $this->translate( 'mshop/code', 'pay:5' ), |
|
17 | - '6' => $this->translate( 'mshop/code', 'pay:6' ), |
|
10 | + '-1' => $this->translate('mshop/code', 'pay:-1'), |
|
11 | + '0' => $this->translate('mshop/code', 'pay:0'), |
|
12 | + '1' => $this->translate('mshop/code', 'pay:1'), |
|
13 | + '2' => $this->translate('mshop/code', 'pay:2'), |
|
14 | + '3' => $this->translate('mshop/code', 'pay:3'), |
|
15 | + '4' => $this->translate('mshop/code', 'pay:4'), |
|
16 | + '5' => $this->translate('mshop/code', 'pay:5'), |
|
17 | + '6' => $this->translate('mshop/code', 'pay:6'), |
|
18 | 18 | ); |
19 | 19 | |
20 | 20 | ?> |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | <div class="btn btn-card-header act-show fa"></div> |
27 | 27 | </div> |
28 | 28 | <span class="item-label header-label"> |
29 | - <?= $enc->html( $this->translate( 'admin', 'Orders by payment status' ) ); ?> |
|
29 | + <?= $enc->html($this->translate('admin', 'Orders by payment status')); ?> |
|
30 | 30 | </span> |
31 | 31 | </div> |
32 | 32 | <div id="order-countpaystatus-data" class="card-block collapse show content loading" role="tabpanel" |
33 | - aria-labelledby="order-countpaystatus-head" data-translation="<?= $enc->attr( json_encode( $trans ) ); ?>"> |
|
33 | + aria-labelledby="order-countpaystatus-head" data-translation="<?= $enc->attr(json_encode($trans)); ?>"> |
|
34 | 34 | </div> |
35 | 35 | </div> |
36 | -<?= $this->get( 'orderpaymentstatusBody' ); ?> |
|
36 | +<?= $this->get('orderpaymentstatusBody'); ?> |
@@ -17,11 +17,11 @@ |
||
17 | 17 | <div class="btn btn-card-header act-show fa"></div> |
18 | 18 | </div> |
19 | 19 | <span class="item-label header-label"> |
20 | - <?= $enc->html( $this->translate( 'admin', 'Delivery types' ) ); ?> |
|
20 | + <?= $enc->html($this->translate('admin', 'Delivery types')); ?> |
|
21 | 21 | </span> |
22 | 22 | </div> |
23 | 23 | <div id="order-servicedelivery-data" class="card-block collapse show content loading" role="tabpanel" |
24 | 24 | aria-labelledby="order-servicedelivery-head"> |
25 | 25 | </div> |
26 | 26 | </div> |
27 | -<?= $this->get( 'orderdeliverytypeBody' ); ?> |
|
27 | +<?= $this->get('orderdeliverytypeBody'); ?> |