Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
don
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
25
Issues
25
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
LQDN Adminsys
don
Commits
1d6ba25d
Commit
1d6ba25d
authored
Oct 25, 2018
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ajout du champ commentairesur les contreparties
parent
a5ceb560
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
7 deletions
+75
-7
app/controller/perso.php
app/controller/perso.php
+13
-5
app/view/user/perso.html
app/view/user/perso.html
+28
-2
db/migrations/20181025132655_add_commentaire.php
db/migrations/20181025132655_add_commentaire.php
+34
-0
No files found.
app/controller/perso.php
View file @
1d6ba25d
...
...
@@ -25,6 +25,13 @@ class Perso extends Controller
$this
->
get_contreparties
(
$f3
);
$this
->
get_dons
(
$f3
);
$this
->
get_recurrents
(
$f3
);
if
(
$f3
->
exists
(
'GET.validate'
))
{
$f3
->
set
(
'modal_counterparts'
,
'1'
);
$f3
->
clear
(
'GET.validate'
);
}
else
{
$f3
->
set
(
'modal_counterparts'
,
'0'
);
};
$f3
->
set
(
'block_content'
,
'user/perso.html'
);
}
...
...
@@ -356,6 +363,7 @@ class Perso extends Controller
// Récupération des valeurs du formulaire
$adresse_id
=
$f3
->
get
(
'adresse_id'
);
$quoi
=
$f3
->
get
(
'quoi'
);
$commentaire
=
$f3
->
get
(
'commentaire'
);
$valeur
=
0
;
$piplome_id
=
intval
(
substr
(
$f3
->
get
(
'piplome_id'
),
0
,
strpos
(
$f3
->
get
(
'piplome_id'
),
'_'
)));
$taille
=
intval
(
$f3
->
get
(
'taille'
));
...
...
@@ -380,22 +388,22 @@ class Perso extends Controller
if
(
$cumul
>=
$valeur
)
{
switch
(
$quoi
)
{
case
'piplome'
:
$db
->
query
(
"INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status
) VALUES ('"
.
$f3
->
get
(
'SESSION.id'
)
.
"',NOW(),'piplome','"
.
\
Utils
::
asl
(
$piplome_id
)
.
"','"
.
\
Utils
::
asl
(
$adresse_id
)
.
"',1
)"
);
$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)"
);
$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
)
.
"'
)"
);
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)"
);
$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
)
.
"'
)"
);
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)"
);
$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
)
.
"'
)"
);
}
}
// Puis diminution du cumul de la valeur des contreparties
$db
->
query
(
"UPDATE users SET cumul = cumul - "
.
$valeur
.
" WHERE id='"
.
$f3
->
get
(
'SESSION.id'
)
.
"'"
);
$f3
->
set
(
'msg'
,
_
(
"Merci, vos contreparties seront envoyées dès que possible !"
));
$
this
->
show
(
$f3
,
$args
);
$
f3
->
reroute
(
'/perso'
);
}
public
function
receipt
(
$f3
,
$params
)
...
...
app/view/user/perso.html
View file @
1d6ba25d
...
...
@@ -366,8 +366,34 @@
<div
class=
"modal-dialog modal-lg"
role=
"document"
>
<div
class=
"modal-content c-modale"
>
<div
class=
"modal-body"
>
{{ print_r($GET) }}
<h3>
{{ _("Envoyer à l'adresse
:") }}
</h3>
<p>
{{ @adresses[@GET['adresse_id']].nom }}
<br>
{{ @adresses[@GET['adresse_id']].adresse }}
<br>
{{ @adresses[@GET['adresse_id']].adresse2 }}
<br>
{{ @adresses[@GET['adresse_id']].codepostal }}
{{ @adresses[@GET['adresse_id']].ville }}
</p>
<h3>
{{ _("Récapitulatif
:") }}
</h3>
<div
class=
"media"
>
<div
class=
"media-left"
>
<img
class=
"media-object"
src=
""
alt=
"{{ @GET['quoi']}}"
>
</div>
<div
class=
"media-body"
>
<p>
{{ @GET['quoi'] }} {{ @GET['taille'] }}{{ @GET['taille_h']}}{{ @GET['piplome_id'] }}
</p>
</div>
</div>
</div>
<div
class=
"form-group text-left"
>
<label
for=
"commentaire"
><h3>
{{ _("Un commentaire
?") }}
</h3></label>
<textarea
class=
"form-control"
id=
"commentaire"
name=
"commentaire"
placeholder=
""
row=
"3"
></textarea>
<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"
>
</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') }}"
>
</div>
</div>
</div>
...
...
db/migrations/20181025132655_add_commentaire.php
0 → 100644
View file @
1d6ba25d
<?php
use
Phinx\Migration\AbstractMigration
;
class
AddCommentaire
extends
AbstractMigration
{
/**
* Change Method.
*
* Write your reversible migrations using this method.
*
* More information on writing migrations is available here:
* http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
*
* The following commands can be used in this method and Phinx will
* automatically reverse them when rolling back:
*
* createTable
* renameTable
* addColumn
* renameColumn
* addIndex
* addForeignKey
*
* Remember to call "create()" or "update()" and NOT "save()" when working
* with the Table class.
*/
public
function
change
()
{
$table
=
$this
->
table
(
'contreparties'
);
$table
->
addColumn
(
'commentaire'
,
'string'
)
->
update
();
}
}
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