Skip to content

Commit e7e1539

Browse files
committed
Merge remote-tracking branch 'origin/AC-8440' into spartans_pr_29082025
2 parents 37acc55 + f106dee commit e7e1539

File tree

1 file changed

+39
-3
lines changed
  • app/code/Magento/Tax/view/adminhtml/templates/rate

1 file changed

+39
-3
lines changed

app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/** @var \Magento\Tax\Block\Adminhtml\Rate\Form $tmpBlock */
@@ -17,13 +17,49 @@ require([
1717
"mage/adminhtml/form"
1818
], function(jQuery){
1919
20-
var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', {$regionJson}, 'disable');
20+
var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', {$regionJson}, 'disable', true);
2121
updater.disableRegionValidation();
2222
2323
(function ($) {
2424
$(document).ready(function () {
2525
'use strict';
2626
27+
function enforceWildcard() {
28+
var country = $('#tax_country_id').val(),
29+
selectEl = document.getElementById('tax_region_id'),
30+
textEl = document.getElementById('tax_region'),
31+
hasRegions = !!(window.updater && window.updater.sortedRegions &&
32+
window.updater.sortedRegions[country] &&
33+
window.updater.sortedRegions[country].length);
34+
35+
if (!hasRegions && selectEl) {
36+
var hasWildcard = false, i;
37+
38+
for (i = 0; i < selectEl.options.length; i++) {
39+
if (selectEl.options[i].value === '*') { hasWildcard = true; break; }
40+
}
41+
if (!hasWildcard) {
42+
var opt = document.createElement('option');
43+
opt.value = '*';
44+
opt.text = '*';
45+
opt.title = '*';
46+
try {
47+
selectEl.options.add(opt, 1);
48+
} catch (e)
49+
{
50+
selectEl.insertBefore(opt, selectEl.options[1] || null);
51+
}
52+
}
53+
selectEl.value = '*';
54+
selectEl.disabled = true; // keep disable mode
55+
}
56+
if (!hasRegions && textEl) {
57+
textEl.value = '*';
58+
}
59+
}
60+
$('#tax_country_id').on('change', function () { setTimeout(enforceWildcard, 0); });
61+
setTimeout(enforceWildcard, 0);
62+
2763
var zipIsRange = $('#zip_is_range')
2864
.on('change.zipRange', function(){
2965
var elem = $(this),

0 commit comments

Comments
 (0)