Skip to content

Commit 15b1b30

Browse files
author
Sergey Kovalenko
committed
MAGETWO-56941: CLONE - CLONE - [Github] Allowed countries for customer address in admin using storeview configuration #2946
1 parent ce8afcf commit 15b1b30

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

app/code/Magento/Customer/Test/Unit/Model/CountryHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Magento\Store\Model\ScopeInterface;
1616
use Magento\Store\Model\StoreManagerInterface;
1717

18-
class CountryHandlerInterfaceTest extends \PHPUnit_Framework_TestCase
18+
class CountryHandlerTest extends \PHPUnit_Framework_TestCase
1919
{
2020
/**
2121
* @var \PHPUnit_Framework_MockObject_MockObject | ScopeConfigInterface

app/code/Magento/Ui/view/base/web/js/form/element/country.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ define([
3232
}
3333

3434
this._super(value, field);
35-
36-
result = _.filter(this.initialOptions, function (item) {
35+
result = _.filter(this.initialOptions, function (item) {
3736

3837
if (item[field]) {
3938
return ~item[field].indexOf(value);

app/code/Magento/Ui/view/base/web/js/form/element/website.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ define([
2222
*/
2323
initialize: function () {
2424
this._super();
25-
26-
if (this.customerId || this.isGlobalScope) {//disable element if customer exists
25+
26+
if (this.customerId || this.isGlobalScope) {
2727
this.disable(true);
2828
}
2929

0 commit comments

Comments
 (0)