Skip to content

Commit 268382f

Browse files
#29226: [B2B] Add possibility to use "Login as Customer" functionality for Company Admin.
1 parent 6b1b173 commit 268382f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
namespace Magento\LoginAsCustomerAdminUi\Block\Adminhtml;
99

1010
use Magento\Backend\Block\Template;
11+
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\Serialize\Serializer\Json;
12-
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
1313
use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup\Options;
14+
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
1415
use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
1516

1617
/**
@@ -61,7 +62,7 @@ public function __construct(
6162
$this->storeOptions = $storeOptions;
6263
$this->config = $config;
6364
$this->json = $json;
64-
$this->options = $options;
65+
$this->options = $options ?? ObjectManager::getInstance()->get(Options::class);
6566
}
6667

6768
/**

app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ define([
3535
modalClass: 'confirm lac-confirm',
3636
buttons: [
3737
{
38-
text: $t('Cancel'),
38+
text: $t('Close'),
3939
class: 'action-secondary action-dismiss',
4040

4141
/**

0 commit comments

Comments
 (0)