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

(-)a/C4/Circulation.pm (-38 / +20 lines)
Lines 3358-3364 sub SendCirculationAlert { Link Here
3358
    my %message_name = (
3358
    my %message_name = (
3359
        CHECKIN  => 'Item_Check_in',
3359
        CHECKIN  => 'Item_Check_in',
3360
        CHECKOUT => 'Item_Checkout',
3360
        CHECKOUT => 'Item_Checkout',
3361
	RENEWAL  => 'Item_Checkout',
3361
        RENEWAL  => 'Item_Checkout',
3362
    );
3362
    );
3363
    my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
3363
    my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
3364
        borrowernumber => $borrower->{borrowernumber},
3364
        borrowernumber => $borrower->{borrowernumber},
Lines 3367-3409 sub SendCirculationAlert { Link Here
3367
    my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
3367
    my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
3368
3368
3369
    my @transports = keys %{ $borrower_preferences->{transports} };
3369
    my @transports = keys %{ $borrower_preferences->{transports} };
3370
    # warn "no transports" unless @transports;
3370
    for my $mtt (@transports) {
3371
    for (@transports) {
3371
        my $letter =  C4::Letters::GetPreparedLetter (
3372
        # warn "transport: $_";
3372
            module => 'circulation',
3373
        my $message = C4::Message->find_last_message($borrower, $type, $_);
3373
            letter_code => $type,
3374
        if (!$message) {
3374
            branchcode => $branch,
3375
            #warn "create new message";
3375
            message_transport_type => $mtt,
3376
            my $letter =  C4::Letters::GetPreparedLetter (
3376
            tables => {
3377
                module => 'circulation',
3377
                $issues_table => $item->{itemnumber},
3378
                letter_code => $type,
3378
                'items'       => $item->{itemnumber},
3379
                branchcode => $branch,
3379
                'biblio'      => $item->{biblionumber},
3380
                message_transport_type => $_,
3380
                'biblioitems' => $item->{biblionumber},
3381
                tables => {
3381
                'borrowers'   => $borrower,
3382
                    $issues_table => $item->{itemnumber},
3382
                'branches'    => $branch,
3383
                    'items'       => $item->{itemnumber},
3383
            }
3384
                    'biblio'      => $item->{biblionumber},
3384
        ) or next;
3385
                    'biblioitems' => $item->{biblionumber},
3385
3386
                    'borrowers'   => $borrower,
3386
        my $message = C4::Message->find_last_message($borrower, $type, $mtt);
3387
                    'branches'    => $branch,
3387
        unless ( $message ) {
3388
                }
3388
            C4::Message->enqueue($letter, $borrower, $mtt);
3389
            ) or next;
3390
            C4::Message->enqueue($letter, $borrower, $_);
3391
        } else {
3389
        } else {
3392
            #warn "append to old message";
3393
            my $letter =  C4::Letters::GetPreparedLetter (
3394
                module => 'circulation',
3395
                letter_code => $type,
3396
                branchcode => $branch,
3397
                message_transport_type => $_,
3398
                tables => {
3399
                    $issues_table => $item->{itemnumber},
3400
                    'items'       => $item->{itemnumber},
3401
                    'biblio'      => $item->{biblionumber},
3402
                    'biblioitems' => $item->{biblionumber},
3403
                    'borrowers'   => $borrower,
3404
                    'branches'    => $branch,
3405
                }
3406
            ) or next;
3407
            $message->append($letter);
3390
            $message->append($letter);
3408
            $message->update;
3391
            $message->update;
3409
        }
3392
        }
3410
- 

Return to bug 15854