Skip to content

[Forwardport] Fix currency symbol setting back to default #17567 #18204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2018
Merged

[Forwardport] Fix currency symbol setting back to default #17567 #18204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ public function getCurrencySymbolsData()
*/
public function setCurrencySymbolsData($symbols = [])
{
foreach ($this->getCurrencySymbolsData() as $code => $values) {
if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
unset($symbols[$code]);
if (!$this->_storeManager->isSingleStoreMode()) {
foreach ($this->getCurrencySymbolsData() as $code => $values) {
if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
unset($symbols[$code]);
}
}
}
$value = [];
Expand Down
19 changes: 10 additions & 9 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
</label>
<div class="admin__field-control">
<input id="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>"
class="required-entry admin__control-text"
class="required-entry admin__control-text <?= $data['inherited'] ? 'disabled' : '' ?>"
type="text"
value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
<?= $data['inherited'] ? ' disabled="disabled"' : '' ?>
name="custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
<div class="admin__field admin__field-option">
<input id="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"
Expand All @@ -49,16 +48,18 @@ require(['jquery', "mage/mage", 'prototype'], function(jQuery){

function toggleUseDefault(code, value)
{
checkbox = $('custom_currency_symbol_inherit'+code);
input = $('custom_currency_symbol'+code);
if (checkbox.checked) {
input.value = value;
input.disabled = true;
checkbox = jQuery('#custom_currency_symbol_inherit'+code);
input = jQuery('#custom_currency_symbol'+code);

if (checkbox.is(':checked')) {
input.addClass('disabled');
input.val(value);
input.prop('readonly', true);
} else {
input.disabled = false;
input.removeClass('disabled');
input.prop('readonly', false);
}
}

window.toggleUseDefault = toggleUseDefault;
});
</script>
7 changes: 7 additions & 0 deletions app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@
.admin__control-text,
.admin__control-textarea {
width: 100%;
&.disabled {
background-color: #e9e9e9;
border-color: #adadad;
color: #303030;
cursor: not-allowed;
opacity: .5;
}
}
}

Expand Down