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

(-)a/misc/cronjobs/advance_notices.pl (-3 / +16 lines)
Lines 292-298 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
292
            my $letter_type = 'DUE';
292
            my $letter_type = 'DUE';
293
            $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},'0');
293
            $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},'0');
294
            my $titles = "";
294
            my $titles = "";
295
            my @issues;
295
            while ( my $item_info = $sth->fetchrow_hashref()) {
296
            while ( my $item_info = $sth->fetchrow_hashref()) {
297
                push( @issues, $item_info );
296
                $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
298
                $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
297
            }
299
            }
298
300
Lines 303-309 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
303
                                      branchcode     => $branchcode,
305
                                      branchcode     => $branchcode,
304
                                      biblionumber   => $item->biblionumber,
306
                                      biblionumber   => $item->biblionumber,
305
                                      itemnumber     => $upcoming->{'itemnumber'},
307
                                      itemnumber     => $upcoming->{'itemnumber'},
306
                                      substitute     => { 'items.content' => $titles },
308
                                      substitute     => {
309
                                          'items.content' => $titles,
310
                                          issue          => $issues[0],
311
                                      },
307
                                      message_transport_type => $transport,
312
                                      message_transport_type => $transport,
308
                                    } )
313
                                    } )
309
                    or warn "no letter of type '$letter_type' found for borrowernumber ".$upcoming->{'borrowernumber'}.". Please see sample_notices.sql";
314
                    or warn "no letter of type '$letter_type' found for borrowernumber ".$upcoming->{'borrowernumber'}.". Please see sample_notices.sql";
Lines 339-345 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
339
            my $letter_type = 'PREDUE';
344
            my $letter_type = 'PREDUE';
340
            $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},$borrower_preferences->{'days_in_advance'});
345
            $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},$borrower_preferences->{'days_in_advance'});
341
            my $titles = "";
346
            my $titles = "";
347
            my @issues;
342
            while ( my $item_info = $sth->fetchrow_hashref()) {
348
            while ( my $item_info = $sth->fetchrow_hashref()) {
349
                push( @issues, $item_info );
343
                $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
350
                $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
344
            }
351
            }
345
352
Lines 350-356 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
350
                                      branchcode     => $branchcode,
357
                                      branchcode     => $branchcode,
351
                                      biblionumber   => $item->biblionumber,
358
                                      biblionumber   => $item->biblionumber,
352
                                      itemnumber     => $upcoming->{'itemnumber'},
359
                                      itemnumber     => $upcoming->{'itemnumber'},
353
                                      substitute     => { 'items.content' => $titles },
360
                                      substitute     => {
361
                                          'items.content' => $titles,
362
                                          issue           => $issues[0],
363
                                      },
354
                                      message_transport_type => $transport,
364
                                      message_transport_type => $transport,
355
                                    } )
365
                                    } )
356
                    or warn "no letter of type '$letter_type' found for borrowernumber ".$upcoming->{'borrowernumber'}.". Please see sample_notices.sql";
366
                    or warn "no letter of type '$letter_type' found for borrowernumber ".$upcoming->{'borrowernumber'}.". Please see sample_notices.sql";
Lines 589-596 sub send_digests { Link Here
589
        });
599
        });
590
        my $titles = "";
600
        my $titles = "";
591
        my @itemnumbers;
601
        my @itemnumbers;
602
        my @issues;
592
        while ( my $item_info = $next_item_info->()) {
603
        while ( my $item_info = $next_item_info->()) {
593
            push @itemnumbers, $item_info->{itemnumber};
604
            push @itemnumbers, $item_info->{itemnumber};
605
            push( @issues, $item_info );
594
            $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
606
            $titles .= C4::Letters::get_item_content( { item => $item_info, item_content_fields => \@item_content_fields } );
595
        }
607
        }
596
608
Lines 599-607 sub send_digests { Link Here
599
                {
611
                {
600
                    letter_code    => $params->{letter_code},
612
                    letter_code    => $params->{letter_code},
601
                    borrowernumber => $borrowernumber,
613
                    borrowernumber => $borrowernumber,
614
                    issues         => \@issues,
602
                    substitute     => {
615
                    substitute     => {
603
                        count           => $count,
616
                        count           => $count,
604
                        'items.content' => $titles,
617
                        'items.content' => $titles,
618
                        issues          => \@issues,
605
                        %branch_info
619
                        %branch_info
606
                    },
620
                    },
607
                    itemnumbers    => \@itemnumbers,
621
                    itemnumbers    => \@itemnumbers,
608
- 

Return to bug 29100