Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LQDN Adminsys
don
Commits
1e7224a8
Commit
1e7224a8
authored
Nov 08, 2018
by
okhin
🚴
Browse files
Merge branch 'preprod' into 'master'
Preprod See merge request
!39
parents
91acaebe
3bd7fd65
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/controller/perso.php
View file @
1e7224a8
...
...
@@ -390,13 +390,13 @@ class Perso extends Controller
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status,commentaire) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'piplome','"
.
\
Utils
::
asl
(
$piplome_id
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
break
;
case
'pibag'
:
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'pibag','','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status
,commentaire
) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'pibag','','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
break
;
case
'pishirt'
:
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'pishirt','"
.
\
Utils
::
asl
(
$taille
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status
,commentaire
) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'pishirt','"
.
\
Utils
::
asl
(
$taille
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
break
;
case
'hoopie'
:
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'hoodie','"
.
\
Utils
::
asl
(
$taille_h
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status
,commentaire
) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'hoodie','"
.
\
Utils
::
asl
(
$taille_h
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1, '"
.
\
Utils
::
asl
(
$commentaire
)
.
"')"
);
}
}
// Puis diminution du cumul de la valeur des contreparties
...
...
app/view/user/perso.html
View file @
1e7224a8
...
...
@@ -370,6 +370,11 @@
</div>
</div>
<!-- / Hoopi -->
</check>
<check
if=
"{{ count(@adresses) < 1 }}"
>
<div
class=
"col-md-8 col-md-offset-2"
>
<h3>
Veuillez ajouter une adresse postale
<a
href=
"#headingInfos"
for=
"adresses"
>
ici
</a></h3>
</div>
</check>
<check
if=
"{{ count(@adresses) > 0 }}"
>
<div
class=
"col-md-8 col-md-offset-2"
>
<!-- Adresse -->
<div
class=
"form-group form-inline"
>
...
...
@@ -424,7 +429,7 @@
<img
class=
"media-object"
src=
"/static/img/pibag2.svg"
alt=
""
>
</div>
<div
class=
"media-body"
>
{{ _("Un pibag
et un piplôme
") }}
{{ _("Un pibag") }}
</div>
</li>
</check>
...
...
@@ -434,7 +439,7 @@
<img
class=
"media-object"
src=
"/static/img/pishirt2.svg"
alt=
""
>
</div>
<div
class=
"media-body"
>
{{ _("Un pi-shirt
- Taille
: @atailles[@taille], un pibag et piplôme
") }}
{{ _("Un pi-shirt") }}
</div>
</li>
</check>
...
...
@@ -444,7 +449,7 @@
<img
class=
"media-object"
src=
"/static/img/hoopie2.svg"
alt=
""
>
</div>
<div
class=
"media-body"
>
{{ _("Un hoopie
- Taille
: @atailles[@taille_h], un pi-shirt - Taille
: @atailles[@taille], un pibag et piplôme
") }}
{{ _("Un hoopie") }}
</div>
</li>
</check>
...
...
@@ -456,7 +461,7 @@
<div
class=
"modal-footer"
>
<input
type=
"hidden"
name=
"csrf"
value=
"{{ @CSRF }}"
>
<repeat
group=
"{{@GET}}"
key=
"{{ @key }}"
value=
"{{ @value }}"
>
<input
type=
"hidden"
name=
"{{ @key }}"
value=
"@value"
>
<input
type=
"hidden"
name=
"{{ @key }}"
value=
"
{{
@value
}}
"
>
</repeat>
<a
href=
"{{ 'perso' | alias }}"
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
Close
</a>
<input
type=
"submit"
class=
"btn btn-primary"
value=
"{{ _('Valider') }}"
>
...
...
www/static/css/custom.css
View file @
1e7224a8
...
...
@@ -251,3 +251,4 @@ transform: rotate(-90deg);
p
{
/* bootstrap.css ligne 1289 marge de 10px sous les p qui n'est utile nullepart */
margin
:
0
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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