-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
44 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Composer; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Module; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Block\Adminhtml; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Controller\Adminhtml\Validateconfig; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Helper; | ||
|
@@ -24,7 +24,7 @@ class Data extends AbstractHelper | |
protected $testConfig = []; | ||
|
||
/** | ||
* @param null $key | ||
* @param $key null|string | ||
* @return array|mixed|string | ||
*/ | ||
public function getTestConfig($key = null) | ||
|
@@ -39,7 +39,7 @@ public function getTestConfig($key = null) | |
} | ||
|
||
/** | ||
* @param null $fields | ||
* @param $fields | ||
* @return $this | ||
*/ | ||
public function setTestConfig($fields) | ||
|
@@ -49,7 +49,7 @@ public function setTestConfig($fields) | |
} | ||
|
||
/** | ||
* @param null $store_id | ||
* @param $store_id int|null | ||
* @return bool | ||
*/ | ||
public function isActive($store_id = null) | ||
|
@@ -67,8 +67,7 @@ public function isActive($store_id = null) | |
|
||
/** | ||
* Get local client name | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigName($store_id = null) | ||
|
@@ -78,8 +77,7 @@ public function getConfigName($store_id = null) | |
|
||
/** | ||
* Get system config password | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigPassword($store_id = null) | ||
|
@@ -89,8 +87,7 @@ public function getConfigPassword($store_id = null) | |
|
||
/** | ||
* Get system config username | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigUsername($store_id = null) | ||
|
@@ -100,8 +97,7 @@ public function getConfigUsername($store_id = null) | |
|
||
/** | ||
* Get system config auth | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigAuth($store_id = null) | ||
|
@@ -111,8 +107,7 @@ public function getConfigAuth($store_id = null) | |
|
||
/** | ||
* Get system config ssl | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigSsl($store_id = null) | ||
|
@@ -122,8 +117,7 @@ public function getConfigSsl($store_id = null) | |
|
||
/** | ||
* Get system config host | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigSmtpHost($store_id = null) | ||
|
@@ -133,8 +127,7 @@ public function getConfigSmtpHost($store_id = null) | |
|
||
/** | ||
* Get system config port | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigSmtpPort($store_id = null) | ||
|
@@ -144,8 +137,7 @@ public function getConfigSmtpPort($store_id = null) | |
|
||
/** | ||
* Get system config reply to | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return bool | ||
*/ | ||
public function getConfigSetReplyTo($store_id = null) | ||
|
@@ -159,8 +151,7 @@ public function getConfigSetReplyTo($store_id = null) | |
|
||
/** | ||
* Get system config set return path | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return int | ||
*/ | ||
public function getConfigSetReturnPath($store_id = null) | ||
|
@@ -170,8 +161,7 @@ public function getConfigSetReturnPath($store_id = null) | |
|
||
/** | ||
* Get system config return path email | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigReturnPathEmail($store_id = null) | ||
|
@@ -181,8 +171,7 @@ public function getConfigReturnPathEmail($store_id = null) | |
|
||
/** | ||
* Get system config from | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigSetFrom($store_id = null) | ||
|
@@ -192,8 +181,7 @@ public function getConfigSetFrom($store_id = null) | |
|
||
/** | ||
* Get system config from | ||
* | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigCustomFromEmail($store_id = null) | ||
|
@@ -203,9 +191,8 @@ public function getConfigCustomFromEmail($store_id = null) | |
|
||
/** | ||
* Get system config | ||
* | ||
* @param String path | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return string | ||
*/ | ||
public function getConfigValue($path, $store_id = null) | ||
|
@@ -224,7 +211,7 @@ public function getConfigValue($path, $store_id = null) | |
|
||
/** | ||
* @param String path | ||
* @param ScopeInterface::SCOPE_STORE $store | ||
* @param $store_id int|null | ||
* @return mixed | ||
*/ | ||
public function getScopeConfigValue($path, $store_id = null) | ||
|
@@ -251,7 +238,7 @@ public function getStoreId() | |
} | ||
|
||
/** | ||
* @param int/null $storeId | ||
* @param $store_id int|null | ||
*/ | ||
public function setStoreId($storeId = null) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Mail; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
namespace MagePal\CustomSmtp\Model\Config\Source; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Model; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Model; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
namespace MagePal\CustomSmtp\Plugin\Mail\Template; | ||
|
||
|
@@ -20,7 +20,6 @@ class TransportBuilderByStorePlugin | |
|
||
/** | ||
* Sender resolver. | ||
* | ||
* @var SenderResolverInterface | ||
*/ | ||
private $senderResolver; | ||
|
@@ -38,9 +37,10 @@ public function __construct( | |
} | ||
|
||
/** | ||
* Set the sender email address based on the store context | ||
* @param TransportBuilderByStore $subject | ||
* @param $from | ||
* @param $store | ||
* @param $from string | ||
* @param $store int|null | ||
* @return array | ||
* @throws MailException | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Plugin\Mail\Template; | ||
|
@@ -12,7 +12,6 @@ | |
|
||
class TransportBuilderPlugin | ||
{ | ||
|
||
/** @var Store */ | ||
protected $storeModel; | ||
|
||
|
@@ -26,6 +25,7 @@ public function __construct( | |
} | ||
|
||
/** | ||
* Plugin to set the store ID in template options. | ||
* @param TransportBuilder $subject | ||
* @param $templateOptions | ||
* @return array | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
|
||
namespace MagePal\CustomSmtp\Plugin\Mail; | ||
|
@@ -31,11 +31,12 @@ class TransportPlugin | |
/** | ||
* @var Smtp | ||
*/ | ||
private SmtpFactory $smtpFactory; | ||
private $smtpFactory; | ||
|
||
/** | ||
* @param Data $dataHelper | ||
* @param Store $storeModel | ||
* @param SmtpFactory $smtpFactory | ||
*/ | ||
public function __construct( | ||
Data $dataHelper, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<?xml version="1.0" ?> | ||
<?xml version="1.0"?> | ||
<!-- | ||
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
--> | ||
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
--> | ||
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
--> | ||
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
--> | ||
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/** | ||
* Copyright © MagePal LLC. All rights reserved. | ||
* See COPYING.txt for license details. | ||
* http://www.magepal.com | [email protected] | ||
* https://www.magepal.com | [email protected] | ||
*/ | ||
?> | ||
|
||
|
Oops, something went wrong.