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

(-)a/circ/circulation.pl (-1 / +11 lines)
Lines 425-437 my @previousissues; Link Here
425
## ADDED BY JF: new itemtype issuingrules counter stuff
425
## ADDED BY JF: new itemtype issuingrules counter stuff
426
my $issued_itemtypes_count;
426
my $issued_itemtypes_count;
427
my @issued_itemtypes_count_loop;
427
my @issued_itemtypes_count_loop;
428
my $totalprice = 0;
428
429
429
if ($borrower) {
430
if ($borrower) {
430
# get each issue of the borrower & separate them in todayissues & previous issues
431
# get each issue of the borrower & separate them in todayissues & previous issues
431
    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
432
    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
432
433
    # split in 2 arrays for today & previous
433
    # split in 2 arrays for today & previous
434
    foreach my $it ( @$issueslist ) {
434
    foreach my $it ( @$issueslist ) {
435
        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
435
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
436
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
436
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
437
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
437
438
Lines 447-454 if ($borrower) { Link Here
447
		$it->{'can_renew'} = $can_renew;
448
		$it->{'can_renew'} = $can_renew;
448
		$it->{'can_confirm'} = !$can_renew && !$restype;
449
		$it->{'can_confirm'} = !$can_renew && !$restype;
449
		$it->{'renew_error'} = $restype;
450
		$it->{'renew_error'} = $restype;
451
	    $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
450
452
453
	    $totalprice += $it->{'replacementprice'};
454
		$it->{'itemtype'} = $itemtypeinfo->{'description'};
455
		$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
451
        $it->{'dd'} = format_date($it->{'date_due'});
456
        $it->{'dd'} = format_date($it->{'date_due'});
457
        $it->{'issuedate'} = format_date($it->{'issuedate'});
452
        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
458
        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
453
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
459
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
454
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
460
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
Lines 619-624 foreach my $flag ( sort keys %$flags ) { Link Here
619
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
625
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
620
$amountold =~ s/^.*\$//;    # remove upto the $, if any
626
$amountold =~ s/^.*\$//;    # remove upto the $, if any
621
627
628
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
629
622
if ( $borrower->{'category_type'} eq 'C') {
630
if ( $borrower->{'category_type'} eq 'C') {
623
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
631
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
624
    my $cnt = scalar(@$catcodes);
632
    my $cnt = scalar(@$catcodes);
Lines 676-681 $template->param( Link Here
676
    duedatespec       => $duedatespec,
684
    duedatespec       => $duedatespec,
677
    message           => $message,
685
    message           => $message,
678
    CGIselectborrower => $CGIselectborrower,
686
    CGIselectborrower => $CGIselectborrower,
687
	totalprice => sprintf("%.2f", $totalprice),
688
    totaldue        => sprintf("%.2f", $total),
679
    todayissues       => \@todaysissues,
689
    todayissues       => \@todaysissues,
680
    previssues        => \@previousissues,
690
    previssues        => \@previousissues,
681
    inprocess         => $inprocess,
691
    inprocess         => $inprocess,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl (-51 / +174 lines)
Lines 21-27 $.tablesorter.addParser({ Link Here
21
		$.tablesorter.defaults.widgets = ['zebra'];
21
		$.tablesorter.defaults.widgets = ['zebra'];
22
		$("#issuest").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
22
		$("#issuest").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
24
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false}}
24
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
25
		});
25
		});
26
		$("#issuest").bind("sortEnd",function() {
26
		$("#issuest").bind("sortEnd",function() {
27
        	$("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
27
        	$("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
Lines 41-54 $.tablesorter.addParser({ Link Here
41
            }
41
            }
42
        } ).attr( 'checked', false );
42
        } ).attr( 'checked', false );
43
        <!-- /TMPL_IF -->
43
        <!-- /TMPL_IF -->
44
		$("td").click(function(e){
44
45
			if(e.target.tagName.toLowerCase() == 'td'){
45
var allcheckboxes = $(".checkboxed");
46
            $(this).find("input:checkbox").each( function() {
46
	$("#renew_all").click(function(){
47
                $(this).attr('checked', !$(this).attr('checked'));
47
		$(allcheckboxes).checkCheckboxes(":input[name*=items]"); 
48
            });
48
		$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]");
49
			}
49
	});
50
		});
50
	$("#return_all").click(function(){
51
		$(allcheckboxes).checkCheckboxes(":input[name*=barcodes]");
52
		$(allcheckboxes).unCheckCheckboxes(":input[name*=items]");
53
	});
54
	$("#CheckAllitems").click(function(){
55
		$(allcheckboxes).checkCheckboxes(":input[name*=items]");
56
		$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
57
	});
58
    $("#CheckNoitems").click(function(){
59
		$(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
60
	});
61
	$("#CheckAllreturns").click(function(){
62
		$(allcheckboxes).checkCheckboxes(":input[name*=barcodes]");
63
		$(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
64
	});
65
    $("#CheckNoreturns" ).click(function(){
66
		$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
67
	});
68
69
    <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
70
    <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
71
    $( '#override_limit' ).click( function () {
72
        if ( this.checked ) {
73
           $( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
74
        } else {
75
           $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
76
        }
77
    } ).attr( 'checked', false );
78
    <!-- /TMPL_IF -->
79
    <!-- /TMPL_IF -->
80
	$("td").click(function(e){
81
		if(e.target.tagName.toLowerCase() == 'td'){
82
           $(this).find("input:checkbox").each( function() {
83
               $(this).attr('checked', !$(this).attr('checked'));
84
			   if($(this).attr('checked')){
85
                    $(this).parent().siblings().find("input:checkbox").each(function(){
86
                       if($(this).attr('checked')){ $(this).attr('checked',''); }
87
                   });
88
			   }
89
           });
90
		}
91
	});
92
		
51
	 });
93
	 });
94
function uncheck_sibling(me){
95
nodename=me.getAttribute("name");
96
if (nodename =="barcodes[]"){
97
    var Node=me.parentNode.previousSibling;
98
    while (Node.nodeName!="TD"){Node=Node.previousSibling}
99
    var Nodes=Node.childNodes;
100
    for (var i=0;i<Nodes.length;i++){
101
      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
102
        Nodes[i].checked=false;
103
      }     
104
   }   
105
106
}else {
107
    var Node=me.parentNode.nextSibling;
108
    while (Node.nodeName!="TD"){Node=Node.nextSibling}
109
    var Nodes=Node.childNodes;
110
    for (var i=0;i<Nodes.length;i++){
111
      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
112
        Nodes[i].checked=false;
113
      }     
114
   }   
115
}
116
}
117
function validate1(date) {
118
    var today = new Date();
119
    if ( date < today ) {
120
        return true;
121
     } else {
122
        return false;
123
     }
124
};
125
function refocus(calendar) {
126
   document.getElementById('barcode').focus();
127
   calendar.hide();
128
};
52
//]]>
129
//]]>
53
</script>
130
</script>
54
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
131
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
Lines 428-434 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
428
            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
505
            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
429
    <!-- /TMPL_IF --></li>
506
    <!-- /TMPL_IF --></li>
430
<li><!-- TMPL_IF NAME="countreserv"-->
507
<li><!-- TMPL_IF NAME="countreserv"-->
431
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Holds(s)</a>
508
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Hold(s)</a>
432
    <!-- TMPL_ELSE -->
509
    <!-- TMPL_ELSE -->
433
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 Holds</a>
510
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 Holds</a>
434
    <!-- /TMPL_IF --></li>
511
    <!-- /TMPL_IF --></li>
Lines 438-460 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
438
<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
515
<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
439
<div id="checkouts">
516
<div id="checkouts">
440
<!--TMPL_IF NAME="issuecount"-->
517
<!--TMPL_IF NAME="issuecount"-->
441
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
518
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
442
    <input type="hidden" value="circ" name="destination" />
519
    <input type="hidden" value="circ" name="destination" />
443
    <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
520
    <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
444
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
521
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
445
    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
522
    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
446
        <table id="issuest">
523
        <table id="issuest">
447
    <thead><tr>
524
    <thead><tr>
448
        <th>Due date</th>
525
        <th scope="col">Due date</th>
449
        <th>Title</th>
526
        <th scope="col">Title</th>
450
        <th>Item Type</th>
527
        <th scope="col">Item Type</th>
451
        <th>Call no</th>
528
        <th scope="col">Checked out on</th> 
452
        <th>Barcode</th>
529
        <th scope="col">Call no</th>
453
        <th>Renewals</th>
530
        <th scope="col">Charge</th>
454
        <th>Renew?</th>
531
        <th scope="col">Price</th>
455
        <th>Check In?</th>
532
        <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
533
        <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
456
    </tr>
534
    </tr>
457
<!-- TMPL_IF NAME="todayissues" --></thead>
535
<!-- TMPL_IF NAME="todayissues" --></thead>
536
<tfoot>
537
		<tr>
538
            <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
539
			<td><!-- TMPL_VAR NAME="totaldue" --></td>
540
            <td><!-- TMPL_VAR NAME="totalprice" --></td>
541
            <td colspan="2">      
542
                <p>
543
                    Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
544
                    <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
545
 <script type="text/javascript"> //<![CDATA[
546
				//#TODO - ADD syspref (AllowPostDatedCheckouts).
547
                     Calendar.setup(
548
                          {
549
                             inputField : "newduedate",
550
                             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
551
                             button : "newduedate_button",
552
                             disableFunc : validate1,
553
                             dateStatusFunc : validate1,
554
                             onClose : refocus
555
                           }
556
                        );
557
				//]]>
558
				 </script>
559
                </p>
560
                <p>
561
                    <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
562
                </p>
563
            </td>
564
        </tr>
565
		</tfoot>
458
	<tbody>
566
	<tbody>
459
567
460
    <!-- TMPL_LOOP NAME="todayissues" -->
568
    <!-- TMPL_LOOP NAME="todayissues" -->
Lines 464-480 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
464
    <tr class="highlight">
572
    <tr class="highlight">
465
    <!-- /TMPL_IF -->
573
    <!-- /TMPL_IF -->
466
        <td><!-- TMPL_VAR NAME="dd" --></td>
574
        <td><!-- TMPL_VAR NAME="dd" --></td>
467
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --></td>
575
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
468
        <td>
576
        <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
469
            <!-- TMPL_VAR NAME="itemtype" -->
577
        <td><!-- TMPL_VAR NAME="checkoutdate" --></td>
470
           <!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" -->
471
            <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
472
            <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
473
        </td>
474
        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
578
        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
475
        <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
579
            <td><!-- TMPL_VAR NAME="charge" --></td>
476
        <td><!-- TMPL_VAR NAME="renewals" --></td>
580
            <td><!-- TMPL_VAR NAME="replacementprice" --></td>
477
        <td>
581
        <td><span style="padding: 0 1em;"><!-- TMPL_VAR NAME="renewals" --></span>
478
        <!-- TMPL_IF NAME="can_renew" -->
582
        <!-- TMPL_IF NAME="can_renew" -->
479
        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
583
        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
480
        <!-- TMPL_IF NAME="od" -->
584
        <!-- TMPL_IF NAME="od" -->
Lines 504-510 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
504
            <!-- /TMPL_IF -->
608
            <!-- /TMPL_IF -->
505
        <!-- /TMPL_IF -->
609
        <!-- /TMPL_IF -->
506
        </td>
610
        </td>
507
		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
611
  <!-- TMPL_IF NAME="return_failed" -->
612
            <td class="problem">Checkin Failed</td>
613
      <!--TMPL_ELSE-->
614
            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
615
                <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
616
            </td>
617
      <!-- /TMPL_IF -->
508
		<!-- TMPL_IF NAME="renew_failed" -->
618
		<!-- TMPL_IF NAME="renew_failed" -->
509
		<td>Renewal Failed</td>
619
		<td>Renewal Failed</td>
510
		<!-- /TMPL_IF -->
620
		<!-- /TMPL_IF -->
Lines 512-519 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
512
    <!-- /TMPL_LOOP --> <!-- /loop todayissues -->
622
    <!-- /TMPL_LOOP --> <!-- /loop todayissues -->
513
    <!-- /if todayissues --><!-- /TMPL_IF --> 
623
    <!-- /if todayissues --><!-- /TMPL_IF --> 
514
<!-- TMPL_IF NAME="previssues" -->
624
<!-- TMPL_IF NAME="previssues" -->
515
<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="8"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
625
<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
516
<tr><th class="{sorter: false}" colspan="8"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
626
<tr><th class="{sorter: false}" colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
517
	<tbody>
627
	<tbody>
518
<!-- /TMPL_IF -->
628
<!-- /TMPL_IF -->
519
    <!-- TMPL_LOOP NAME="previssues" -->
629
    <!-- TMPL_LOOP NAME="previssues" -->
Lines 525-541 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
525
        <!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
635
        <!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
526
        <!-- TMPL_VAR NAME="dd" -->
636
        <!-- TMPL_VAR NAME="dd" -->
527
        </td>
637
        </td>
528
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" escape="html" --></a><br /><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --></td>
638
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
529
        <td>
639
        <td>
530
            <!-- TMPL_VAR NAME="itemtype" -->
640
            <!-- TMPL_VAR NAME="itemtype" -->
531
            <!-- TMPL_IF NAME="itemtype_image" -->
532
            <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
533
            <!-- /TMPL_IF -->
534
        </td>
641
        </td>
642
        <td><!-- TMPL_VAR NAME="issuedate" --></td>
535
        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
643
        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
536
        <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
644
        <td><!-- TMPL_VAR NAME="charge" --></td>
537
        <td><!-- TMPL_VAR NAME="renewals" --></td>
645
        <td><!-- TMPL_VAR NAME="replacementprice" --></td>
538
        <td>
646
        <td><span style="padding: 0 1em;"><!-- TMPL_IF NAME="renewals" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF --></span>
539
        <!-- TMPL_IF NAME="can_renew" -->
647
        <!-- TMPL_IF NAME="can_renew" -->
540
        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
648
        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
541
        <!-- TMPL_IF NAME="od" -->
649
        <!-- TMPL_IF NAME="od" -->
Lines 565-571 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
565
            <!-- /TMPL_IF -->
673
            <!-- /TMPL_IF -->
566
        <!-- /TMPL_IF -->
674
        <!-- /TMPL_IF -->
567
        </td>
675
        </td>
568
		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
676
		      <!-- TMPL_IF NAME="return_failed" -->
677
            <td class="problem">Checkin Failed</td>
678
      <!--TMPL_ELSE-->
679
            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
680
                <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
681
            </td>
682
      <!-- /TMPL_IF -->
569
		<!-- TMPL_IF NAME="renew_failed" -->
683
		<!-- TMPL_IF NAME="renew_failed" -->
570
		<td>Renewal Failed</td>
684
		<td>Renewal Failed</td>
571
		<!-- /TMPL_IF -->
685
		<!-- /TMPL_IF -->
Lines 577-591 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
577
    </table>
691
    </table>
578
    <!--TMPL_IF NAME="issuecount"-->
692
    <!--TMPL_IF NAME="issuecount"-->
579
    <fieldset class="action">
693
    <fieldset class="action">
580
    <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
694
        <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
581
        <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
695
        <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
582
        <label for="override_limit">Override Renewal Limit:</label>
696
        <label for="override_limit">Override Renewal Limit:</label>
583
        <input type="checkbox" name="override_limit" id="override_limit" value="1" />
697
        <input type="checkbox" name="override_limit" id="override_limit" value="1" />
584
        <!-- /TMPL_IF -->
698
        <!-- /TMPL_IF -->
585
    <!-- /TMPL_IF -->
699
        <!-- /TMPL_IF -->
586
    <input type="submit" name="renew_checked" value="Renew Checked Items" />
700
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
587
    <input type="submit" name="renew_all" value="Renew All" />
701
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
588
    </fieldset>
702
        <input type="submit" id="return_all" name="return_all" value="Return all" />
703
        </fieldset>
589
    <!-- /TMPL_IF -->
704
    <!-- /TMPL_IF -->
590
</form>
705
</form>
591
<!-- TMPL_ELSE -->
706
<!-- TMPL_ELSE -->
Lines 596-616 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
596
711
597
<div id="reserves">
712
<div id="reserves">
598
<!-- TMPL_IF NAME="reservloop" -->
713
<!-- TMPL_IF NAME="reservloop" -->
714
<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
715
	<input type="hidden" name="from" value="circ" />
599
    <table id="holdst">
716
    <table id="holdst">
600
        <thead><tr>
717
        <thead><tr>
601
            <th>Hold date</th>
718
            <th>Hold date</th>
602
            <th>Title</th>
719
            <th>Title</th>
603
            <th>Item Type</th>
604
            <th>Call Number</th>
720
            <th>Call Number</th>
605
			<th>Barcode</th>
721
			<th>Barcode</th>
606
            <th>Priority</th>
722
            <th>Priority</th>
723
			<th>Delete?</th>
607
        </tr></thead>
724
        </tr></thead>
608
		<tbody>
725
		<tbody>
609
        <!-- TMPL_LOOP NAME="reservloop" -->
726
        <!-- TMPL_LOOP NAME="reservloop" -->
610
        <tr class="<!-- TMPL_VAR NAME="color" -->">
727
        <tr class="<!-- TMPL_VAR NAME="color" -->">
611
                    <td><!-- TMPL_VAR NAME="reservedate" --></td>
728
                    <td><!-- TMPL_VAR NAME="reservedate" --></td>
612
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
729
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
613
					<td><!-- TMPL_VAR NAME="itemtype" --></td>
614
                    <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
730
                    <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
615
					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
731
					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
616
                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
732
                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
Lines 621-635 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
621
                        <!-- TMPL_IF name="nottransfered" --> hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
737
                        <!-- TMPL_IF name="nottransfered" --> hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
622
                        <!-- /TMPL_IF --></em></td>
738
                        <!-- /TMPL_IF --></em></td>
623
                    <td>
739
                    <td>
624
                        <!-- TMPL_IF NAME="waitingposition" -->
740
                        <!-- TMPL_IF NAME="waitingposition" --><b> <!-- TMPL_VAR NAME="waitingposition" --> </b><!-- /TMPL_IF -->
625
                        Hold priority
626
                        <b> <!-- TMPL_VAR NAME="waitingposition" --> </b><!-- /TMPL_IF -->
627
                    </td>
741
                    </td>
742
				<td><select name="rank-request">
743
                    <option value="n">No</option>
744
                    <option value="del">Yes</option>
745
                </select>
746
                <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
747
                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
748
            </td>
628
            </tr>
749
            </tr>
629
        <!-- /TMPL_LOOP --></tbody>
750
        <!-- /TMPL_LOOP --></tbody>
630
    </table>
751
    </table>
752
	        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
753
    </form>
631
	<!-- TMPL_ELSE -->
754
	<!-- TMPL_ELSE -->
632
	<p>Patron has no pending holds.</p>
755
	<p>Patron has nothing on hold.</p>
633
<!-- /TMPL_IF -->
756
<!-- /TMPL_IF -->
634
</div> <!-- reservesloop -->
757
</div> <!-- reservesloop -->
635
758
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl (-24 / +22 lines)
Lines 14-23 $.tablesorter.addParser({ Link Here
14
});
14
});
15
$(document).ready(function() {
15
$(document).ready(function() {
16
	$('#finesholdsissues > ul').tabs();
16
	$('#finesholdsissues > ul').tabs();
17
	$.tablesorter.defaults.widgets = ['zebra'];
17
	$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
18
	$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
18
		dateFormat: 'uk',<!-- /TMPL_IF -->
19
		dateFormat: 'uk',<!-- /TMPL_IF -->
19
		sortList: [[1,0]],
20
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
20
		headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false},7:{sorter:false}}
21
	}); 
21
	}); 
22
	$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
22
	$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
23
		dateFormat: 'uk',<!-- /TMPL_IF -->
Lines 363-375 if (nodename =="barcodes[]"){ Link Here
363
363
364
<div id="finesholdsissues" class="toptabs">
364
<div id="finesholdsissues" class="toptabs">
365
	<ul>
365
	<ul>
366
		<li><a href="#checkedout">Checked Out</a></li>
366
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout"><!-- TMPL_VAR NAME="issuecount"--> Checkout(s)</a></li>
367
		<li><a href="#finesandcharges">Fines &amp; Charges</a></li>
367
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
368
		<li><a href="#onhold">On Hold</a></li>
368
		<li><!-- TMPL_IF NAME="countreserv"-->
369
            <a href="/cgi-bin/koha/members/moremember.pl#onhold"><!--TMPL_VAR NAME="countreserv"--> Hold(s)</a>
370
    <!-- TMPL_ELSE -->
371
            <a href="/cgi-bin/koha/members/moremember.pl#onhold">0 Holds</a>
372
    <!-- /TMPL_IF --></li>
369
	</ul>
373
	</ul>
370
	
374
	
371
<div id="finesandcharges">
375
<div id="finesandcharges">
372
    <h2>Fines and Charges</h2>
373
    <!-- TMPL_IF NAME="totaldue_raw" -->
376
    <!-- TMPL_IF NAME="totaldue_raw" -->
374
        <p>Total due: <!-- TMPL_VAR NAME="totaldue" --></p>
377
        <p>Total due: <!-- TMPL_VAR NAME="totaldue" --></p>
375
    <!-- TMPL_ELSE -->
378
    <!-- TMPL_ELSE -->
Lines 378-384 if (nodename =="barcodes[]"){ Link Here
378
</div>
381
</div>
379
382
380
<div id="checkedout">
383
<div id="checkedout">
381
    <h2>Checked Out</h2>
382
    <!-- TMPL_IF NAME="issueloop" -->
384
    <!-- TMPL_IF NAME="issueloop" -->
383
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
385
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
384
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
386
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
Lines 386-403 if (nodename =="barcodes[]"){ Link Here
386
    <table id="issuest">
388
    <table id="issuest">
387
    <thead>
389
    <thead>
388
		<tr>
390
		<tr>
389
            <th scope="col">Item Type</th>
391
            <th scope="col">Due date</th>
390
            <th scope="col">Title</th>
392
            <th scope="col">Title</th>
393
            <th scope="col">Item Type</th>
391
            <th scope="col">Checked out on</th> 
394
            <th scope="col">Checked out on</th> 
392
            <th scope="col">Date due</th>
395
        <th scope="col">Call no</th>
393
            <th scope="col">Charge</th>
396
            <th scope="col">Charge</th>
394
            <th scope="col">Price</th>
397
            <th scope="col">Price</th>
395
            <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
398
            <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
396
            <th scope="col">Return <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
399
            <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
397
        </tr></thead>
400
        </tr></thead>
398
    	<tfoot>
401
    	<tfoot>
399
		<tr>
402
		<tr>
400
            <td colspan="4" style="text-align: right; font-weight:bold;">Totals:</td>
403
            <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
401
			<td><!-- TMPL_VAR NAME="totaldue" --></td>
404
			<td><!-- TMPL_VAR NAME="totaldue" --></td>
402
            <td><!-- TMPL_VAR NAME="totalprice" --></td>
405
            <td><!-- TMPL_VAR NAME="totalprice" --></td>
403
            <td colspan="2">      
406
            <td colspan="2">      
Lines 415-421 if (nodename =="barcodes[]"){ Link Here
415
                    </script>
418
                    </script>
416
                </p>
419
                </p>
417
                <p>
420
                <p>
418
                    Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" />
421
                    <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
419
                </p>
422
                </p>
420
            </td>
423
            </td>
421
        </tr>
424
        </tr>
Lines 428-440 if (nodename =="barcodes[]"){ Link Here
428
          <!-- TMPL_ELSE -->
431
          <!-- TMPL_ELSE -->
429
          <tr>
432
          <tr>
430
          <!-- /TMPL_IF -->
433
          <!-- /TMPL_IF -->
431
		  <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" -->
434
		  <td<!-- TMPL_IF NAME="red" --> class="od"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="date_due" -->
432
                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" />
433
                <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
434
                <!-- TMPL_VAR NAME="itemtype_description" --></td>
435
            <td><!-- TMPL_IF NAME="red" --><a class="overdue" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html"--></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
436
            <td><!-- TMPL_VAR NAME="issuedate" --></td>
437
            <td><!-- TMPL_IF NAME="red" --><span class="overdue"><!-- TMPL_VAR NAME="date_due" --></span><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="date_due" --><!-- /TMPL_IF -->
438
                <!-- TMPL_IF NAME="itemlost" -->
435
                <!-- TMPL_IF NAME="itemlost" -->
439
                                        <span class="lost"><!-- TMPL_VAR NAME="itemlost" --></span>
436
                                        <span class="lost"><!-- TMPL_VAR NAME="itemlost" --></span>
440
                    <!-- /TMPL_IF -->
437
                    <!-- /TMPL_IF -->
Lines 442-453 if (nodename =="barcodes[]"){ Link Here
442
                                        <span class="dmg"><!-- TMPL_VAR NAME="itemdamaged" --></span>
439
                                        <span class="dmg"><!-- TMPL_VAR NAME="itemdamaged" --></span>
443
                <!-- /TMPL_IF -->
440
                <!-- /TMPL_IF -->
444
</td>
441
</td>
442
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
443
<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype_description" --></td>
444
            <td><!-- TMPL_VAR NAME="issuedate" --></td>
445
	        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
445
            <td><!-- TMPL_VAR NAME="charge" --></td>
446
            <td><!-- TMPL_VAR NAME="charge" --></td>
446
            <td><!-- TMPL_VAR NAME="replacementprice" --></td>
447
            <td><!-- TMPL_VAR NAME="replacementprice" --></td>
447
      <!-- TMPL_IF NAME="renew_failed" -->
448
      <!-- TMPL_IF NAME="renew_failed" -->
448
            <td class="problem">Renewal Failed</td>
449
            <td class="problem">Renewal Failed</td>
449
      <!-- TMPL_ELSE -->
450
      <!-- TMPL_ELSE -->
450
            <td>
451
            <td><span style="padding: 0 1em;"><!-- TMPL_VAR NAME="renewals" --></span>
451
            <!-- TMPL_IF name="norenew" -->
452
            <!-- TMPL_IF name="norenew" -->
452
                <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
453
                <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
453
                    <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
454
                    <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
Lines 479-485 if (nodename =="barcodes[]"){ Link Here
479
            </td>
480
            </td>
480
      <!-- /TMPL_IF -->
481
      <!-- /TMPL_IF -->
481
      <!-- TMPL_IF NAME="return_failed" -->
482
      <!-- TMPL_IF NAME="return_failed" -->
482
            <td class="problem">Return Failed</td>
483
            <td class="problem">Checkin Failed</td>
483
      <!--TMPL_ELSE-->
484
      <!--TMPL_ELSE-->
484
            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
485
            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
485
                <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
486
                <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
Lines 504-510 if (nodename =="barcodes[]"){ Link Here
504
	</div>
505
	</div>
505
	
506
	
506
<div id="onhold">
507
<div id="onhold">
507
	<h2>Patron current holds</h2>
508
<!-- TMPL_IF NAME="reservloop" -->
508
<!-- TMPL_IF NAME="reservloop" -->
509
<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
509
<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
510
	<input type="hidden" name="from" value="borrower" />
510
	<input type="hidden" name="from" value="borrower" />
Lines 512-518 if (nodename =="barcodes[]"){ Link Here
512
		<thead><tr>
512
		<thead><tr>
513
			<th>Hold date</th>
513
			<th>Hold date</th>
514
			<th>Title</th>
514
			<th>Title</th>
515
			<th>Item Type</th>
516
			<th>Call Number</th>
515
			<th>Call Number</th>
517
			<th>Barcode</th>
516
			<th>Barcode</th>
518
			<th>Priority</th>
517
			<th>Priority</th>
Lines 524-530 if (nodename =="barcodes[]"){ Link Here
524
            <td>
523
            <td>
525
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
524
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
526
            </td>
525
            </td>
527
            <td><!-- TMPL_VAR NAME="itemtype" --></td>
528
            <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
526
            <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
529
            <td><!-- TMPL_IF name="waiting" -->
527
            <td><!-- TMPL_IF name="waiting" -->
530
                <em>Item is <strong>waiting</strong></em>
528
                <em>Item is <strong>waiting</strong></em>
(-)a/members/moremember.pl (-3 / +6 lines)
Lines 216-228 $template->param( lib2 => $lib2 ) if ($lib2); Link Here
216
# current issues
216
# current issues
217
#
217
#
218
my $issue = GetPendingIssues($borrowernumber);
218
my $issue = GetPendingIssues($borrowernumber);
219
my $count = scalar(@$issue);
219
my $issuecount = scalar(@$issue);
220
my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
220
my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
221
my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
221
my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
222
my @issuedata;
222
my @issuedata;
223
my $overdues_exist = 0;
223
my $overdues_exist = 0;
224
my $totalprice = 0;
224
my $totalprice = 0;
225
for ( my $i = 0 ; $i < $count ; $i++ ) {
225
for ( my $i = 0 ; $i < $issuecount ; $i++ ) {
226
    my $datedue = $issue->[$i]{'date_due'};
226
    my $datedue = $issue->[$i]{'date_due'};
227
    my $issuedate = $issue->[$i]{'issuedate'};
227
    my $issuedate = $issue->[$i]{'issuedate'};
228
    $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
228
    $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
Lines 347-353 if ($borrowernumber) { Link Here
347
    }
347
    }
348
348
349
    # return result to the template
349
    # return result to the template
350
    $template->param( reservloop => \@reservloop );
350
    $template->param( reservloop => \@reservloop,
351
        countreserv => scalar @reservloop,
352
	 );
351
}
353
}
352
354
353
# current alert subscriptions
355
# current alert subscriptions
Lines 396-401 $template->param( Link Here
396
    totaldue        => sprintf("%.2f", $total),
398
    totaldue        => sprintf("%.2f", $total),
397
    totaldue_raw    => $total,
399
    totaldue_raw    => $total,
398
    issueloop       => \@issuedata,
400
    issueloop       => \@issuedata,
401
	issuecount => $issuecount,
399
    overdues_exist  => $overdues_exist,
402
    overdues_exist  => $overdues_exist,
400
    error           => $error,
403
    error           => $error,
401
    $error          => 1,
404
    $error          => 1,
(-)a/reserve/modrequest.pl (-1 / +2 lines)
Lines 72-77 else { Link Here
72
my $from=$query->param('from');
72
my $from=$query->param('from');
73
if ($from eq 'borrower'){
73
if ($from eq 'borrower'){
74
  print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
74
  print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
75
 } elsif ($from eq 'circ'){
76
  print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
75
 } else {
77
 } else {
76
     my $url = "/cgi-bin/koha/reserve/request.pl?";
78
     my $url = "/cgi-bin/koha/reserve/request.pl?";
77
     if ($multi_hold) {
79
     if ($multi_hold) {
78
- 

Return to bug 3106