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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+1 lines)
Lines 250-255 $(document).ready(function() { Link Here
250
250
251
		</li>
251
		</li>
252
		</ol>
252
		</ol>
253
		[% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %] 
253
		</fieldset>
254
		</fieldset>
254
		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
255
		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
255
		</form>
256
		</form>
(-)a/misc/cronjobs/advance_notices.pl (-3 / +30 lines)
Lines 259-268 PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) { Link Here
259
      my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
259
      my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
260
      $titles .= join("\t",@item_info) . "\n";
260
      $titles .= join("\t",@item_info) . "\n";
261
    }
261
    }
262
263
    ## Get branch info for borrowers home library.    
264
    my %branch_info = get_branch_info( $borrowernumber );
265
262
    $letter = parse_letter( { letter         => $letter,
266
    $letter = parse_letter( { letter         => $letter,
263
                              borrowernumber => $borrowernumber,
267
                              borrowernumber => $borrowernumber,
264
                              substitute     => { count => $count,
268
                              substitute     => { count => $count,
265
                                                  'items.content' => $titles
269
                                                  'items.content' => $titles,
270
                                                  %branch_info,
266
                                                }
271
                                                }
267
                         } );
272
                         } );
268
    if ($nomail) {
273
    if ($nomail) {
Lines 298-307 PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) { Link Here
298
      my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
303
      my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
299
      $titles .= join("\t",@item_info) . "\n";
304
      $titles .= join("\t",@item_info) . "\n";
300
    }
305
    }
306
307
    ## Get branch info for borrowers home library.    
308
    my %branch_info = get_branch_info( $borrowernumber );
309
301
    $letter = parse_letter( { letter         => $letter,
310
    $letter = parse_letter( { letter         => $letter,
302
                              borrowernumber => $borrowernumber,
311
                              borrowernumber => $borrowernumber,
303
                              substitute     => { count => $count,
312
                              substitute     => { count => $count,
304
                                                  'items.content' => $titles
313
                                                  'items.content' => $titles,
314
                                                  %branch_info,
305
                                                }
315
                                                }
306
                         } );
316
                         } );
307
317
Lines 359-364 sub parse_letter { Link Here
359
    return $params->{'letter'};
369
    return $params->{'letter'};
360
}
370
}
361
371
372
=head2 get_branch_info
373
374
=cut
375
376
sub get_branch_info {
377
    my ( $borrowernumber ) = @_;
378
    
379
    ## Get branch info for borrowers home library.    
380
    my $borrower_details = C4::Members::GetMemberDetails( $borrowernumber );
381
    my $borrower_branchcode = $borrower_details->{'branchcode'};
382
    my $branch = C4::Branch::GetBranchDetail( $borrower_branchcode );
383
    my %branch_info;
384
    foreach my $key( keys %$branch ) {
385
        $branch_info{"branches.$key"} = $branch->{$key};
386
    }
387
388
    return %branch_info;
389
}
362
1;
390
1;
363
391
364
__END__
392
__END__
365
- 

Return to bug 3383