EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix configurator email not being sent due to missing config

Browse Source
This commit is contained in:
Björn Fromme
2018-09-20 15:33:28 +02:00
parent 237f0cea92
commit b329ded8a9
6 changed files with 104 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/typo3conf/ext/ep_events/Classes/Controller/AjaxFormController.php
+13 -4
View File
@@ -28,6 +28,7 @@ namespace EP\EpEvents\Controller;
***************************************************************/
use EP\EpEvents\Domain\Model\Inquiry;
use EP\EpEvents\Service\ConfigurationService;
use EP\EpEvents\Service\EmailService;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
@@ -41,11 +42,16 @@ class AjaxFormController extends ActionController
protected $emailService;
/**
* @param EmailService $service
* @var ConfigurationService
*/
public function injectEmailService(EmailService $service)
protected $configurationService;
public function __construct(EmailService $emailService, ConfigurationService $configurationService)
{
$this->emailService = $service;
parent::__construct();
$this->emailService = $emailService;
$this->configurationService = $configurationService;
}
/**
@@ -79,7 +85,10 @@ class AjaxFormController extends ActionController
'toName' => $this->settings['inquiryToName'],
'subject' => 'Anfrage E&P Events',
'templateName' => 'Email/Configurator',
'variables' => [ 'inquiry' => $inquiry ]
'variables' => [
'inquiry' => $inquiry,
'config' => $this->configurationService->getConfiguratorConfig(),
]
]);
return json_encode($response);
}
web/typo3conf/ext/ep_events/Classes/Controller/FormController.php
+18 -40
View File
@@ -28,12 +28,27 @@ namespace EP\EpEvents\Controller;
***************************************************************/
use EP\EpEvents\Domain\Model\Inquiry;
use EP\EpEvents\Service\ConfigurationService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility;
class FormController extends ActionController
{
/**
* @var ConfigurationService
*/
protected $configurationService;
/**
* @param ConfigurationService $configurationService
*/
public function __construct(ConfigurationService $configurationService)
{
parent::__construct();
$this->configurationService = $configurationService;
}
public function inquiryFormAction()
{
$inquiry = $this->getInquiryFromContext();
@@ -63,7 +78,7 @@ class FormController extends ActionController
} else {
$inquiry = $this->getInquiryFromContext();
}
$this->view->assign('configuratorConfig', $this->getConfiguratorConfig());
$this->view->assign('configuratorConfig', $this->configurationService->getConfiguratorConfig());
$this->view->assign('inquiry', $inquiry);
}
@@ -78,7 +93,7 @@ class FormController extends ActionController
$offer = $content['offer'];
$inquiry = Inquiry::fromOffer($offer, $defaults);
} elseif (isset($content['travelType'])) {
$config = $this->getConfiguratorConfig();
$config = $this->configurationService->getConfiguratorConfig();
/** @var \EP\EpEvents\Domain\Model\Traveltype $travelType */
$travelType = $content['travelType'];
$configuratorType = $travelType->getConfiguratorType();
@@ -113,41 +128,4 @@ class FormController extends ActionController
;
}
/**
* @return array
*/
protected function getConfiguratorConfig()
{
/** @var ConfigurationUtility $configUtility */
$configUtility = $this->objectManager->get(ConfigurationUtility::class);
$extensionConfig = $configUtility->getCurrentConfiguration('ep_events');
return [
'budgetOptions' => $this->parseConfigItem($extensionConfig, 'configuratorBudgetOptions'),
'paxOptions' => $this->parseConfigItem($extensionConfig, 'configuratorPaxOptions'),
'periodOptions' => $this->parseConfigItem($extensionConfig, 'configuratorPeriodOptions'),
'travelTypeOptions' => $this->parseConfigItem($extensionConfig, 'configuratorTravelTypeOptions'),
'locationTypeOptions' => $this->parseConfigItem($extensionConfig, 'configuratorLocationTypeOptions'),
'accommodationTypeOptions' => $this->parseConfigItem($extensionConfig, 'configuratorAccommodationTypeOptions'),
'programmeTypeOptions' => $this->parseConfigItem($extensionConfig, 'configuratorProgrammeTypeOptions'),
'distanceOptions' => $this->parseConfigItem($extensionConfig, 'configuratorDistanceOptions'),
];
}
/**
* @param array $configArray
* @param string $itemName
* @return array
*/
protected function parseConfigItem($configArray, $itemName)
{
$config = [];
foreach (explode(';', $configArray[$itemName]['value']) as $item)
{
list ($value, $label) = explode(':', $item);
$config[$value] = $label;
}
return $config;
}
}