diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc index 359e6978ad..4306fceb90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -53,7 +53,8 @@ function update_child() { function yuiToolbar() { var printmenu = [ { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} }, - { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} } + { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} }, + { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} } ]; var moremenu = [ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 8da6db2067..dcd55a487e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -51,7 +51,8 @@ function update_child() { function yuiToolbar() { var printmenu = [ { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} }, - { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} } + { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} }, + { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} } ]; var moremenu = [ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl index f04e6ab4ed..a63e15d1ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl @@ -18,6 +18,19 @@ Checked out to
+ +

Checked Out Today

+ + + +

&biblionumber=&bi=">
+Barcode:
+Date due:

+ + + + +

Checked Out

@@ -27,17 +40,20 @@ Date due:

+ - + + +

Overdues

- - + +

&biblionumber=&bi=">
Barcode:
-Date due:

- - - +Date due:

+ + + diff --git a/members/moremember.pl b/members/moremember.pl index b0cab92447..d5040b6dba 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -73,9 +73,11 @@ my %return_failed; for my $failedret (@failedreturns) { $return_failed{$failedret} = 1; } my $template_name; +my $quickslip = 0; if ($print eq "page") { $template_name = "members/moremember-print.tmpl"; } elsif ($print eq "slip") { $template_name = "members/moremember-receipt.tmpl"; } +elsif ($print eq "qslip") { $template_name = "members/moremember-receipt.tmpl"; $quickslip = 1; } else { $template_name = "members/moremember.tmpl"; } my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -222,6 +224,7 @@ my $overdues_exist = 0; my $totalprice = 0; for ( my $i = 0 ; $i < $count ; $i++ ) { my $datedue = $issue->[$i]{'date_due'}; + my $issuedate = $issue->[$i]{'issuedate'}; $issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref'); $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref'); my $biblionumber = $issue->[$i]{'biblionumber'}; @@ -255,7 +258,11 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { if ( $datedue lt $today ) { $overdues_exist = 1; $row{'red'} = 1; - } + } + if ( $issuedate eq $today ) { + $row{'today'} = 1; + } + #find the charge for an item my ( $charge, $itemtype ) = GetIssuingCharges( $issue->[$i]{'itemnumber'}, $borrowernumber ); @@ -398,6 +405,7 @@ $template->param( dateformat => C4::Context->preference("dateformat"), "dateformat_" . (C4::Context->preference("dateformat") || '') => 1, samebranch => $samebranch, + quickslip => $quickslip, ); output_html_with_http_headers $input, $cookie, $template->output;