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
61e6ce3e
Commit
61e6ce3e
authored
Nov 25, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow caissier to recieve payments
parent
3ae1d424
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
UserController.php
src/Controller/UserController.php
+1
-1
admin_caissier.html.twig
templates/themes/kohinos/block/admin_caissier.html.twig
+8
-0
useradmin.html.twig
templates/themes/kohinos/block/useradmin.html.twig
+1
-1
No files found.
src/Controller/UserController.php
View file @
61e6ce3e
...
@@ -245,7 +245,7 @@ class UserController extends AbstractController
...
@@ -245,7 +245,7 @@ class UserController extends AbstractController
/**
/**
* @Route("/encaissement", name="encaissement")
* @Route("/encaissement", name="encaissement")
* @IsGranted(
"ROLE_PRESTATAIRE"
)
* @IsGranted(
{"ROLE_CAISSIER", "ROLE_PRESTATAIRE"}
)
*/
*/
public
function
encaissementAction
(
Request
$request
,
UserPasswordEncoderInterface
$encoder
)
public
function
encaissementAction
(
Request
$request
,
UserPasswordEncoderInterface
$encoder
)
{
{
...
...
templates/themes/kohinos/block/admin_caissier.html.twig
0 → 100644
View file @
61e6ce3e
{%
if
tav_env
==
1
%}
{%
set
esoldelabel
=
'Solde e-mlc'
|
trans
%}
{%
include
'@kohinos/block/solde.html.twig'
with
{
'compte'
:
getCurrentPrestataire
()
.
emlcAccount.balance
,
'soldelabel'
:
esoldelabel
,
'currency'
:
'e'
~
(
KOH_MLC_SYMBOL
|
default
(
''
))
}
%}
{%
include
'@kohinos/tav/block/encaisser_paiement.html.twig'
%}
{%
endif
%}
{%
include
'@kohinos/block/transactions.html.twig'
with
{
'title'
:
'Transactions'
}
%}
\ No newline at end of file
templates/themes/kohinos/block/useradmin.html.twig
View file @
61e6ce3e
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
{%
elseif
app.user
and
is_granted
(
'ROLE_CAISSIER'
)
and
getCurrentPrestataire
()
!=
null
%}
{%
elseif
app.user
and
is_granted
(
'ROLE_CAISSIER'
)
and
getCurrentPrestataire
()
!=
null
%}
{%
include
'@kohinos/block/
transactions.html.twig'
with
{
'title'
:
'Transactions'
}
%}
{%
include
'@kohinos/block/
admin_caissier.html.twig'
%}
{%
elseif
app.user
and
is_granted
(
'ROLE_ADHERENT'
)
and
app.user.adherent
%}
{%
elseif
app.user
and
is_granted
(
'ROLE_ADHERENT'
)
and
app.user.adherent
%}
...
...
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