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

(-)a/C4/Circulation.pm (-38 / +20 lines)
Lines 3315-3321 sub SendCirculationAlert { Link Here
3315
    my %message_name = (
3315
    my %message_name = (
3316
        CHECKIN  => 'Item_Check_in',
3316
        CHECKIN  => 'Item_Check_in',
3317
        CHECKOUT => 'Item_Checkout',
3317
        CHECKOUT => 'Item_Checkout',
3318
	RENEWAL  => 'Item_Checkout',
3318
        RENEWAL  => 'Item_Checkout',
3319
    );
3319
    );
3320
    my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
3320
    my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
3321
        borrowernumber => $borrower->{borrowernumber},
3321
        borrowernumber => $borrower->{borrowernumber},
Lines 3324-3366 sub SendCirculationAlert { Link Here
3324
    my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
3324
    my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
3325
3325
3326
    my @transports = keys %{ $borrower_preferences->{transports} };
3326
    my @transports = keys %{ $borrower_preferences->{transports} };
3327
    # warn "no transports" unless @transports;
3327
    for my $mtt (@transports) {
3328
    for (@transports) {
3328
        my $letter =  C4::Letters::GetPreparedLetter (
3329
        # warn "transport: $_";
3329
            module => 'circulation',
3330
        my $message = C4::Message->find_last_message($borrower, $type, $_);
3330
            letter_code => $type,
3331
        if (!$message) {
3331
            branchcode => $branch,
3332
            #warn "create new message";
3332
            message_transport_type => $mtt,
3333
            my $letter =  C4::Letters::GetPreparedLetter (
3333
            tables => {
3334
                module => 'circulation',
3334
                $issues_table => $item->{itemnumber},
3335
                letter_code => $type,
3335
                'items'       => $item->{itemnumber},
3336
                branchcode => $branch,
3336
                'biblio'      => $item->{biblionumber},
3337
                message_transport_type => $_,
3337
                'biblioitems' => $item->{biblionumber},
3338
                tables => {
3338
                'borrowers'   => $borrower,
3339
                    $issues_table => $item->{itemnumber},
3339
                'branches'    => $branch,
3340
                    'items'       => $item->{itemnumber},
3340
            }
3341
                    'biblio'      => $item->{biblionumber},
3341
        ) or next;
3342
                    'biblioitems' => $item->{biblionumber},
3342
3343
                    'borrowers'   => $borrower,
3343
        my $message = C4::Message->find_last_message($borrower, $type, $mtt);
3344
                    'branches'    => $branch,
3344
        unless ( $message ) {
3345
                }
3345
            C4::Message->enqueue($letter, $borrower, $mtt);
3346
            ) or next;
3347
            C4::Message->enqueue($letter, $borrower, $_);
3348
        } else {
3346
        } else {
3349
            #warn "append to old message";
3350
            my $letter =  C4::Letters::GetPreparedLetter (
3351
                module => 'circulation',
3352
                letter_code => $type,
3353
                branchcode => $branch,
3354
                message_transport_type => $_,
3355
                tables => {
3356
                    $issues_table => $item->{itemnumber},
3357
                    'items'       => $item->{itemnumber},
3358
                    'biblio'      => $item->{biblionumber},
3359
                    'biblioitems' => $item->{biblionumber},
3360
                    'borrowers'   => $borrower,
3361
                    'branches'    => $branch,
3362
                }
3363
            ) or next;
3364
            $message->append($letter);
3347
            $message->append($letter);
3365
            $message->update;
3348
            $message->update;
3366
        }
3349
        }
3367
- 

Return to bug 15854