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

(-)a/C4/Letters.pm (+3 lines)
Lines 120-128 my %letter; Link Here
120
sub getletter {
120
sub getletter {
121
    my ( $module, $code, $branchcode ) = @_;
121
    my ( $module, $code, $branchcode ) = @_;
122
122
123
    $branchcode |= '';
124
123
    if ( C4::Context->preference('IndependantBranches')
125
    if ( C4::Context->preference('IndependantBranches')
124
            and $branchcode
126
            and $branchcode
125
            and C4::Context->userenv ) {
127
            and C4::Context->userenv ) {
128
    
126
        $branchcode = C4::Context->userenv->{'branch'};
129
        $branchcode = C4::Context->userenv->{'branch'};
127
    }
130
    }
128
131
(-)a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl (-17 / +13 lines)
Lines 127-146 foreach my $type (@types) { Link Here
127
        my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
127
        my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
128
        my $due_date = $date->output('metric');
128
        my $due_date = $date->output('metric');
129
129
130
        # gets the placeholder message, and enqueues the letter
130
        my $letter = C4::Letters::GetPreparedLetter(
131
        my $letter = getletter( $module, $code );
131
            module      => $module,
132
        die "No letter found for type $type!... dying\n" unless $letter;
132
            letter_code => $code,
133
            tables      => {
134
                borrowers   => $issues->{'borrowernumber'},
135
                biblio      => $issues->{'biblionumber'},
136
                biblioitems => $issues->{'biblionumber'}
137
            },
138
        );
133
139
134
        # covers basic variable parsing in letter
140
        die "No letter found for type $type!... dying\n" unless $letter;
135
        $letter =
136
          C4::Letters::parseletter( $letter, 'borrowers',
137
            $issues->{'borrowernumber'} );
138
        $letter =
139
          C4::Letters::parseletter( $letter, 'biblio',
140
            $issues->{'biblionumber'} );
141
        $letter =
142
          C4::Letters::parseletter( $letter, 'biblioitems',
143
            $issues->{'biblionumber'} );
144
141
145
        my $message_id = 0;
142
        my $message_id = 0;
146
        if ($outfile) {
143
        if ($outfile) {
Lines 153-163 foreach my $type (@types) { Link Here
153
            );
150
            );
154
        }
151
        }
155
152
156
        print $OUT
153
        print OUT
157
"\"$format\",\"$language\",\"$type\",\"$issues->{level}\",\"$issues->{cardnumber}\",\"$issues->{patron_title}\",\"$issues->{firstname}\",";
154
"\"$format\",\"$language\",\"$type\",\"$issues->{level}\",\"$issues->{cardnumber}\",\"$issues->{patron_title}\",\"$issues->{firstname}\",";
158
        print $OUT
155
        print OUT
159
"\"$issues->{surname}\",\"$issues->{phone}\",\"$issues->{email}\",\"$library_code\",";
156
"\"$issues->{surname}\",\"$issues->{phone}\",\"$issues->{email}\",\"$library_code\",";
160
        print $OUT
157
        print OUT
161
"\"$issues->{site}\",\"$issues->{site_name}\",\"$issues->{barcode}\",\"$due_date\",\"$issues->{title}\",\"$message_id\"\n";
158
"\"$issues->{site}\",\"$issues->{site_name}\",\"$issues->{barcode}\",\"$due_date\",\"$issues->{title}\",\"$message_id\"\n";
162
    }
159
    }
163
}
160
}
164
- 

Return to bug 8606