Bug 3150: Move emails for sending cart and list contents to notices

[srvgit] / opac / opac-sendshelf.pl

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index 3d3d923..ddfc164 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -70,108 +70,63 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
     );
 
     my $patron = Koha::Patrons->find( $borrowernumber );
-
+    my $user_email = $patron->first_valid_email_address;
     my $shelf = Koha::Virtualshelves->find( $shelfid );
     my $contents = $shelf->get_contents;
-    my $marcflavour         = C4::Context->preference('marcflavour');
     my $iso2709;
-    my @results;
 
+    my @biblionumbers;
     while ( my $content = $contents->next ) {
-        my $biblionumber = $content->biblionumber;
-        my $biblio       = Koha::Biblios->find( $biblionumber ) or next;
-        my $dat          = $biblio->unblessed;
-        my $record = $biblio->metadata->record(
-            {
-                embed_items => 1,
-                opac        => 1,
-                patron      => $patron,
-            }
-        );
-        next unless $record;
-        my $fw               = GetFrameworkCode($biblionumber);
-
-        my $marcauthorsarray = $biblio->get_marc_contributors;
-        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-
-        my $items = $biblio->items->search_ordered->filter_by_visible_in_opac({ patron => $patron });
-
-        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
-        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
-        $dat->{MARCAUTHORS}    = $marcauthorsarray;
-        $dat->{'biblionumber'} = $biblionumber;
-        $dat->{ITEM_RESULTS}   = $items;
-        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
-        my ( $host, $relatedparts ) = $biblio->get_marc_host;
-        $dat->{HOSTITEMENTRIES} = $host;
-        $dat->{RELATEDPARTS} = $relatedparts;
-
-        $iso2709 .= $record->as_usmarc();
-
-        push( @results, $dat );
-    }
-
-    $template2->param(
-        BIBLIO_RESULTS => \@results,
-        comment        => $comment,
-        shelfname      => $shelf->shelfname,
-        firstname      => $patron->firstname,
-        surname        => $patron->surname,
-    );
-
-    # Getting template result
-    my $template_res = $template2->output();
-    my $body;
-
-    my $subject;
-    # Analysing information and getting mail properties
-    if ( $template_res =~ /<SUBJECT>(?<subject>.*)<END_SUBJECT>/s ) {
-        $subject = $+{subject};
-        $subject =~ s|\n?(.*)\n?|$1|;
-    }
-    else {
-        $subject = "no subject";
-    }
-
-    my $email_header = "";
-    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
-        $email_header = $1;
-        $email_header =~ s|\n?(.*)\n?|$1|;
-    }
-
-    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
-        $body = $1;
-        $body =~ s|\n?(.*)\n?|$1|;
-    }
+        push @biblionumbers, $content->biblionumber;
+        my $biblio = Koha::Biblios->find($content->biblionumber);
+        $iso2709 .= $biblio->metadata->record->as_usmarc();
+    };
 
-    my $THE_body = <<END_OF_BODY;
-$email_header
-$body
-END_OF_BODY
-
-    try {
-        my $email = Koha::Email->create(
-            {
-                to      => $email,
-                subject => $subject,
-            }
-        );
-        $email->text_body( $THE_body );
-        $email->attach(
-            Encode::encode( "UTF-8", $iso2709 ),
-            content_type => 'application/octet-stream',
-            name         => 'list.iso2709',
-            disposition  => 'attachment',
+    if ( !defined $iso2709 ) {
+        carp "Error sending mail: empty list";
+        $template->param( error => 1 );
+    } elsif ( !defined $user_email or $user_email eq '' ) {
+        carp "Error sending mail: sender's email address is invalid";
+        $template->param( error => 1 );
+    } else {
+         my %loops = (
+             biblio => \@biblionumbers,
+         );
+
+         my %substitute = (
+             comment => $comment,
+             listname => $shelf->shelfname,
+         );
+
+        my $letter = C4::Letters::GetPreparedLetter(
+            module => 'catalogue',
+            letter_code => 'LIST',
+            lang => $patron->lang,
+            tables => {
+                borrowers => $borrowernumber,
+            },
+            message_transport_type => 'email',
+            loops => \%loops,
+            substitute => \%substitute,
         );
-        my $library = Koha::Patrons->find( $borrowernumber )->library;
-        $email->transport( $library->smtp_server->transport );
-        $email->send_or_die;
-        $template->param( SENT => "1" );
+
+        my $attachment = {
+            filename => 'list.iso2709',
+            type => 'application/octet-stream',
+            content => Encode::encode("UTF-8", $iso2709),
+        };
+
+        C4::Letters::EnqueueLetter({
+            letter => $letter,
+            message_transport_type => 'email',
+            borrowernumber => $patron->borrowernumber,
+            to_address => $email,
+            reply_address => $user_email,
+            attachments => [$attachment],
+        });
+
+        $template->param( SENT => 1 );
     }
-    catch {
-        carp "Error sending mail: $_";
-        $template->param( error => 1 );
-    };
 
     $template->param(
         shelfid => $shelfid,