Commit 6e61c1db authored by Denis S. Valdenaire's avatar Denis S. Valdenaire

Merge branch 'ajax_member_list' into 'master'

merge de la branche ajax_member_list



See merge request !5
parents 17e6824b 8232941a
...@@ -70,7 +70,7 @@ class SubscriptionsController extends AppController { ...@@ -70,7 +70,7 @@ class SubscriptionsController extends AppController {
$subscription->error = "Impossible de supprimer une adhésion avec des payments associés"; $subscription->error = "Impossible de supprimer une adhésion avec des payments associés";
} else { } else {
$subscription->delete(); $subscription->delete();
Account::ludotheque_new_subscription("Annulation adhésion #".$member->id. Account::ludotheque_new_subscription("Annulation adhésion #".$subscription->id.
" - ".$member->firstname." ".$member->lastname, " - ".$member->firstname." ".$member->lastname,
date("Y-m-d"), $member->account_id, 0 - $subscription->price); date("Y-m-d"), $member->account_id, 0 - $subscription->price);
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{% include 'ihm_messages.html' %} {% include 'ihm_messages.html' %}
<table id="list_members"> <table id="list_members" class="stripe">
<thead> <thead>
<tr> <tr>
<th>Nom</th> <th>Nom</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment