Skip to content

Commit e075022

Browse files
edenduongedenduong
committed
Resolve New Order not sending if a comma is followed by a blank space in the 'Send Order Email Copy To' field issue25072
1 parent 0dcb19e commit e075022

16 files changed

+259
-8
lines changed

‎app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Sales\Model\Order\Email\Container;
79

10+
/**
11+
* Class \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity
12+
*/
813
class CreditmemoCommentIdentity extends Container implements IdentityInterface
914
{
15+
/**
16+
* Configuration paths
17+
*/
1018
const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/creditmemo_comment/copy_method';
1119
const XML_PATH_EMAIL_COPY_TO = 'sales_email/creditmemo_comment/copy_to';
1220
const XML_PATH_EMAIL_IDENTITY = 'sales_email/creditmemo_comment/identity';
@@ -15,6 +23,8 @@ class CreditmemoCommentIdentity extends Container implements IdentityInterface
1523
const XML_PATH_EMAIL_ENABLED = 'sales_email/creditmemo_comment/enabled';
1624

1725
/**
26+
* Is email enabled
27+
*
1828
* @return bool
1929
*/
2030
public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
2737
}
2838

2939
/**
40+
* Return email copy_to list
41+
*
3042
* @return array|bool
3143
*/
3244
public function getEmailCopyTo()
3345
{
3446
$data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
3547
if (!empty($data)) {
36-
return explode(',', $data);
48+
return array_map('trim', explode(',', $data));
3749
}
3850
return false;
3951
}
4052

4153
/**
54+
* Return email copy method
55+
*
4256
* @return mixed
4357
*/
4458
public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
4761
}
4862

4963
/**
64+
* Return guest template id
65+
*
5066
* @return mixed
5167
*/
5268
public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
5571
}
5672

5773
/**
74+
* Return template id
75+
*
5876
* @return mixed
5977
*/
6078
public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
6381
}
6482

6583
/**
84+
* Return email identity
85+
*
6686
* @return mixed
6787
*/
6888
public function getEmailIdentity()

‎app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Sales\Model\Order\Email\Container;
79

10+
/**
11+
* Class \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity
12+
*/
813
class CreditmemoIdentity extends Container implements IdentityInterface
914
{
15+
/**
16+
* Configuration paths
17+
*/
1018
const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/creditmemo/copy_method';
1119
const XML_PATH_EMAIL_COPY_TO = 'sales_email/creditmemo/copy_to';
1220
const XML_PATH_EMAIL_IDENTITY = 'sales_email/creditmemo/identity';
@@ -15,6 +23,8 @@ class CreditmemoIdentity extends Container implements IdentityInterface
1523
const XML_PATH_EMAIL_ENABLED = 'sales_email/creditmemo/enabled';
1624

1725
/**
26+
* Is email enabled
27+
*
1828
* @return bool
1929
*/
2030
public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
2737
}
2838

2939
/**
40+
* Return email copy_to list
41+
*
3042
* @return array|bool
3143
*/
3244
public function getEmailCopyTo()
3345
{
3446
$data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
3547
if (!empty($data)) {
36-
return explode(',', $data);
48+
return array_map('trim', explode(',', $data));
3749
}
3850
return false;
3951
}
4052

4153
/**
54+
* Return email copy method
55+
*
4256
* @return mixed
4357
*/
4458
public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
4761
}
4862

4963
/**
64+
* Return guest template id
65+
*
5066
* @return mixed
5167
*/
5268
public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
5571
}
5672

5773
/**
74+
* Return template id
75+
*
5876
* @return mixed
5977
*/
6078
public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
6381
}
6482

6583
/**
84+
* Return email identity
85+
*
6686
* @return mixed
6787
*/
6888
public function getEmailIdentity()

‎app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Sales\Model\Order\Email\Container;
79

10+
/**
11+
* Class \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity
12+
*/
813
class InvoiceCommentIdentity extends Container implements IdentityInterface
914
{
15+
/**
16+
* Configuration paths
17+
*/
1018
const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/invoice_comment/copy_method';
1119
const XML_PATH_EMAIL_COPY_TO = 'sales_email/invoice_comment/copy_to';
1220
const XML_PATH_EMAIL_GUEST_TEMPLATE = 'sales_email/invoice_comment/guest_template';
@@ -15,6 +23,8 @@ class InvoiceCommentIdentity extends Container implements IdentityInterface
1523
const XML_PATH_EMAIL_ENABLED = 'sales_email/invoice_comment/enabled';
1624

1725
/**
26+
* Is email enabled
27+
*
1828
* @return bool
1929
*/
2030
public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
2737
}
2838

2939
/**
40+
* Return email copy_to list
41+
*
3042
* @return array|bool
3143
*/
3244
public function getEmailCopyTo()
3345
{
3446
$data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
3547
if (!empty($data)) {
36-
return explode(',', $data);
48+
return array_map('trim', explode(',', $data));
3749
}
3850
return false;
3951
}
4052

4153
/**
54+
* Return email copy method
55+
*
4256
* @return mixed
4357
*/
4458
public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
4761
}
4862

4963
/**
64+
* Return guest template id
65+
*
5066
* @return mixed
5167
*/
5268
public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
5571
}
5672

5773
/**
74+
* Return template id
75+
*
5876
* @return mixed
5977
*/
6078
public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
6381
}
6482

6583
/**
84+
* Return email identity
85+
*
6686
* @return mixed
6787
*/
6888
public function getEmailIdentity()

‎app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Sales\Model\Order\Email\Container;
79

10+
/**
11+
* Class \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity
12+
*/
813
class InvoiceIdentity extends Container implements IdentityInterface
914
{
15+
/**
16+
* Configuration paths
17+
*/
1018
const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/invoice/copy_method';
1119
const XML_PATH_EMAIL_COPY_TO = 'sales_email/invoice/copy_to';
1220
const XML_PATH_EMAIL_IDENTITY = 'sales_email/invoice/identity';
@@ -15,6 +23,8 @@ class InvoiceIdentity extends Container implements IdentityInterface
1523
const XML_PATH_EMAIL_ENABLED = 'sales_email/invoice/enabled';
1624

1725
/**
26+
* Is email enabled
27+
*
1828
* @return bool
1929
*/
2030
public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
2737
}
2838

2939
/**
40+
* Return email copy_to list
41+
*
3042
* @return array|bool
3143
*/
3244
public function getEmailCopyTo()
3345
{
3446
$data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
3547
if (!empty($data)) {
36-
return explode(',', $data);
48+
return array_map('trim', explode(',', $data));
3749
}
3850
return false;
3951
}
4052

4153
/**
54+
* Return email copy method
55+
*
4256
* @return mixed
4357
*/
4458
public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
4761
}
4862

4963
/**
64+
* Return guest template id
65+
*
5066
* @return mixed
5167
*/
5268
public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
5571
}
5672

5773
/**
74+
* Return template id
75+
*
5876
* @return mixed
5977
*/
6078
public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
6381
}
6482

6583
/**
84+
* Return email identity
85+
*
6686
* @return mixed
6787
*/
6888
public function getEmailIdentity()

‎app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Sales\Model\Order\Email\Container;
79

10+
/**
11+
* Class \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity
12+
*/
813
class OrderCommentIdentity extends Container implements IdentityInterface
914
{
15+
/**
16+
* Configuration paths
17+
*/
1018
const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/order_comment/copy_method';
1119
const XML_PATH_EMAIL_COPY_TO = 'sales_email/order_comment/copy_to';
1220
const XML_PATH_EMAIL_GUEST_TEMPLATE = 'sales_email/order_comment/guest_template';
@@ -15,6 +23,8 @@ class OrderCommentIdentity extends Container implements IdentityInterface
1523
const XML_PATH_EMAIL_ENABLED = 'sales_email/order_comment/enabled';
1624

1725
/**
26+
* Is email enabled
27+
*
1828
* @return bool
1929
*/
2030
public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
2737
}
2838

2939
/**
40+
* Return email copy_to list
41+
*
3042
* @return array|bool
3143
*/
3244
public function getEmailCopyTo()
3345
{
3446
$data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
3547
if (!empty($data)) {
36-
return explode(',', $data);
48+
return array_map('trim', explode(',', $data));
3749
}
3850
return false;
3951
}
4052

4153
/**
54+
* Return email copy method
55+
*
4256
* @return mixed
4357
*/
4458
public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
4761
}
4862

4963
/**
64+
* Return guest template id
65+
*
5066
* @return mixed
5167
*/
5268
public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
5571
}
5672

5773
/**
74+
* Return template id
75+
*
5876
* @return mixed
5977
*/
6078
public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
6381
}
6482

6583
/**
84+
* Return email identity
85+
*
6686
* @return mixed
6787
*/
6888
public function getEmailIdentity()

0 commit comments

Comments
 (0)