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
3
Merge Requests
3
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
2 years ago
by
Julien Jorry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cotisation en emlc
parent
7cb44111
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
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
+7
-3
No files found.
src/Controller/UserController.php
View file @
cf535c67
...
@@ -58,7 +58,7 @@ class UserController extends AbstractController
...
@@ -58,7 +58,7 @@ class UserController extends AbstractController
if
(
$form
->
isSubmitted
())
{
if
(
$form
->
isSubmitted
())
{
$cotisation
=
$form
->
getData
();
$cotisation
=
$form
->
getData
();
if
(
$form
->
isValid
())
{
if
(
$form
->
isValid
())
{
if
(
MoyenEnum
::
MOYEN_MLC
==
$cotisation
->
getMoyen
())
{
if
(
MoyenEnum
::
MOYEN_
E
MLC
==
$cotisation
->
getMoyen
())
{
try
{
try
{
$cotisation
->
setRecu
(
true
);
$cotisation
->
setRecu
(
true
);
$this
->
operationUtils
->
executeOperations
(
$cotisation
);
$this
->
operationUtils
->
executeOperations
(
$cotisation
);
...
...
This diff is collapsed.
Click to expand it.
src/Controller/UserPrestataireController.php
View file @
cf535c67
...
@@ -41,6 +41,7 @@ class UserPrestataireController extends FluxController
...
@@ -41,6 +41,7 @@ class UserPrestataireController extends FluxController
$form
->
handleRequest
(
$request
);
$form
->
handleRequest
(
$request
);
if
(
$form
->
isSubmitted
()
&&
$form
->
isValid
())
{
if
(
$form
->
isSubmitted
()
&&
$form
->
isValid
())
{
$errorText
=
''
;
foreach
(
$originalAdresses
as
$adresse
)
{
foreach
(
$originalAdresses
as
$adresse
)
{
if
(
false
===
$presta
->
getGeolocs
()
->
contains
(
$adresse
))
{
if
(
false
===
$presta
->
getGeolocs
()
->
contains
(
$adresse
))
{
$adresse
->
getPrestataires
()
->
removeElement
(
$presta
);
$adresse
->
getPrestataires
()
->
removeElement
(
$presta
);
...
@@ -59,7 +60,6 @@ class UserPrestataireController extends FluxController
...
@@ -59,7 +60,6 @@ class UserPrestataireController extends FluxController
$emailConstraint
$emailConstraint
);
);
}
}
$errorText
=
''
;
foreach
(
$errors
as
$error
)
{
foreach
(
$errors
as
$error
)
{
if
(
$error
->
count
())
{
if
(
$error
->
count
())
{
$errorText
.=
$error
[
0
]
->
getMessage
();
$errorText
.=
$error
[
0
]
->
getMessage
();
...
...
This diff is collapsed.
Click to expand it.
templates/themes/kohinos/block/cotisations.html.twig
View file @
cf535c67
...
@@ -26,8 +26,13 @@
...
@@ -26,8 +26,13 @@
{%
endif
%}
{%
endif
%}
</ul>
</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'
)))
%}
{%
set
cotisEnd
=
false
%}
{%
if
false
!=
isCotisationValid
(
app.user
)
%}
{%
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'
>
<span
class=
'btn btn-secondary disabled mt-2'
disabled=
'disabled'
>
{{
'Votre cotisation est à jour'
|
trans
}}
{{
'Votre cotisation est à jour'
|
trans
}}
</span>
</span>
...
@@ -36,6 +41,5 @@
...
@@ -36,6 +41,5 @@
{{
'Cotiser'
|
trans
}}
{{
'Cotiser'
|
trans
}}
</a>
</a>
{%
endif
%}
{%
endif
%}
{%
endif
%}
{%
endblock
blockcontent
%}
{%
endblock
blockcontent
%}
{%
endif
%}
{%
endif
%}
This diff is collapsed.
Click to expand it.
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