File tree Expand file tree Collapse file tree 5 files changed +8
-5
lines changed
app/code/Magento/Customer
Controller/Adminhtml/System/Config Expand file tree Collapse file tree 5 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -166,6 +166,7 @@ public function getAdditionalAddresses()
166
166
try {
167
167
$ addresses = $ this ->addressesGrid ->getAdditionalAddresses ();
168
168
} catch (\Magento \Framework \Exception \NoSuchEntityException $ e ) {
169
+ return false ;
169
170
}
170
171
return empty ($ addresses ) ? false : $ addresses ;
171
172
}
@@ -197,6 +198,7 @@ public function getCustomer()
197
198
try {
198
199
$ customer = $ this ->currentCustomer ->getCustomer ();
199
200
} catch (\Magento \Framework \Exception \NoSuchEntityException $ e ) {
201
+ return null ;
200
202
}
201
203
return $ customer ;
202
204
}
Original file line number Diff line number Diff line change 4
4
* See COPYING.txt for license details.
5
5
*/
6
6
7
+ namespace Magento \Customer \Block \Adminhtml \Form \Element ;
8
+
7
9
/**
8
10
* Customer Widget Form Boolean Element Block
9
11
*/
10
- namespace Magento \Customer \Block \Adminhtml \Form \Element ;
11
-
12
12
class Boolean extends \Magento \Framework \Data \Form \Element \Select
13
13
{
14
14
/**
15
15
* Prepare default SELECT values
16
+ *
16
17
* @return void
17
18
*/
18
19
protected function _construct ()
Original file line number Diff line number Diff line change @@ -16,8 +16,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
16
16
protected $ _assetRepo ;
17
17
18
18
/**
19
- * Adminhtml data
20
- *
21
19
* @var \Magento\Backend\Helper\Data
22
20
*/
23
21
protected $ _adminhtmlData = null ;
Original file line number Diff line number Diff line change @@ -32,6 +32,8 @@ public function __construct(
32
32
}
33
33
34
34
/**
35
+ * Return options
36
+ *
35
37
* @return array
36
38
*/
37
39
protected function _getOptions ()
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ abstract class Validatevat extends \Magento\Backend\App\Action
15
15
*
16
16
* @see _isAllowed()
17
17
*/
18
- const ADMIN_RESOURCE = 'Magento_Customer::manage ' ;
18
+ public const ADMIN_RESOURCE = 'Magento_Customer::manage ' ;
19
19
20
20
/**
21
21
* Perform customer VAT ID validation
You can’t perform that action at this time.
0 commit comments