File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
LoginAsCustomerAdminUi/Block/Adminhtml
LoginAsCustomerAssistance/view/adminhtml/web/js Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 8
8
namespace Magento \LoginAsCustomerAdminUi \Block \Adminhtml ;
9
9
10
10
use Magento \Backend \Block \Template ;
11
+ use Magento \Framework \App \ObjectManager ;
11
12
use Magento \Framework \Serialize \Serializer \Json ;
12
- use Magento \LoginAsCustomerApi \Api \ConfigInterface ;
13
13
use Magento \LoginAsCustomerAdminUi \Ui \Customer \Component \ConfirmationPopup \Options ;
14
+ use Magento \LoginAsCustomerApi \Api \ConfigInterface ;
14
15
use Magento \Store \Ui \Component \Listing \Column \Store \Options as StoreOptions ;
15
16
16
17
/**
@@ -61,7 +62,7 @@ public function __construct(
61
62
$ this ->storeOptions = $ storeOptions ;
62
63
$ this ->config = $ config ;
63
64
$ this ->json = $ json ;
64
- $ this ->options = $ options ;
65
+ $ this ->options = $ options ?? ObjectManager:: getInstance ()-> get (Options::class) ;
65
66
}
66
67
67
68
/**
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ define([
35
35
modalClass : 'confirm lac-confirm' ,
36
36
buttons : [
37
37
{
38
- text : $t ( 'Cancel ' ) ,
38
+ text : $t ( 'Close ' ) ,
39
39
class : 'action-secondary action-dismiss' ,
40
40
41
41
/**
You can’t perform that action at this time.
0 commit comments