Skip to content

Commit 327c55c

Browse files
ENGCOM-5128: [Backport] Fixed Issue #22640 #22908
- Merge Pull Request #22908 from maheshWebkul721/magento2:2.2-develop-PR-port-22655 - Merged commits: 1. e5b5bc1 2. ae9fa79 3. a2fc106 4. 6fc7d7a
2 parents 988649e + 6fc7d7a commit 327c55c

File tree

1 file changed

+11
-3
lines changed
  • app/code/Magento/Tax/Block/Adminhtml/Rate

1 file changed

+11
-3
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
use Magento\Tax\Controller\RegistryConstants;
1818

1919
/**
20+
* Tax rate form.
21+
*
2022
* @api
2123
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2224
* @since 100.0.2
@@ -110,7 +112,7 @@ public function __construct(
110112
}
111113

112114
/**
113-
* @return void
115+
* @inheritdoc
114116
*/
115117
protected function _construct()
116118
{
@@ -119,6 +121,8 @@ protected function _construct()
119121
}
120122

121123
/**
124+
* Prepare form before rendering HTML.
125+
*
122126
* @return $this
123127
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
124128
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -132,8 +136,9 @@ protected function _prepareForm()
132136
if ($taxRateId) {
133137
$taxRateDataObject = $this->_taxRateRepository->get($taxRateId);
134138
}
139+
// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
135140
} catch (NoSuchEntityException $e) {
136-
/* tax rate not found */
141+
//tax rate not found//
137142
}
138143

139144
$sessionFormValues = (array)$this->_coreRegistry->registry(RegistryConstants::CURRENT_TAX_RATE_FORM_DATA);
@@ -176,7 +181,10 @@ protected function _prepareForm()
176181
}
177182

178183
$legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
179-
$fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'form-inline']);
184+
$fieldset = $form->addFieldset(
185+
'base_fieldset',
186+
['legend' => $legend, 'class' => 'admin__scope-old form-inline']
187+
);
180188

181189
if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
182190
$fieldset->addField(

0 commit comments

Comments
 (0)