From 0aeebffdc7f9215d91195a26a0dbc2db56345398 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Mon, 28 Feb 2022 11:12:27 +0000
Subject: [PATCH] Show member join status in the members table

---
 locale/en_US/messages.php                     |  2 ++
 .../tables/organisation-members.html.twig     | 20 ++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/locale/en_US/messages.php b/locale/en_US/messages.php
index 972e654..d1c1b16 100644
--- a/locale/en_US/messages.php
+++ b/locale/en_US/messages.php
@@ -158,6 +158,8 @@ return [
     'PENDING'                            => 'Pending',
     'APPROVE'                            => 'Approve',
     'DENY'                               => 'Deny',
+    'ACCEPTED'                           => 'Accepted',
+    'REJECTED'                           => 'Rejected',
 
     'VIEW_DELETED'                       => 'View deleted',
     'DELETED'                            => 'Deleted',
diff --git a/templates/tables/organisation-members.html.twig b/templates/tables/organisation-members.html.twig
index b625e71..5d94bce 100644
--- a/templates/tables/organisation-members.html.twig
+++ b/templates/tables/organisation-members.html.twig
@@ -25,24 +25,16 @@
 <script id="{{table.id}}-column-status" type="text/x-handlebars-template">
     {%- verbatim %}
     <td
-        {{#ifx row.flag_enabled '==' 0 }}
-            data-text="disabled"
+        {{#ifx row.membership_approved '==' 0 }}
+            data-text="pending"
         {{ else }}
-            {{#ifx row.flag_verified '==' 0 }}
-                data-text="unactivated"
-            {{ else }}
-                data-text="active"
-            {{/ifx }}
+            data-text="accepted"
         {{/ifx }}
     >
-        {{#ifx row.flag_enabled '==' 0 }}
-            <span class="text-muted">{% endverbatim %}{{translate("DISABLED")}}{% verbatim %}</span>
+        {{#ifx row.membership_approved '==' 0 }}
+            <span class="text-yellow">{% endverbatim %}{{translate("PENDING")}}{% verbatim %}</span>
         {{ else }}
-            {{#ifx row.flag_verified '==' 0 }}
-                <span class="text-yellow">{% endverbatim %}{{translate("UNACTIVATED")}}{% verbatim %}</span>
-            {{ else }}
-                <span>{% endverbatim %}{{translate("ACTIVE")}}{% verbatim %}</span>
-            {{/ifx }}
+            <span>{% endverbatim %}{{translate("ACCEPTED")}}{% verbatim %}</span>
         {{/ifx }}
     </td>
     {% endverbatim -%}