Skip to content

Commit 7aa5fb1

Browse files
authored
Merge pull request #7368 from magento-trigger/ph-delivery-1
[Platform Health] PHP8.1 Updates
2 parents 26324de + 20cc1ad commit 7aa5fb1

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

app/code/Magento/SendFriend/Model/SendFriend.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
7272
protected $_lastCookieValue = [];
7373

7474
/**
75-
* SendFriend data
75+
* Send friend data helper
7676
*
7777
* @var \Magento\SendFriend\Helper\Data
7878
*/
7979
protected $_sendfriendData = null;
8080

8181
/**
82-
* Catalog image
82+
* Catalog image helper
8383
*
8484
* @var \Magento\Catalog\Helper\Image
8585
*/
@@ -161,9 +161,8 @@ public function __construct(
161161
$this->remoteAddress = $remoteAddress;
162162
$this->cookieManager = $cookieManager;
163163
$this->inlineTranslation = $inlineTranslation;
164-
$this->cookieMetadataFactory = $cookieMetadataFactory ?? ObjectManager::getInstance()->get(
165-
CookieMetadataFactory::class
166-
);
164+
$this->cookieMetadataFactory = $cookieMetadataFactory
165+
?? ObjectManager::getInstance()->get(CookieMetadataFactory::class);
167166
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
168167
}
169168

@@ -201,6 +200,8 @@ public function send()
201200

202201
foreach ($this->getRecipients()->getEmails() as $k => $email) {
203202
$name = $this->getRecipients()->getNames($k);
203+
$product = $this->getProduct();
204+
$productImage = $this->_catalogImage->init($product, 'sendfriend_small_image');
204205
$this->_transportBuilder->setTemplateIdentifier(
205206
$this->_sendfriendData->getEmailTemplate()
206207
)->setTemplateOptions(
@@ -213,19 +214,18 @@ public function send()
213214
)->setReplyTo(
214215
$sender['email'],
215216
$sender['name']
216-
)->setTemplateVars(
217-
[
218-
'name' => $name,
219-
'email' => $email,
220-
'product_name' => $this->getProduct()->getName(),
221-
'product_url' => $this->getProduct()->getUrlInStore(),
222-
'message' => $message,
223-
'sender_name' => $sender['name'],
224-
'sender_email' => $sender['email'],
225-
'product_image' => $this->_catalogImage->init($this->getProduct(), 'sendfriend_small_image')
226-
->getUrl(),
227-
]
228-
)->addTo(
217+
)->setTemplateVars([
218+
'name' => $name,
219+
'email' => $email,
220+
'product_name' => $this->getProduct()->getName(),
221+
'product_url' => $this->getProduct()->getUrlInStore(),
222+
'message' => $message,
223+
'sender_name' => $sender['name'],
224+
'sender_email' => $sender['email'],
225+
'product_image' => $productImage->getType() !== null
226+
? $productImage->getUrl()
227+
: $productImage->getDefaultPlaceholderUrl()
228+
])->addTo(
229229
$email,
230230
$name
231231
);

0 commit comments

Comments
 (0)