From: John Beppu <[email protected]> The messaging tab already provided a way to configure these notifications, so this isn't needed.
Signed-off-by: Daniel Sweeney <[email protected]> --- .../prog/en/modules/members/memberentrygen.tmpl | 46 ------------- members/memberentry.pl | 67 +------------------- 2 files changed, 1 insertions(+), 112 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index 19732eb..b8b4f2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -866,52 +866,6 @@ </fieldset> <!-- /TMPL_UNLESS --> - <fieldset class="rows"> - <legend>Items Borrowed Notifications</legend> - <ol class="radio"> - <!-- TMPL_LOOP NAME="items_borrowed_loop" --> - <li> - <label class="radio" for="yes_<!-- TMPL_VAR name="name" -->"> <!-- TMPL_VAR name="label" -->: </label> - <label for="yes_<!-- TMPL_VAR NAME="name" -->">Yes </label> - <!-- TMPL_IF NAME="yes" --> - <input type="radio" id="yes_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" checked="checked" /> - <!-- TMPL_ELSE --> - <input type="radio" id="yes_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" /> - <!-- /TMPL_IF --> - <label for="no_<!-- TMPL_VAR NAME="name" -->">No </label> - <!-- TMPL_IF NAME="no" --> - <input type="radio" id="no_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="0" checked="checked"/> - <!-- TMPL_ELSE --> - <input type="radio" id="no_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="0" /> - <!-- /TMPL_IF --> - </li> - <!-- /TMPL_LOOP --> - </ol> - </fieldset> - - <fieldset class="rows"> - <legend>Items Returned Notifications</legend> - <ol class="radio"> - <!-- TMPL_LOOP NAME="items_returned_loop" --> - <li> - <label class="radio" for="yes_<!-- TMPL_VAR name="name" -->"> <!-- TMPL_VAR name="label" -->: </label> - <label for="yes_<!-- TMPL_VAR NAME="name" -->">Yes </label> - <!-- TMPL_IF NAME="yes" --> - <input type="radio" id="yes_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" checked="checked" /> - <!-- TMPL_ELSE --> - <input type="radio" id="yes_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" /> - <!-- /TMPL_IF --> - <label for="no_<!-- TMPL_VAR NAME="name" -->">No </label> - <!-- TMPL_IF NAME="no" --> - <input type="radio" id="no_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="0" checked="checked"/> - <!-- TMPL_ELSE --> - <input type="radio" id="no_<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="0" /> - <!-- /TMPL_IF --> - </li> - <!-- /TMPL_LOOP --> - </ol> - </fieldset> - <!-- /TMPL_IF --> <!-- TMPL_IF NAME="step_4" --><!-- TMPL_IF NAME="ExtendedPatronAttributes" --><!-- TMPL_UNLESS NAME="no_patron_attribute_types" --> diff --git a/members/memberentry.pl b/members/memberentry.pl index 08e2e10..bf20434 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -148,9 +148,7 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') { # remove keys from %newdata that ModMember() doesn't like { - my @keys_to_delete = - map { ("items_borrowed_$_", "items_returned_$_") } qw(email sms feed); - push @keys_to_delete, qw( + my @keys_to_delete = qw( BorrowerMandatoryField category_type check_member @@ -312,7 +310,6 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ delete $newdata{'userid'}; } &ModMember(%newdata); - save_messaging_preferences($input); if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) { C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes); } @@ -476,33 +473,6 @@ foreach (keys(%flags)) { push @flagdata,\%row; } -## Mesaging Preferences -##____________________________________________________________________________ -sub yes_or_no { - my ($transport, $config) = @_; - if (grep { $_ eq $transport } @{$config->{transports}}) { - return (yes => 1); - } else { - return (no => 1); - } -} -my $checkin_prefs = C4::Members::Messaging::GetMessagingPreferences({ - borrowernumber => $borrowernumber, - message_name => 'Item Checkout' -}); -my @items_borrowed_loop = ( - { name => 'items_borrowed_email', label => 'Email', yes_or_no('email', $checkin_prefs) }, - { name => 'items_borrowed_sms', label => 'Text Message', yes_or_no('sms', $checkin_prefs) }, -); -my $checkout_prefs = C4::Members::Messaging::GetMessagingPreferences({ - borrowernumber => $borrowernumber, - message_name => 'Item Check-in' -}); -my @items_returned_loop = ( - { name => 'items_returned_email', label => 'Email', yes_or_no('email', $checkout_prefs) }, - { name => 'items_returned_sms', label => 'Text Message', yes_or_no('sms', $checkout_prefs) }, -); - #get Branches my @branches; my @select_branch; @@ -625,8 +595,6 @@ $template->param( borrotitlepopup => $borrotitlepopup, guarantorinfo => $guarantorinfo, flagloop => \...@flagdata, - items_borrowed_loop => \...@items_borrowed_loop, - items_returned_loop => \...@items_returned_loop, dateformat => C4::Dates->new()->visual(), C4::Context->preference('dateformat') => 1, check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function @@ -725,39 +693,6 @@ sub patron_attributes_form { } -sub save_messaging_preferences { - my $input = shift; - my %options = map { $_->{message_name} => $_ } - @{C4::Members::Messaging::GetMessagingOptions()}; - my @checkin_transports; - my @checkout_transports; - for (qw(email sms feed)) { - push @checkin_transports, $_ if ($input->param("items_returned_$_")); - push @checkout_transports, $_ if ($input->param("items_borrowed_$_")); - } - #use Data::Dump 'pp'; - #warn pp({ checkin => \...@checkin_transports, checkout => \...@checkout_transports }); - - # Check-in Notifications - C4::Members::Messaging::SetMessagingPreference({ - borrowernumber => $borrowernumber, - wants_digest => 0, - message_attribute_id => $options{'Item Check-in'}{message_attribute_id}, - message_transport_types => \...@checkin_transports, - }); - # Checkout Notifications - C4::Members::Messaging::SetMessagingPreference({ - borrowernumber => $borrowernumber, - wants_digest => 0, - message_attribute_id => $options{'Item Checkout'}{message_attribute_id}, - message_transport_types => \...@checkout_transports, - }); - return { - checkin => \...@checkin_transports, - checkout => \...@checkout_transports, - }; -} - # Local Variables: # tab-width: 8 # End: -- 1.5.5.GIT _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
