Filter all disabled message types from patrons settings.

Author: EreMaijala

Koha/Plugin/Fi/KohaSuomi/DI/Koha/Patron/Message/Preferences.pm

@@ -88,11 +88,10 @@ sub get_options {
     my $choices;
     while (my $transport = $transports->next) {
         # KD-3952 Quick fix until we get the letter template checking in place, for now just follow suomifi system preference
-        next if $transport->get_column('message_transport_type') eq 'suomifi' && ! C4::Context->preference('SuomiFiMessaging'); 
+        next if $transport->get_column('message_transport_type') eq 'suomifi' && ! C4::Context->preference('SuomiFiMessaging');
         next if $transport->get_column('message_transport_type') eq 'itiva' && ! C4::Context->preference('TalkingTechItivaPhoneNotification');
         my $name = $transport->get_column('message_name');
-        next if $name =~ m/^Ill_/ && ! C4::Context->preference('ILLModule');
-        next if $name eq 'Auto_Renewals' && C4::Context->preference('AutoRenewalNotices') ne 'preferences';
+        next if $self->_message_disabled($name);
         $choices->{$name}->{'message_attribute_id'} = $transport->message_attribute_id;
         $choices->{$name}->{'message_name'}         = $name;
         $choices->{$name}->{'takes_days'}           = $transport->get_column('takes_days');
@@ -141,7 +140,7 @@ sub TO_JSON {
     my $preferences = {};
     my $options = $self->get_options;
     foreach my $preference ($self->as_list) {
-        next if $preference->message_name =~ m/^Ill_/ && ! C4::Context->preference('ILLModule');
+        next if $self->_message_disabled($preference->message_name);
         $preferences->{$preference->message_name} = $preference->TO_JSON({
             options => $options
         });
@@ -185,6 +184,15 @@ sub _log_action_buffer {
     return 1;
 }
 
+sub _message_disabled {
+    my ($self, $messageName) = @_;
+
+    return 1 if $messageName =~ m/^Ill_/ && ! C4::Context->preference('ILLModule');
+    return 1 if $messageName eq 'Auto_Renewals' && C4::Context->preference('AutoRenewalNotices') ne 'preferences';
+
+    return 0;
+}
+
 =head3 type
 
 =cut