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

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

Return to bug 29100