Merge branch 'master' into feat/mollie-v3

Author: leuke-naam

app/assets/stylesheets/cards.css

@@ -26,6 +26,10 @@
   font-size: 30px;
 }
 
+.size-small {
+  font-size: 10px;
+}
+
 .card .table {
   margin-bottom: 0;
 }

app/views/admin/activities/index.html.haml

@@ -27,7 +27,7 @@
                       - elsif activity.group.committee?
                         %span.badge.badge-success= activity.group.name.upcase
                       - else
-                        %span.label.badge-warning= activity.group.name.upcase
+                        %span.badge.badge-warning= activity.group.name.upcase
                   - else
                     %td
                       %span
@@ -43,3 +43,12 @@
                   - else
                     %td.d-none.d-md-block
                       %span
+
+                  %td
+                    - if activity.is_payable && activity.price != 0
+                      %span.badge.badge-success.size-small= I18n.t('admin.activities.is_payable')
+                    - elsif activity.price == 0
+                      %span.badge.badge-primary.size-small= I18n.t('admin.activities.free')
+                    - else
+                      %span.badge.badge-warning.size-small= I18n.t('admin.activities.is_not_payable')
+

config/locales/admin.en.yml

@@ -7,12 +7,15 @@ en:
       ended: Ended
       filters: Filters
       financial: Financial
+      free: Free
       has_not_paid: has not yet paid
       has_paid: has paid
       info:
         already_added: This participant was already added
         price_changed: The participants fee has changed
         price_error: No connection or not a number
+      is_not_payable: Not payable
+      is_payable: Payable
       new: New activity
       remove_participant: Do you want to remove %{user} as participant?
       save: Save activity?

config/locales/admin.nl.yml

@@ -7,12 +7,15 @@ nl:
       ended: Afgelopen
       filters: Filters
       financial: Financieel
+      free: Gratis
       has_not_paid: heeft nog niet betaald
       has_paid: heeft betaald
       info:
         already_added: Deze persoon is al toegevoegd
         price_changed: Het deelname bedrag is veranderd
         price_error: Geen verbinding of geen nummer
+      is_not_payable: Niet betaalbaar
+      is_payable: Betaalbaar
       new: Nieuwe activiteit
       remove_participant: Deelname van %{user} verwijderen?
       save: Activiteit opslaan?