Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PT-1377: Confirmation Emails are not sent and Admin cannot log after … #107

Merged
merged 1 commit into from
Apr 18, 2024
Merged

PT-1377: Confirmation Emails are not sent and Admin cannot log after … #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Plugin/AddTemplateVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class AddTemplateVariable
private ScopeConfigInterface $scopeConfig;

/**
* @param MonduLogger $monduLogger
* @param MonduFileLogger $monduFileLogger
* @param ScopeConfigInterface $scopeConfig
* @param MonduLogger $monduLogger
* @param MonduFileLogger $monduFileLogger
* @param ScopeConfigInterface $scopeConfig
*/
public function __construct(
MonduLogger $monduLogger,
Expand All @@ -53,16 +53,19 @@ public function __construct(
}

/**
* @param \Magento\Email\Model\Template $subject
* @param array $vars
* @param \Magento\Email\Model\Template $subject
* @param array $vars
*
* @return array[]
*/
public function beforeSetVars(
\Magento\Email\Model\Template $subject,
array $vars
) {
if (!$vars['order'] || !$vars['order']->getMonduReferenceId()) {
if (
!isset($vars['order']) ||
!$vars['order']->getMonduReferenceId()
) {
return [$vars];
}

Expand Down Expand Up @@ -102,7 +105,7 @@ public function beforeSetVars(
}

/**
* @param $invoiceDetails
* @param $invoiceData
*
* @return string
*/
Expand Down Expand Up @@ -132,7 +135,7 @@ protected function getInvoiceDetails($invoiceData): string
*
* @return string
*/
protected function getPayLaterViaBankTransferDetails($invoiceData)
protected function getPayLaterViaBankTransferDetails($invoiceData): string
{
$invoiceDetails = __('This invoice is created in accordance with the terms and conditions of <strong>%1</strong> modified by <strong>Mondu GmbH</strong> payment terms. Please pay to the following account:', $invoiceData['merchant_company_name']) . '<br/>';

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "mondu_gmbh/magento2-payment",
"description": "Mondu payment method for magento 2",
"type": "magento2-module",
"version": "2.3.5",
"version": "2.3.6",
"license": [
"MIT"
],
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Mondu_Mondu" setup_version="2.3.4">
<module name="Mondu_Mondu" setup_version="2.3.6">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Payment"/>
Expand Down
Loading