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
L
ludotheque
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
18
Issues
18
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Denis S. Valdenaire
ludotheque
Commits
6e61c1db
Commit
6e61c1db
authored
Oct 04, 2016
by
Denis S. Valdenaire
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ajax_member_list' into 'master'
merge de la branche ajax_member_list See merge request
!5
parents
17e6824b
8232941a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
webroot/controllers/subscriptions.php
webroot/controllers/subscriptions.php
+1
-1
webroot/views/members/list.html
webroot/views/members/list.html
+1
-1
No files found.
webroot/controllers/subscriptions.php
View file @
6e61c1db
...
...
@@ -70,7 +70,7 @@ class SubscriptionsController extends AppController {
$subscription
->
error
=
"Impossible de supprimer une adhésion avec des payments associés"
;
}
else
{
$subscription
->
delete
();
Account
::
ludotheque_new_subscription
(
"Annulation adhésion #"
.
$
member
->
id
.
Account
::
ludotheque_new_subscription
(
"Annulation adhésion #"
.
$
subscription
->
id
.
" - "
.
$member
->
firstname
.
" "
.
$member
->
lastname
,
date
(
"Y-m-d"
),
$member
->
account_id
,
0
-
$subscription
->
price
);
}
...
...
webroot/views/members/list.html
View file @
6e61c1db
...
...
@@ -20,7 +20,7 @@
{% include 'ihm_messages.html' %}
<table
id=
"list_members"
>
<table
id=
"list_members"
class=
"stripe"
>
<thead>
<tr>
<th>
Nom
</th>
...
...
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