Skip to content

Commit 95eea52

Browse files
#23481: Billing/Shipping Address edit form design update from order backend
- Messages container added to correctly apply margin between message and form - Form wrapper html tag changed from 'fieldset' to 'div' - Added 'admin__fieldset' class to form for standard admin styles to work properly
1 parent e62c675 commit 95eea52

File tree

2 files changed

+8
-5
lines changed
  • app/code/Magento/Sales

2 files changed

+8
-5
lines changed

app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ protected function _prepareForm()
108108
{
109109
parent::_prepareForm();
110110
$this->_form->setId('edit_form');
111+
$this->_form->setClass('admin__fieldset');
111112
$this->_form->setMethod('post');
112113
$this->_form->setAction(
113114
$this->getUrl('sales/*/addressSave', ['address_id' => $this->_getAddress()->getId()])

app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
* See COPYING.txt for license details.
55
*/
66
?>
7-
<div class="message message-notice">
8-
<div class="message-inner">
9-
<div class="message-content"><?= $block->escapeHtml(__('Changing address information will not recalculate shipping, tax or other order amount.')) ?></div>
7+
<div class="messages">
8+
<div class="message message-notice">
9+
<div class="message-inner">
10+
<div class="message-content"><?= $block->escapeHtml(__('Changing address information will not recalculate shipping, tax or other order amount.')) ?></div>
11+
</div>
1012
</div>
1113
</div>
1214

13-
<fieldset class="fieldset admin__fieldset-wrapper">
15+
<div class="fieldset admin__fieldset-wrapper">
1416
<legend class="legend admin__legend">
1517
<span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
1618
</legend>
1719
<br>
1820
<div class="form-inline" data-mage-init='{"Magento_Sales/order/edit/address/form":{}}'>
1921
<?= $block->getForm()->toHtml() ?>
2022
</div>
21-
</fieldset>
23+
</div>

0 commit comments

Comments
 (0)