Skip to content

Commit 0d698ae

Browse files
committed
Merge remote-tracking branch 'git-36978/no-author/tax-widget' into bluetooth_delivery
2 parents f78e59c + b55e755 commit 0d698ae

File tree

39 files changed

+40
-103
lines changed

39 files changed

+40
-103
lines changed

app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Admin product tax class add form
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
declare(strict_types=1);
1311

@@ -27,7 +25,7 @@
2725
*/
2826
class Form extends \Magento\Backend\Block\Widget\Form\Generic
2927
{
30-
const FORM_ELEMENT_ID = 'rate-form';
28+
public const FORM_ELEMENT_ID = 'rate-form';
3129

3230
/**
3331
* @var null
@@ -40,8 +38,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
4038
protected $_template = 'Magento_Tax::rate/form.phtml';
4139

4240
/**
43-
* Tax data
44-
*
4541
* @var \Magento\Tax\Helper\Data|null
4642
*/
4743
protected $_taxData = null;

app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml grid item renderer number
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer;
1311

app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Tax Rate Titles Renderer
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
class Title extends \Magento\Framework\View\Element\Template
1715
{
@@ -92,6 +90,8 @@ public function getTitles()
9290
}
9391

9492
/**
93+
* Return all the stores
94+
*
9595
* @return mixed
9696
*/
9797
public function getStores()

app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Tax Rate Titles Fieldset
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Block\Adminhtml\Rate\Title;
1311

@@ -37,6 +35,8 @@ public function __construct(
3735
}
3836

3937
/**
38+
* Get title formatted in HTML
39+
*
4040
* @return string
4141
*/
4242
public function getBasicChildrenHtml()

app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Admin tax class product toolbar
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
1311

@@ -50,7 +48,7 @@ public function __construct(
5048
}
5149

5250
/**
53-
* {$@inheritdoc}
51+
* @inheritDoc
5452
*/
5553
public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
5654
{
@@ -59,7 +57,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
5957
}
6058

6159
/**
62-
* {$@inheritdoc}
60+
* @inheritDoc
6361
*/
6462
public function removeButton($buttonId)
6563
{
@@ -68,6 +66,8 @@ public function removeButton($buttonId)
6866
}
6967

7068
/**
69+
* Prepare the layout
70+
*
7171
* @return $this
7272
*/
7373
protected function _prepareLayout()
@@ -86,7 +86,7 @@ protected function _prepareLayout()
8686
}
8787

8888
/**
89-
* {$@inheritdoc}
89+
* @inheritDoc
9090
*/
9191
public function updateButton($buttonId, $key, $data)
9292
{
@@ -95,7 +95,7 @@ public function updateButton($buttonId, $key, $data)
9595
}
9696

9797
/**
98-
* {$@inheritdoc}
98+
* @inheritDoc
9999
*/
100100
public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
101101
{

app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Admin tax rate save toolbar
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
1311

app/code/Magento/Tax/Block/Adminhtml/Rule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Admin tax rule content block
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Block\Adminhtml;
1311

@@ -18,6 +16,8 @@
1816
class Rule extends \Magento\Backend\Block\Widget\Grid\Container
1917
{
2018
/**
19+
* Initialise the block
20+
*
2121
* @return void
2222
*/
2323
protected function _construct()

app/code/Magento/Tax/Block/Item/Price/Renderer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* Item price render block
1919
*
2020
* @api
21-
* @author Magento Core Team <core@magentocommerce.com>
2221
* @since 100.0.2
2322
*/
2423
class Renderer extends \Magento\Framework\View\Element\Template
@@ -106,6 +105,8 @@ public function setZone($zone)
106105
}
107106

108107
/**
108+
* Return the store ID
109+
*
109110
* @return int|null|string
110111
*/
111112
public function getStoreId()
@@ -201,8 +202,7 @@ public function formatPrice($price)
201202
}
202203

203204
/**
204-
* Get item price in display currency or order currency depending
205-
* on item type
205+
* Get item price in display currency or order currency depending on item type
206206
*
207207
* @return float
208208
*/

app/code/Magento/Tax/Controller/Adminhtml/Rate.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Adminhtml tax rate controller
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
abstract class Rate extends \Magento\Backend\App\Action
1715
{

app/code/Magento/Tax/Controller/Adminhtml/Rule.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Tax rule controller
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Tax\Controller\Adminhtml;
1311

@@ -21,11 +19,9 @@ abstract class Rule extends \Magento\Backend\App\Action
2119
*
2220
* @see _isAllowed()
2321
*/
24-
const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
22+
public const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
2523

2624
/**
27-
* Core registry
28-
*
2925
* @var \Magento\Framework\Registry
3026
*/
3127
protected $_coreRegistry = null;

0 commit comments

Comments
 (0)