[Koha-patches] [PATCH] =?utf-8?q?Bugzilla=20=E2=80=93=20Bug=201232=20=20=20=20Add=20Invoice/Credit/Fines=20Payed=20For=20Day=20on=20Issues
Darrell Ulm
darrellulm at kohavmware
Mon Jul 13 23:22:38 CEST 2009
---
.../prog/en/includes/circ-toolbar.inc | 9 ++++-
.../en/modules/members/moremember-receipt.tmpl | 33 ++++++++++++++++---
members/moremember.pl | 18 ++++++++---
3 files changed, 47 insertions(+), 13 deletions(-)
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 359e697..2ed8157 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 = [
@@ -90,6 +91,7 @@ function update_child() {
<!-- TMPL_ELSE--> new YAHOO.widget.Button("changepassword"); <!-- /TMPL_IF -->
new YAHOO.widget.Button("printslip");
new YAHOO.widget.Button("printpage");
+ new YAHOO.widget.Button("printquickslip");
new YAHOO.widget.Button("renewpatron");
<!-- TMPL_IF NAME="CAN_user_permissions" -->
<!-- TMPL_IF NAME="StaffMember" -->
@@ -102,6 +104,7 @@ function update_child() {
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->new YAHOO.widget.Button("deletepatron");<!-- /TMPL_UNLESS -->
<!-- TMPL_ELSE -->new YAHOO.widget.Button("deletepatron");<!-- /TMPL_IF -->
+
}
//]]>
@@ -142,5 +145,7 @@ function update_child() {
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_UNLESS NAME="CAN_user_staffaccess" --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li><!-- /TMPL_UNLESS -->
<!-- TMPL_ELSE --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li><!-- /TMPL_IF -->
-
+<!-- <li><a id="printquickslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&print=qslip">Quick Slip</a></li>
+-->
</ul></div>
+
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 f04e6ab..e37d24d 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,20 +18,24 @@ Checked out to <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL
<!-- TMPL_VAR NAME="todaysdate" --><br />
-<h4>Checked Out</h4>
+
+
+<!-- TMPL_IF name="quickslip" -->
+<h4>Checked Out Today</h4>
<!-- TMPL_loop name="issueloop" -->
<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
+<!-- TMPL_IF name="today" -->
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><br />
Barcode: <!-- TMPL_VAR NAME="barcode" --><br />
Date due: <!-- TMPL_VAR NAME="date_due" --><br /></p>
<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
-
-<!-- TMPL_IF NAME="overdues_exist" -->
-<h4>Overdues</h4>
- <!-- TMPL_LOOP NAME="issueloop" -->
- <!-- TMPL_IF NAME="red" -->
+<!-- TMPL_ELSE -->
+<h4>Checked Out</h4>
+<!-- TMPL_loop name="issueloop" -->
+<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><br />
Barcode: <!-- TMPL_VAR NAME="barcode" --><br />
Date due: <!-- TMPL_VAR NAME="date_due" --><br /></p>
@@ -40,4 +44,21 @@ Date due: <!-- TMPL_VAR NAME="date_due" --><br /></p>
<!-- /TMPL_IF -->
+<!-- TMPL_IF name="quickslip" -->
+<!-- TMPL_ELSE -->
+<!-- TMPL_IF name="overdues_exist" -->
+<h4>Overdues</h4>
+ <!-- TMPL_LOOP name="issueloop" -->
+ <!-- TMPL_IF name="red" -->
+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><br />
+Barcode: <!-- TMPL_VAR NAME="barcode" --><br />
+Date due: <!-- TMPL_VAR NAME="date_due" --></p>
+<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<p>Balance:  $<!-- TMPL_VAR NAME="totaldue" --></p>
+
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/members/moremember.pl b/members/moremember.pl
index 494121f..d2b1c17 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 %row = %{ $issue->[$i] };
@@ -230,7 +233,10 @@ 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 ) =
@@ -247,9 +253,10 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
$row{'can_confirm'} = ( !$renewokay && $renewerror ne 'on_reserve' );
$row{"norenew_reason_$renewerror"} = 1 if $renewerror;
$row{'renew_failed'} = $renew_failed{ $issue->[$i]{'itemnumber'} };
- $row{'return_failed'} = $return_failed{$issue->[$i]{'barcode'}};
- push( @issuedata, \%row );
-}
+ $row{'return_failed'} = $return_failed{$issue->[$i]{' barcode'}};
+ push( @issuedata, \%row );
+ }
+
### ###############################################################################
# BUILD HTML
@@ -373,7 +380,8 @@ $template->param(
# reserveloop => \@reservedata,
dateformat => C4::Context->preference("dateformat"),
"dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
- samebranch => $samebranch,
+ samebranch => $samebranch,
+ quickslip => $quickslip,
);
output_html_with_http_headers $input, $cookie, $template->output;
--
1.5.6.5
More information about the Koha-patches
mailing list