diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php index 5e2e92e1c933e..3622829f53f0c 100644 --- a/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php +++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php @@ -41,9 +41,13 @@ public function prepareDataSource(array $dataSource) { if (isset($dataSource['data']['items'])) { foreach ($dataSource['data']['items'] as & $item) { - $lockExpires = new \DateTime($item['lock_expires']); - if ($lockExpires > new \DateTime()) { - $item['lock_expires'] = __('Locked'); + if (array_key_exists('lock_expires', $item)) { + $lockExpires = new \DateTime($item['lock_expires']); + if ($lockExpires > new \DateTime()) { + $item['lock_expires'] = __('Locked'); + } else { + $item['lock_expires'] = __('Unlocked'); + } } else { $item['lock_expires'] = __('Unlocked'); }