Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kohinos-tav
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
agplv3
kohinos-tav
Commits
cf535c67
Commit
cf535c67
authored
Mar 10, 2022
by
Julien Jorry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cotisation en emlc
parent
7cb44111
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
12 deletions
+16
-12
UserController.php
src/Controller/UserController.php
+1
-1
UserPrestataireController.php
src/Controller/UserPrestataireController.php
+1
-1
cotisations.html.twig
templates/themes/kohinos/block/cotisations.html.twig
+14
-10
No files found.
src/Controller/UserController.php
View file @
cf535c67
...
...
@@ -58,7 +58,7 @@ class UserController extends AbstractController
if
(
$form
->
isSubmitted
())
{
$cotisation
=
$form
->
getData
();
if
(
$form
->
isValid
())
{
if
(
MoyenEnum
::
MOYEN_MLC
==
$cotisation
->
getMoyen
())
{
if
(
MoyenEnum
::
MOYEN_
E
MLC
==
$cotisation
->
getMoyen
())
{
try
{
$cotisation
->
setRecu
(
true
);
$this
->
operationUtils
->
executeOperations
(
$cotisation
);
...
...
src/Controller/UserPrestataireController.php
View file @
cf535c67
...
...
@@ -41,6 +41,7 @@ class UserPrestataireController extends FluxController
$form
->
handleRequest
(
$request
);
if
(
$form
->
isSubmitted
()
&&
$form
->
isValid
())
{
$errorText
=
''
;
foreach
(
$originalAdresses
as
$adresse
)
{
if
(
false
===
$presta
->
getGeolocs
()
->
contains
(
$adresse
))
{
$adresse
->
getPrestataires
()
->
removeElement
(
$presta
);
...
...
@@ -59,7 +60,6 @@ class UserPrestataireController extends FluxController
$emailConstraint
);
}
$errorText
=
''
;
foreach
(
$errors
as
$error
)
{
if
(
$error
->
count
())
{
$errorText
.=
$error
[
0
]
->
getMessage
();
...
...
templates/themes/kohinos/block/cotisations.html.twig
View file @
cf535c67
...
...
@@ -26,16 +26,20 @@
{%
endif
%}
</ul>
{%
if
((
app.user
and
is_granted
(
'ROLE_ADHERENT'
)
and
app.user.adherent
)
or
(
app.user
and
is_granted
(
'ROLE_PRESTATAIRE'
)
and
app.session.has
(
'_prestagere'
)))
%}
{%
if
false
!=
isCotisationValid
(
app.user
)
%}
<span
class=
'btn btn-secondary disabled mt-2'
disabled=
'disabled'
>
{{
'Votre cotisation est à jour'
|
trans
}}
</span>
{%
else
%}
<a
class=
'btn btn-xs btn-primary mt-2'
href=
'
{{
path
(
'cotiser'
)
}}
'
>
{{
'Cotiser'
|
trans
}}
</a>
{%
endif
%}
{%
set
cotisEnd
=
false
%}
{%
if
(
app.user
and
is_granted
(
'ROLE_ADHERENT'
)
and
app.user.adherent
)
%}
{%
set
cotisEnd
=
isCotisationValidForAdherent
(
app.user.adherent
)
%}
{%
elseif
(
app.user
and
is_granted
(
'ROLE_PRESTATAIRE'
)
and
app.session.has
(
'_prestagere'
))
%}
{%
set
cotisEnd
=
isCotisationValidForPresta
(
app.session.get
(
'_prestagere'
))
%}
{%
endif
%}
{%
if
false
!=
cotisEnd
%}
<span
class=
'btn btn-secondary disabled mt-2'
disabled=
'disabled'
>
{{
'Votre cotisation est à jour'
|
trans
}}
</span>
{%
else
%}
<a
class=
'btn btn-xs btn-primary mt-2'
href=
'
{{
path
(
'cotiser'
)
}}
'
>
{{
'Cotiser'
|
trans
}}
</a>
{%
endif
%}
{%
endblock
blockcontent
%}
{%
endif
%}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment