Skip to content

Check approvable #70

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
lsascha wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Check approvable #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04fc74d
[TASK] check if address is not yet approved
lsascha Jul 5, 2020
65f8b44
[TASK] Add variable to check if it got approved
lsascha Jul 5, 2020
1e90084
Update Approve.html
lsascha Jul 5, 2020
a10796f
Update de.locallang.xlf
lsascha Jul 5, 2020
4f48fd4
[BUGFIX] composer2 compatibility
Mar 22, 2023
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
4 changes: 3 additions & 1 deletion Classes/Controller/AddressController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public function approveAction($hash = NULL, $doApprove = false)

$this->view->assign('hash', $hash);

if ($address && $doApprove) {
if ($address && $doApprove && $address->getHidden() === true) {
$address->setHidden(false);
$address->setModuleSysDmailHtml(true);

Expand Down Expand Up @@ -466,6 +466,8 @@ public function approveAction($hash = NULL, $doApprove = false)

$persistenceManager = $this->objectManager->get(PersistenceManager::class);
$persistenceManager->persistAll();

$this->view->assign('gotApproved', true);
}

$this->view->assign('address', $address);
Expand Down
3 changes: 3 additions & 0 deletions Resources/Private/Language/de.locallang.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ E-Mail: %3s</target>
<trans-unit id="form.approve.errortext" xml:space="preserve">
<target>Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
</trans-unit>
<trans-unit id="form.approve.alreadyapproved" xml:space="preserve">
<target>Adresse wurde bereits bestätigt.</target>
</trans-unit>
<trans-unit id="form.approve.submitButton" xml:space="preserve">
<target>zustimmen</target>
</trans-unit>
Expand Down
21 changes: 14 additions & 7 deletions Resources/Private/Templates/Address/Approve.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,22 @@

<f:if condition="{address}">
<f:then>
<f:if condition="{doApprove}">
<f:if condition="{gotApproved}">
<f:then>
<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
<f:if condition="{doApprove}">
<f:then>
<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
</f:then>
<f:else>
<f:form action="approve" arguments="{hash: hash}">
<f:form.hidden name="doApprove" value="1" />
<f:form.submit value="{f:translate(key:'form.approve.submitButton')}" class="submit" />
</f:form>
</f:else>
</f:if>
</f:then>
<f:else>
<f:form action="approve" arguments="{hash: hash}">
<f:form.hidden name="doApprove" value="1" />
<f:form.submit value="{f:translate(key:'form.approve.submitButton')}" class="submit" />
</f:form>
<p><f:translate key="form.approve.alreadyapproved" /></p>
</f:else>
</f:if>
</f:then>
Expand All @@ -32,4 +39,4 @@
</f:else>
</f:if>

</f:section>
</f:section>
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"friendsoftypo3/tt-address": ">=3.1.0 <3.2.99"
},
"replace": {
"registeraddress": "self.version",
"typo3-ter/registeraddress": "self.version"
},
"autoload": {
Expand Down