Attachment #169204 for bug #23781

View | Details | Raw Unified | Return to bug 23781
Collapse All | Expand All

Lines 358-364 sub set_waiting { Link Here

(-)a/Koha/Recall.pm (-1 / +5 lines)
358	},	358	},
359	);	359	);
360		360
361	C4::Message->enqueue($letter, $self->patron, 'email');	361	my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
		362	{ borrowernumber => $self->patron_id, message_name => 'Recall_Waiting' } );
		363	while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
		364	C4::Message->enqueue( $letter, $self->patron, $transport );
		365	}
362		366
363	return $self;	367	return $self;
364	}	368	}

Lines 167-173 sub add_recall { Link Here

(-)a/Koha/Recalls.pm (-1 / +6 lines)
167	},	167	},
168	);	168	);
169		169
170	C4::Message->enqueue( $letter, $checkout->patron, 'email' );	170	my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
		171	{ borrowernumber => $checkout->borrowernumber, message_name => 'Recall_Requested' } );
		172
		173	while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
		174	C4::Message->enqueue( $letter, $checkout->patron, $transport );
		175	}
171		176
172	$item = Koha::Items->find( $itemnumber );	177	$item = Koha::Items->find( $itemnumber );
173	# add to statistics table	178	# add to statistics table

Lines 18-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (+3 lines)
18	[% FOREACH messaging_preference IN messaging_preferences %]	18	[% FOREACH messaging_preference IN messaging_preferences %]
19	[% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]	19	[% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
20	[% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]	20	[% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
		21	[% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %]
21	<tr id="[% messaging_preference.message_name _ "_message" \| lower \| html %]">	22	<tr id="[% messaging_preference.message_name _ "_message" \| lower \| html %]">
22	<td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>	23	<td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
23	[% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>	24	[% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
Lines 34-39 Link Here
34	[% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>	35	[% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
35	[% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>	36	[% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>
36	[% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>	37	[% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
		38	[% ELSIF ( messaging_preference.Recall_Waiting ) %]<span>Recall awaiting pickup</span>
		39	[% ELSIF ( messaging_preference.Recall_Requested ) %]<span>Return recalled item</span>
37	[% ELSE %]<span>Unknown</span>	40	[% ELSE %]<span>Unknown</span>
38	[% END %]	41	[% END %]
39	</td>	42	</td>

Return to bug 23781

Lines 60-65 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-1 / +3 lines)
60	[% FOREACH messaging_preference IN messaging_preferences %]	60	[% FOREACH messaging_preference IN messaging_preferences %]
61	[% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]	61	[% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
62	[% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]	62	[% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
		63	[% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %]
63	<tr id="[% messaging_preference.message_name _ "_message" \| lower \| html %]">	64	<tr id="[% messaging_preference.message_name _ "_message" \| lower \| html %]">
64	<td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>	65	<td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
65	[% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>	66	[% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
Lines 76-81 Link Here
76	[% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>	77	[% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
77	[% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>	78	[% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>
78	[% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>	79	[% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
		80	[% ELSIF ( messaging_preference.Recall_Waiting ) %]<span>Recall awaiting pickup</span>
		81	[% ELSIF ( messaging_preference.Recall_Requested ) %]<span>Return recalled item</span>
79	[% ELSE %]<span>Unknown</span> [% END %]</td>	82	[% ELSE %]<span>Unknown</span> [% END %]</td>
80	[% IF ( messaging_preference.takes_days ) %]	83	[% IF ( messaging_preference.takes_days ) %]
81	<td><select class="input-mini" name="[% messaging_preference.message_attribute_id \| html %]-DAYS" aria-label="Choose how many days in advance you wish to receive the message">	84	<td><select class="input-mini" name="[% messaging_preference.message_attribute_id \| html %]-DAYS" aria-label="Choose how many days in advance you wish to receive the message">
82	-