Skip to content
This repository has been archived by the owner on Mar 9, 2023. It is now read-only.

Commit

Permalink
Merge pull request #12 from mageplaza/2.4-develop
Browse files Browse the repository at this point in the history
2.4 develop
  • Loading branch information
Shinichi69 authored Mar 23, 2021
2 parents d4d3296 + 1a0a69b commit 7d962d0
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Model/ResourceModel/Log.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ class Log extends AbstractDb
*/
protected function _construct()
{
$this->_init('mp_login_as_customer', 'log_id');
$this->_init('mageplaza_login_as_customer', 'log_id');
}
}
3 changes: 2 additions & 1 deletion Ui/Component/Listing/Columns/Customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public function prepareDataSource(array $dataSource)

$customer = $this->customerRepository->getById($customerId);
if ($customer && $customer->getId()) {
$item['customer_id'] = $customer->getFirstname() . ' ' . $customer->getLastname() . ' <' . $customer->getEmail() . '>';
$item['customer_id'] = $customer->getFirstname() . ' ' .
$customer->getLastname() . ' <' . $customer->getEmail() . '>';
} else {
$item['customer_id'] = $item['customer_name'] . ' <' . $item['customer_email'] . '>';
}
Expand Down
52 changes: 26 additions & 26 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"name": "mageplaza/module-login-as-customer",
"description": "Magento 2 Login As Customer Extension",
"require": {
"mageplaza/module-core": "^1.4.5"
},
"type": "magento2-module",
"version": "1.0.3",
"license": "proprietary",
"authors": [
{
"name": "Mageplaza",
"email": "support@mageplaza.com",
"homepage": "https://www.mageplaza.com",
"role": "Technical Support"
}
],
"autoload": {
"files": [
"registration.php"
],
"psr-4": {
"Mageplaza\\LoginAsCustomer\\": ""
}
}
}
{
"name": "mageplaza/module-login-as-customer",
"description": "Magento 2 Login As Customer Extension",
"require": {
"mageplaza/module-core": "^1.4.5"
},
"type": "magento2-module",
"version": "4.0.0",
"license": "proprietary",
"authors": [
{
"name": "Mageplaza",
"email": "support@mageplaza.com",
"homepage": "https://www.mageplaza.com",
"role": "Technical Support"
}
],
"autoload": {
"files": [
"registration.php"
],
"psr-4": {
"Mageplaza\\LoginAsCustomer\\": ""
}
}
}
2 changes: 1 addition & 1 deletion etc/db_schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
-->
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
<table name="mp_login_as_customer" resource="default" engine="innodb" comment="Login As Customer Logs table">
<table name="mageplaza_login_as_customer" resource="default" engine="innodb" comment="Login As Customer Logs table">
<column xsi:type="int" name="log_id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
<column xsi:type="int" name="admin_id" padding="10" unsigned="true" nullable="false" default="0" comment="Admin ID"/>
<column xsi:type="varchar" name="admin_email" length="255" comment="Admin Email"/>
Expand Down
2 changes: 1 addition & 1 deletion etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</type>
<virtualType name="Mageplaza\LoginAsCustomer\Model\ResourceModel\Log\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
<arguments>
<argument name="mainTable" xsi:type="string">mp_login_as_customer</argument>
<argument name="mainTable" xsi:type="string">mageplaza_login_as_customer</argument>
<argument name="resourceModel" xsi:type="string">Mageplaza\LoginAsCustomer\Model\ResourceModel\Log</argument>
</arguments>
</virtualType>
Expand Down

0 comments on commit 7d962d0

Please sign in to comment.