diff --git a/composer.json b/composer.json
index ee2be881..94cb8838 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,7 @@
"helhum/typo3-console": "^5.6",
"league/csv": "^9.2",
"pixelant/pxa-social-feed": "^1.10",
+ "symfony/http-client": "^4.3",
"symfony/options-resolver": "^4.2",
"symfony/property-access": "^4.3",
"symfony/serializer": "^4.2",
diff --git a/composer.lock b/composer.lock
index 8726d27d..73d8904f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "43ff1e099d6b3f1ded82923c05a3e7f8",
+ "content-hash": "65c7db27e084cf03eddd1ddb83812563",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -1173,9 +1173,9 @@
"authors": [
{
"name": "Helmut Hummel",
+ "role": "Developer",
"email": "info@helhum.io",
- "homepage": "http://helhum.io",
- "role": "Developer"
+ "homepage": "http://helhum.io"
}
],
"description": "A reliable and powerful command line interface for TYPO3 CMS",
@@ -1294,9 +1294,9 @@
"authors": [
{
"name": "Ignace Nyamagana Butera",
+ "role": "Developer",
"email": "nyamsprod@gmail.com",
- "homepage": "https://github.com/nyamsprod/",
- "role": "Developer"
+ "homepage": "https://github.com/nyamsprod/"
}
],
"description": "Csv data manipulation made easy in PHP",
@@ -2122,6 +2122,125 @@
"homepage": "https://symfony.com",
"time": "2019-08-14T12:26:46+00:00"
},
+ {
+ "name": "symfony/http-client",
+ "version": "v4.3.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/http-client.git",
+ "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/9a4fa769269ed730196a5c52c742b30600cf1e87",
+ "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3",
+ "psr/log": "^1.0",
+ "symfony/http-client-contracts": "^1.1.6",
+ "symfony/polyfill-php73": "^1.11"
+ },
+ "provide": {
+ "psr/http-client-implementation": "1.0",
+ "symfony/http-client-implementation": "1.1"
+ },
+ "require-dev": {
+ "nyholm/psr7": "^1.0",
+ "psr/http-client": "^1.0",
+ "symfony/http-kernel": "^4.3",
+ "symfony/process": "^4.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\HttpClient\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony HttpClient component",
+ "homepage": "https://symfony.com",
+ "time": "2019-08-20T14:27:59+00:00"
+ },
+ {
+ "name": "symfony/http-client-contracts",
+ "version": "v1.1.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/http-client-contracts.git",
+ "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/6005fe61a33724405d56eb5b055d5d370192a1bd",
+ "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3"
+ },
+ "suggest": {
+ "symfony/http-client-implementation": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Contracts\\HttpClient\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Generic abstractions related to HTTP clients",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
+ "time": "2019-08-08T10:05:21+00:00"
+ },
{
"name": "symfony/inflector",
"version": "v4.3.4",
@@ -3222,8 +3341,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "The TYPO3 admin panel provides a panel with additional functionality in the frontend (Debugging, Caching, Preview...)",
@@ -3287,8 +3406,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Classes for the TYPO3 backend.",
@@ -3391,8 +3510,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Backend user administration and overview. Allows you to compare the settings of users and verify their permissions and see who is online.",
@@ -3606,8 +3725,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "The core library of TYPO3.",
@@ -3722,8 +3841,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "TYPO3 Extension Manager",
@@ -3828,8 +3947,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Listing of files in the directory",
@@ -3933,8 +4052,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Fluid is a next-generation templating engine which makes the life of extension authors a lot easier!",
@@ -4102,8 +4221,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Classes for the frontend of TYPO3.",
@@ -4161,8 +4280,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Shows various infos",
@@ -4219,8 +4338,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "The Install Tool mounted as the module Tools>Install in TYPO3.",
@@ -4276,8 +4395,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Enables the 'Config' and 'DB Check' modules for technical analysis of the system. This includes raw database search, checking relations, counting pages and records etc.",
@@ -4335,8 +4454,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "List of database-records",
@@ -4387,8 +4506,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "The recycler offers the possibility to restore deleted records or remove them from the database permanently. These actions can be applied to a single record, multiple records, and recursively to child records (ex. restoring a page can restore all content elements on that page). Filtering by page and by table provides a quick overview of deleted records before taking action on them.",
@@ -4441,8 +4560,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Custom redirects in TYPO3.",
@@ -4556,8 +4675,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Integration of CKEditor as Rich Text Editor.",
@@ -4605,8 +4724,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "The TYPO3 Scheduler let's you register tasks to happen at a specific time",
@@ -4659,8 +4778,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "SEO features for TYPO3.",
@@ -4768,8 +4887,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "JavaScript-driven editor with syntax highlighting and codecompletion. Based on CodeMirror.",
@@ -4869,8 +4988,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Framework for management of TypoScript template records for the CMS frontend.",
@@ -4921,8 +5040,8 @@
"authors": [
{
"name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
+ "role": "Developer",
+ "email": "typo3cms@typo3.org"
}
],
"description": "Shows the frontend webpage inside the backend frameset.",
diff --git a/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php b/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php
index 45f1853a..5f4c61fd 100644
--- a/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php
+++ b/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php
@@ -26,6 +26,7 @@ namespace EP\EpTheme\Controller;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use EP\EpTheme\Service\BookingApiService;
use EP\EpTheme\Service\EmailService;
use EP\EpTheme\Domain\Model\Dto\ContactForm;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
@@ -40,12 +41,20 @@ class AjaxFormController extends ActionController
protected $emailService;
/**
- * @param EmailService $emailService
+ * @var BookingApiService
*/
- public function __construct(EmailService $emailService)
+ protected $bookingApiService;
+
+ /**
+ * @param EmailService $emailService
+ * @param BookingApiService $bookingApiService
+ */
+ public function __construct(EmailService $emailService, BookingApiService $bookingApiService)
{
parent::__construct();
+
$this->emailService = $emailService;
+ $this->bookingApiService = $bookingApiService;
}
/**
@@ -63,6 +72,15 @@ class AjaxFormController extends ActionController
[ 'contactForm' => $contactForm ]
);
+ $addressData = [
+ 'name' => $contactForm->getName(),
+ 'vorname' => $contactForm->getFirstName(),
+ 'email' => $contactForm->getEmail(),
+ 'geschlecht' => $contactForm->getGender(),
+ ];
+
+ $this->bookingApiService->registerAddress($addressData);
+
return json_encode($response);
}
diff --git a/public/typo3conf/ext/ep_theme/Classes/Domain/Model/Dto/ContactForm.php b/public/typo3conf/ext/ep_theme/Classes/Domain/Model/Dto/ContactForm.php
index 164d718c..3c046ddb 100644
--- a/public/typo3conf/ext/ep_theme/Classes/Domain/Model/Dto/ContactForm.php
+++ b/public/typo3conf/ext/ep_theme/Classes/Domain/Model/Dto/ContactForm.php
@@ -42,6 +42,18 @@ class ContactForm
*/
protected $name;
+ /**
+ * @var string
+ * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
+ */
+ protected $firstName;
+
+ /**
+ * @var string
+ * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
+ */
+ protected $gender;
+
/**
* @var string
*/
@@ -121,6 +133,38 @@ class ContactForm
$this->name = $name;
}
+ /**
+ * @return string
+ */
+ public function getFirstName()
+ {
+ return $this->firstName;
+ }
+
+ /**
+ * @param string $firstName
+ */
+ public function setFirstName($firstName)
+ {
+ $this->firstName = $firstName;
+ }
+
+ /**
+ * @return string
+ */
+ public function getGender()
+ {
+ return $this->gender;
+ }
+
+ /**
+ * @param string $gender
+ */
+ public function setGender($gender)
+ {
+ $this->gender = $gender;
+ }
+
/**
* @return string
*/
diff --git a/public/typo3conf/ext/ep_theme/Classes/Form/BpnApiFinisher.php b/public/typo3conf/ext/ep_theme/Classes/Form/BpnApiFinisher.php
new file mode 100644
index 00000000..490ac591
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Classes/Form/BpnApiFinisher.php
@@ -0,0 +1,41 @@
+bookingApiService = $bookingApiService;
+ }
+
+ /**
+ * @return string|null
+ */
+ protected function executeInternal()
+ {
+ $formValues = $this->finisherContext->getFormValues();
+ $addressData = [
+ 'name' => $formValues['name'],
+ 'vorname' => $formValues['vorname'],
+ 'geschlecht' => $formValues['geschlecht'],
+ 'email' => $formValues['email'],
+ 'strasse' => $formValues['strasse'],
+ 'plz' => $formValues['plz'],
+ 'ort' => $formValues['ort'],
+ 'telefon' => $formValues['telefon'],
+ ];
+ $this->bookingApiService->registerAddress($addressData);
+ }
+}
\ No newline at end of file
diff --git a/public/typo3conf/ext/ep_theme/Classes/Service/BookingApiService.php b/public/typo3conf/ext/ep_theme/Classes/Service/BookingApiService.php
new file mode 100644
index 00000000..8ece2bb2
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Classes/Service/BookingApiService.php
@@ -0,0 +1,56 @@
+getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)
+ );
+
+ $this->apiToken = $settings['plugin']['tx_eptheme']['settings']['myEpApiToken'];
+ $this->apiEndpointUrl = $settings['plugin']['tx_eptheme']['settings']['myEpApiBaseUrl'];
+ }
+
+ /**
+ * @param array $addressData
+ */
+ public function registerAddress(array $addressData)
+ {
+ $client = HttpClient::create();
+
+ try {
+ $client->request('POST', $this->apiEndpointUrl . '/booking/address', [
+ 'headers' => [
+ 'X-AUTH-TOKEN' => $this->apiToken,
+ ],
+ 'body' => [
+ 'data' => $addressData,
+ ],
+ ]);
+ }
+ catch (TransportExceptionInterface $e)
+ {}
+ }
+}
\ No newline at end of file
diff --git a/public/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml b/public/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml
index 3bea7e5e..ec06bc77 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml
+++ b/public/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml
@@ -11,6 +11,9 @@ TYPO3:
prototypes:
standard:
+ finishersDefinition:
+ BpnApiFinisher:
+ implementationClassName: 'EP\EpTheme\Form\BpnApiFinisher'
formElementsDefinition:
Form:
renderingOptions:
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
index d2f59e8e..948691ec 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
@@ -157,7 +157,9 @@ plugin.tx_eptheme {
partnerIdSelectLabel =
# cat=eptheme/900/100; type=string; label=MyE&P API base url
- myEpApiBaseUrl = https://myep.burn.dpn
+ myEpApiBaseUrl =
+ # cat=eptheme/900/110; type=string; label=MyE&P API auth token
+ myEpApiToken =
}
}
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
index b08396db..9779a299 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
@@ -88,6 +88,7 @@ plugin.tx_eptheme {
conceptsPageUid = {$plugin.tx_eptheme.settings.conceptsPageUid}
myEpPageUid = {$plugin.tx_eptheme.settings.myEpPageUid}
myEpApiBaseUrl = {$plugin.tx_eptheme.settings.myEpApiBaseUrl}
+ myEpApiToken = {$plugin.tx_eptheme.settings.myEpApiToken}
facebookViewContentValues {
productUid = {$plugin.tx_eptheme.settings.facebookViewContentProductUid}
nameInternal = {$plugin.tx_eptheme.settings.facebookViewContentNameInternal}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml b/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
index 9fd2f7c0..d5ceb9ad 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
@@ -7,12 +7,16 @@ label: Kontaktformular
prototypeName: contactform
finishers:
-
+ identifier: BpnApiFinisher
options:
- subject: 'Kontaktanfrage von {text-1}'
+ apiToken: foobarbaz
+ -
+ options:
+ subject: 'Kontaktanfrage von {vorname} {name}'
recipientAddress: info@ep-reisen.de
recipientName: 'E&P Reisen'
- senderAddress: '{text-4}'
- senderName: '{text-1}'
+ senderAddress: '{email}'
+ senderName: '{vorname} {name}'
replyToAddress: info@ep-reisen.de
carbonCopyAddress: ''
blindCarbonCopyAddress: ''
@@ -38,11 +42,11 @@ renderables:
-
defaultValue: ''
type: Text
- identifier: text-1
- label: Name
+ identifier: vorname
+ label: Vorname
properties:
fluidAdditionalAttributes:
- placeholder: 'Vor- & Nachname'
+ placeholder: 'Vorname'
required: required
elementDescription: ''
validators:
@@ -51,21 +55,34 @@ renderables:
-
defaultValue: ''
type: Text
- identifier: text-2
- label: Anschrift
+ identifier: name
+ label: Nachname
properties:
fluidAdditionalAttributes:
- placeholder: 'Straße & Nr.'
+ placeholder: 'Nachname'
+ required: required
elementDescription: ''
+ validators:
+ -
+ identifier: NotEmpty
+ -
+ properties:
+ options:
+ m: m
+ w: w
+ d: d
+ fluidAdditionalAttributes:
+ required: required
+ type: SingleSelect
+ identifier: geschlecht
+ label: Gender
+ validators:
+ -
+ identifier: NotEmpty
-
defaultValue: ''
type: Text
- identifier: text-3
- label: 'PLZ, Ort'
- -
- defaultValue: ''
- type: Text
- identifier: text-4
+ identifier: email
label: E-Mail
properties:
fluidAdditionalAttributes:
@@ -78,16 +95,35 @@ renderables:
-
defaultValue: ''
type: Text
- identifier: text-5
+ identifier: strasse
+ label: Straße
+ properties:
+ fluidAdditionalAttributes:
+ placeholder: 'Straße & Nr.'
+ elementDescription: ''
+ -
+ defaultValue: ''
+ type: Text
+ identifier: plz
+ label: 'PLZ'
+ -
+ defaultValue: ''
+ type: Text
+ identifier: ort
+ label: 'Ort'
+ -
+ defaultValue: ''
+ type: Text
+ identifier: telefon
label: Telefon
-
defaultValue: ''
type: Textarea
- identifier: textarea-1
+ identifier: message
label: 'Deine Kontaktanfrage'
-
type: Checkbox
- identifier: checkbox-1
+ identifier: privacypolicyaccepted
label: 'Ich habe die Datenschutzbestimmungen gelesen und akzeptiere sie'
properties:
elementDescription: ''
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Language/de.locallang.xlf b/public/typo3conf/ext/ep_theme/Resources/Private/Language/de.locallang.xlf
index def6408d..9f7f9662 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Language/de.locallang.xlf
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Language/de.locallang.xlf
@@ -76,6 +76,9 @@