Bug 20724: Move the ReservesNeedReturns logic to AddReserve

[koha.git] / opac / opac-messaging.pl

diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index 6fe18a7..906d56f 100755 (executable)
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -29,11 +29,17 @@ use C4::Circulation;
 use C4::Output;
 use C4::Members;
 use C4::Members::Messaging;
-use C4::Branch;
 use C4::Form::MessagingPreferences;
+use Koha::SMS::Providers;
 
 my $query = CGI->new();
 
+unless ( C4::Context->preference('EnhancedMessagingPreferencesOPAC') and
+         C4::Context->preference('EnhancedMessagingPreferences') ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => 'opac-messaging.tt',
@@ -44,18 +50,21 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
 my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
 
 if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
     my $sms = $query->param('SMSnumber');
-    if ( defined $sms && ( $borrower->{'smsalertnumber'} // '' ) ne $sms ) {
+    my $sms_provider_id = $query->param('sms_provider_id');
+    if ( defined $sms && ( $borrower->{'smsalertnumber'} // '' ) ne $sms
+            or ( $borrower->{sms_provider_id} // '' ) ne $sms_provider_id ) {
         ModMember(
             borrowernumber  => $borrowernumber,
             smsalertnumber  => $sms,
-            sms_provider_id => $query->param('sms_provider_id'),
+            sms_provider_id => $sms_provider_id,
         );
-        $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+        # FIXME will not be needed when ModMember will be replaced
+        $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
     }
 
     C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $borrowernumber }, $template);
@@ -70,7 +79,7 @@ $template->param( BORROWER_INFO         => $borrower,
                   TalkingTechItivaPhone        =>  C4::Context->preference("TalkingTechItivaPhoneNotification") );
 
 if ( C4::Context->preference("SMSSendDriver") eq 'Email' ) {
-    my @providers = Koha::SMS::Provider->all();
+    my @providers = Koha::SMS::Providers->search();
     $template->param( sms_providers => \@providers, sms_provider_id => $borrower->{'sms_provider_id'} );
 }