Skip to content

Fix undefined variable #1

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

Open
cgsmith wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix undefined variable #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d769ee
Fix undefined variable
Feb 10, 2025
99b6b14
Fix oxideshop requirement
Feb 10, 2025
08058d9
Dynamically declare getRenderer method
ckleinem7 Feb 10, 2025
2d52ed1
Replace getRender method
ckleinem7 Feb 10, 2025
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
15 changes: 5 additions & 10 deletions Core/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

use OxidEsales\Eshop\Core\Registry;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;

class Email extends Email_parent
{

public function sendOrderEmailToOwner($order, $subject = null)
{
$config = Registry::getConfig();
Expand All @@ -44,6 +44,7 @@ public function sendOrderEmailToOwner($order, $subject = null)
// send not pretending from order user, as different email domain rise spam filters

// Original: $this->setFrom($shop->oxshops__oxowneremail->value);
$sFullName = '';
if ($user->oxuser__oxcompany->value) {
$sFullName = $user->oxuser__oxcompany->getRawValue() . ' | ';
}
Expand All @@ -63,7 +64,9 @@ public function sendOrderEmailToOwner($order, $subject = null)
$this->setSmtp($shop);

// create messages
$renderer = $this->getRenderer();
$container = ContainerFactory::getInstance()->getContainer();
$bridge = $container->get(TemplateRendererBridgeInterface::class);
$renderer = $bridge->getTemplateRenderer();
$this->setViewData("order", $order);

// Process view data array through oxoutput processor
Expand Down Expand Up @@ -121,12 +124,4 @@ public function sendContactMail($emailAddress = null, $subject = null, $message
$this->setReplyTo($emailAddress, "");
return $this->send();
}

private function getRenderer()
{
$bridge = $this->getContainer()->get(TemplateRendererBridgeInterface::class);
$bridge->setEngine($this->_getSmarty());

return $bridge->getTemplateRenderer();
}
}
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 @@ -14,7 +14,7 @@
}
},
"require": {
"oxid-esales/oxideshop-ce": ">=6.5 <6.10"
"oxid-esales/oxideshop-ce": "v6.x"
},
"autoload": {
"psr-4": {
Expand Down