Bugzilla – Attachment 29713 Details for
Bug 6427
Rewrite of the accounts system
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6427 - Update existing intranet scripts
Bug-6427---Update-existing-intranet-scripts.patch (text/plain), 22.95 KB, created by
Kyle M Hall (khall)
on 2014-07-15 16:07:48 UTC
(
hide
)
Description:
Bug 6427 - Update existing intranet scripts
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-07-15 16:07:48 UTC
Size:
22.95 KB
patch
obsolete
>From ef80a7a5fb6293e6063623f092bbe694f701e1b4 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 15 Jul 2014 10:59:03 -0400 >Subject: [PATCH] Bug 6427 - Update existing intranet scripts > >--- > circ/add_message.pl | 5 - > circ/branchoverdues.pl | 3 +- > circ/circulation.pl | 4 +- > circ/del_message.pl | 5 - > .../prog/en/includes/browser-strings.inc | 33 ++++++++ > .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- > .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- > .../intranet-tmpl/prog/en/includes/datatables.inc | 1 + > .../prog/en/includes/members-menu.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 24 ++++++ > .../prog/en/modules/circ/circulation-home.tt | 1 - > .../prog/en/modules/circ/circulation.tt | 7 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- > .../prog/en/modules/help/reports/guided_reports.tt | 18 ----- > .../prog/en/modules/members/moremember-print.tt | 79 +++++++++++++------- > .../prog/en/modules/reports/reports-home.tt | 1 - > members/moremember.pl | 25 +++--- > offline_circ/enqueue_koc.pl | 1 - > offline_circ/process_koc.pl | 12 ++- > 19 files changed, 141 insertions(+), 86 deletions(-) > >diff --git a/circ/add_message.pl b/circ/add_message.pl >index 9c39dc9..1f34020 100755 >--- a/circ/add_message.pl >+++ b/circ/add_message.pl >@@ -26,11 +26,6 @@ use C4::Context; > use C4::Auth; > use C4::Output; > use C4::Members; >-use C4::Accounts; >-use C4::Stats; >-use C4::Koha; >-use C4::Overdues; >-use C4::Branch; # GetBranches > > my $input = new CGI; > >diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl >index 31e2b44..24b150c 100755 >--- a/circ/branchoverdues.pl >+++ b/circ/branchoverdues.pl >@@ -49,9 +49,8 @@ use Data::Dumper; > level 3 : only methode is possible : - Considered Lost > > the documents displayed on this interface, are checked on three points >- - 1) the document must be on accountlines (Type 'FU') >+ - 1) the document must be overdue with fines > - 2) item issues is not returned >- - 3) this item as not been already notify > > FIXME: who is the author? > FIXME: No privisions (i.e. "actions") for handling notices are implemented. >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 81737ee..32be2f1 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -467,8 +467,6 @@ foreach my $flag ( sort keys %$flags ) { > my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0; > $amountold =~ s/^.*\$//; # remove upto the $, if any > >-my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); >- > if ( $borrowernumber && $borrower->{'category_type'} eq 'C') { > my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); > my $cnt = scalar(@$catcodes); >@@ -543,7 +541,7 @@ $template->param( > duedatespec => $duedatespec, > message => $message, > CGIselectborrower => $CGIselectborrower, >- totaldue => sprintf('%.2f', $total), >+ totaldue => sprintf('%.2f', $borrower->{account_balance}), > inprocess => $inprocess, > is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'), > circview => 1, >diff --git a/circ/del_message.pl b/circ/del_message.pl >index da13bdb..77745b2 100755 >--- a/circ/del_message.pl >+++ b/circ/del_message.pl >@@ -26,11 +26,6 @@ use C4::Context; > use C4::Auth; > use C4::Output; > use C4::Members; >-use C4::Accounts; >-use C4::Stats; >-use C4::Koha; >-use C4::Overdues; >-use C4::Branch; # GetBranches > > my $input = new CGI; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc >index 3dda230..01a06a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc >@@ -1,7 +1,40 @@ >+[% USE AuthorisedValues %] > <script type="text/javascript"> > //<![CDATA[ > var BROWSER_RETURN_TO_SEARCH = _("Return to results"); > var BROWSER_PREVIOUS = _("Previous"); > var BROWSER_NEXT = _("Next"); >+ >+ var STRINGS = { >+ "DebitTypes": { >+ "FINE" : _("Fine"), >+ "ACCOUNT_MANAGEMENT_FEE" : _("Account management fee"), >+ "SUNDRY" : _("Sundry"), >+ "LOST" : _("Lost item"), >+ "HOLD" : _("Hold fee"), >+ "RENTAL" : _("Rental fee"), >+ "NEW_CARD" : _("New card"), >+ [% FOREACH a IN AuthorisedValues.Get('MANUAL_INV') %] >+ "[% a.authorised_value %]" : "[% a.lib %]", >+ [% END %] >+ }, >+ >+ "CreditTypes": { >+ "CREDIT" : _("Credit"), >+ "PAYMENT" : _("Payment"), >+ "WRITEOFF" : _("Writeoff"), >+ "FOUND" : _("Lost item found"), >+ "FORGIVEN" : _("Forgiven"), >+ [% FOREACH a IN AuthorisedValues.Get('MANUAL_CREDIT') %] >+ "[% a.authorised_value %]" : "[% a.lib %]", >+ [% END %] >+ }, >+ >+ "OffsetTypes": { >+ "DROPBOX" : _("Dropbox fine reduction"), >+ "FINE" : _("Fine increment"), >+ "VOID" : _("Voided"), >+ }, >+ } > //]]> > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index 7505d06..bee1652 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -67,7 +67,7 @@ > [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li> > [% END %] > [% IF ( CAN_user_updatecharges ) %] >- [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li> >+ [% IF ( accounts_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Fines</a></li> > [% END %] > [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %] > [% IF ( intranetreadinghistory ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt >index e98f846..e7b3cb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt >@@ -70,7 +70,7 @@ in the global namespace %] > [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">Details</a></li> > [% END %] > [% IF ( CAN_user_updatecharges ) %] >- [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Fines</a></li> >+ [% IF ( accounts_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrower.borrowernumber %]">Fines</a></li> > [% END %] > [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrower.borrowernumber %]">Routing lists</a></li>[% END %] > [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrower.borrowernumber %]">Circulation history</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >index 44d8277..1d038de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >@@ -1,4 +1,5 @@ > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/TableTools/media/js/TableTools.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc >index 9bd5285..9208e17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc >@@ -4,7 +4,7 @@ > [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li> > [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li> > [% IF ( CAN_user_updatecharges ) %] >- [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li> >+ [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Fines</a></li> > [% END %] > [% IF ( intranetreadinghistory ) %] > [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >index c1224f0..34d8353 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >@@ -28,6 +28,30 @@ var dataTablesDefaults = { > "iDisplayLength": 20 > }; > >+// Set the classes that TableTools uses to something suitable for Bootstrap >+$.extend( true, $.fn.DataTable.TableTools.classes, { >+ "container": "btn-group", >+ "buttons": { >+ "normal": "btn btn-small", >+ "disabled": "btn btn-small disabled" >+ }, >+ "collection": { >+ "container": "DTTT_dropdown dropdown-menu", >+ "buttons": { >+ "normal": "", >+ "disabled": "disabled" >+ } >+ } >+} ); >+ >+// Have the collection use a bootstrap compatible dropdown >+$.extend( true, $.fn.DataTable.TableTools.DEFAULTS.oTags, { >+ "collection": { >+ "container": "ul", >+ "button": "li", >+ "liner": "a" >+ } >+} ); > > // Return an array of string containing the values of a particular column > $.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index e5eaddc..6a58ae8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -45,7 +45,6 @@ > - <b>Warning:</b> This report is very resource intensive on > systems with large numbers of overdue items.</li>[% END %] > <li> <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a> - Limited to your library. See report help for other details.</li> >-<!-- <li> <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li> --> > </ul> > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index d573ba4..9c4b858 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,5 +1,6 @@ > [% USE Branches %] > [% USE KohaDates %] >+[% USE Currency %] > [% IF ( export_remove_fields OR export_with_csv_profile ) %] > [% SET exports_enabled = 1 %] > [% END %] >@@ -574,16 +575,16 @@ No patron matched <span class="ex">[% message %]</span> > > [% IF ( charges ) %] > <li> >- <span class="circ-hlt">Fees & Charges:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>. >+ <span class="circ-hlt">Fees & Charges:</span> Patron has <a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount | $Currency %][% END %]</a>. > [% IF ( charges_is_blocker ) %] > Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>. > [% END %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a></li> >+ <a href="/cgi-bin/koha/members/account_payment.pl?borrowernumber=[% borrowernumber %]">Make payment</a></li> > [% END %] > > [% IF ( credits ) %] > <li> >- <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount %][% END %] >+ <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Currency %][% END %] > </li> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 5e67044..75aa4bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -116,7 +116,7 @@ $(document).ready(function () { > [% IF ( fines ) %] > <div class="dialog alert"> > <h3>Patron has outstanding fines of [% fines %].</h3> >- <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber %]">Make payment</a>.</p> >+ <p><a href="/cgi-bin/koha/members/account_payment.pl?borrowernumber=[% fineborrowernumber %]">Make payment</a>.</p> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt >index 9d08f7d..31ef70e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt >@@ -108,24 +108,6 @@ > > <h3>DB table value for reports</h3> > >-<p><strong>Question:</strong> What do the codes in the accounttype field in the accountlines table stand for?</p> >- >-<p><strong>Answer:</strong></p> >- >-<ul> >- <li>A = Account management fee</li> >- <li>C = Credit</li> >- <li>F = Overdue fine</li> >- <li>FOR = Forgiven</li> >- <li>FU = Overdue, still acccruing</li> >- <li>L = Lost item</li> >- <li>LR = Lost item returned/refunded</li> >- <li>M = Sundry</li> >- <li>N = New card</li> >- <li>PAY = Payment</li> >- <li>W = Writeoff</li> >-</ul> >- > <p><strong>Question:</strong> What are the possible codes for the type field in the statistics table?</p> > > <p><strong>Answer:</strong></p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index 4c71072..675b6a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -1,5 +1,6 @@ > [% USE Koha %] > [% USE KohaDates %] >+[% USE Currency %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >@@ -87,35 +88,57 @@ > </table> > [% END %] > >-[% IF ( accounts && ( totaldue != '0.00' ) ) %] >-<table> >- <caption>Account fines and payments</caption> >- <tr> >- <th>Description of charges</th> >- <th>Date</th> >- <th>Amount</th> >- <th>Outstanding</th> >- </tr> >- [% FOREACH account IN accounts %] >- [% NEXT IF account.amountoutstanding == '0.00' %] >- <tr> >- <td> >- [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">[% END %] >- [% account.description %] [% IF ( account.printtitle ) %] [% account.title |html %][% END %] >- [% IF ( account.itemnumber ) %]</a>[% END %] >- </td> >- <td>[% account.date | $KohaDates %]</td> >- <td>[% account.amount %]</td> >- <td>[% account.amountoutstanding %]</td> >- </tr> >+[% IF account_balance %] >+ [% IF account_debits %] >+ <table> >+ <caption>Account fees</caption> >+ <tr> >+ <th>Description</th> >+ <th>Date</th> >+ <th>Amount</th> >+ <th>Outstanding</th> >+ </tr> >+ [% FOREACH d IN account_debits %] >+ [% IF d.amount_outstanding > 0 %] >+ <tr> >+ <td>[% d.description %]</td> >+ <td>[% d.created_on | $KohaDates %]</td> >+ <td>[% d.amount_original | $Currency %]</td> >+ <td>[% d.amount_outstanding | $Currency %]</td> >+ </tr> >+ [% END %] >+ [% END %] >+ <tfoot> >+ <tr> >+ <td colspan="3">Total due</td> >+ <td colspan="2">[% totaldue | $Currency %]</td> >+ </tr> >+ </tfoot> >+ </table> >+ [% END %] >+ >+ [% FOREACH c IN account_credits %] >+ [% total_remaining = total_remaining + c.amount_remaining %] >+ [% END %] >+ [% IF total_remaining %] >+ <table> >+ <caption>Account payments</caption> >+ <tr> >+ <th>Date</th> >+ <th>Amount</th> >+ <th>Balance remaining</th> >+ </tr> >+ [% FOREACH c IN account_credits %] >+ [% IF c.amount_remaining > 0 %] >+ <tr> >+ <td>[% c.created_on | $KohaDates %]</td> >+ <td>[% c.amount_paid | $Currency %]</td> >+ <td>[% c.amount_remaining | $Currency %]</td> >+ </tr> >+ [% END %] >+ [% END %] >+ </table> > [% END %] >- <tfoot> >- <tr> >- <td colspan="3">Total due</td> >- <td colspan="2">[% totaldue %]</td> >- </tr> >- </tfoot> >-</table> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index c7744fa..2197e10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >@@ -65,7 +65,6 @@ > <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li> > <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li> > <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li> >- <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till reconciliation</a></li> --> > </ul></div> > </div> > >diff --git a/members/moremember.pl b/members/moremember.pl >index 72e97b1..8f00aa1 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -220,23 +220,24 @@ else { > my $branchdetail = GetBranchDetail( $data->{'branchcode'}); > @{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns > >-my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); > my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} ); > my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} ); > $template->param( lib1 => $lib1 ) if ($lib1); > $template->param( lib2 => $lib2 ) if ($lib2); > > # If printing a page, send the account informations to the template >-if ($print eq "page") { >- foreach my $accountline (@$accts) { >- $accountline->{amount} = sprintf '%.2f', $accountline->{amount}; >- $accountline->{amountoutstanding} = sprintf '%.2f', $accountline->{amountoutstanding}; >+if ( $print eq "page" ) { >+ my $schema = Koha::Database->new()->schema(); > >- if ($accountline->{accounttype} ne 'F' && $accountline->{accounttype} ne 'FU'){ >- $accountline->{printtitle} = 1; >- } >- } >- $template->param( accounts => $accts ); >+ my @account_debits = $schema->resultset('AccountDebit') >+ ->search( { borrowernumber => $borrowernumber } ); >+ my @account_credits = $schema->resultset('AccountCredit') >+ ->search( { borrowernumber => $borrowernumber } ); >+ >+ $template->param( >+ account_debits => \@account_debits, >+ account_credits => \@account_credits, >+ ); > } > > # Show OPAC privacy preference is system preference is set >@@ -352,8 +353,8 @@ $template->param( > branch => $branch, > todaysdate => C4::Dates->today(), > totalprice => sprintf("%.2f", $totalprice), >- totaldue => sprintf("%.2f", $total), >- totaldue_raw => $total, >+ totaldue => sprintf("%.2f", $data->{account_balance}), >+ totaldue_raw => $data->{account_balance}, > overdues_exist => $overdues_exist, > StaffMember => ($category_type eq 'S'), > is_child => ($category_type eq 'C'), >diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl >index bfc1e35..f0eb0ce 100755 >--- a/offline_circ/enqueue_koc.pl >+++ b/offline_circ/enqueue_koc.pl >@@ -27,7 +27,6 @@ use C4::Auth; > use C4::Koha; > use C4::Context; > use C4::Biblio; >-use C4::Accounts; > use C4::Circulation; > use C4::Items; > use C4::Members; >diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl >index 75ff319..2753bdf 100755 >--- a/offline_circ/process_koc.pl >+++ b/offline_circ/process_koc.pl >@@ -27,13 +27,14 @@ use C4::Auth; > use C4::Koha; > use C4::Context; > use C4::Biblio; >-use C4::Accounts; > use C4::Circulation; > use C4::Items; > use C4::Members; > use C4::Stats; > use C4::UploadedFile; > use C4::BackgroundJob; >+use Koha::Accounts; >+use Koha::Database; > > use Date::Calc qw( Add_Delta_Days Date_to_Days ); > >@@ -357,8 +358,13 @@ sub kocReturnItem { > > sub kocMakePayment { > my ( $circ ) = @_; >- my $borrower = GetMember( 'cardnumber'=>$circ->{ 'cardnumber' } ); >- recordpayment( $borrower->{'borrowernumber'}, $circ->{'amount'} ); >+ >+ my $borrower = >+ Koha::Database->new()->schema()->resultset('Borrower') >+ ->single( { cardnumber => $circ->{'cardnumber'} } ); >+ >+ AddCredit({ borrower => $borrower, amount => $circ->{'amount'} }); >+ > push @output, { > payment => 1, > amount => $circ->{'amount'}, >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6427
:
21922
|
22704
|
22705
|
22708
|
22709
|
22710
|
22741
|
22870
|
22871
|
22872
|
22873
|
22874
|
22875
|
22876
|
22881
|
22889
|
22940
|
22948
|
22949
|
22995
|
23000
|
23137
|
23158
|
23161
|
23171
|
23186
|
23269
|
23275
|
23276
|
23391
|
23392
|
23400
|
23401
|
23402
|
23403
|
23404
|
23405
|
23406
|
23407
|
23408
|
23409
|
23410
|
23411
|
23412
|
23413
|
23420
|
23421
|
23422
|
23423
|
23424
|
23425
|
23426
|
23427
|
23428
|
23429
|
23430
|
23431
|
23432
|
23433
|
23440
|
23441
|
23442
|
23443
|
23444
|
23445
|
23446
|
23447
|
23448
|
23449
|
23450
|
23451
|
23452
|
23453
|
23454
|
23458
|
23459
|
23460
|
23461
|
23462
|
23463
|
23464
|
23465
|
23466
|
23467
|
23468
|
23469
|
23470
|
23471
|
23603
|
23643
|
23644
|
23645
|
23646
|
23647
|
23648
|
23649
|
23650
|
23651
|
23652
|
23653
|
23654
|
23655
|
23656
|
23657
|
23937
|
23938
|
23939
|
23940
|
23941
|
23942
|
23943
|
23944
|
23945
|
23946
|
23947
|
23948
|
23949
|
23950
|
23951
|
24612
|
24613
|
24614
|
24615
|
24616
|
24617
|
24618
|
24619
|
24620
|
24621
|
24622
|
24623
|
24624
|
24625
|
24626
|
24627
|
24628
|
24757
|
24758
|
24759
|
24760
|
24761
|
24762
|
24763
|
24764
|
24765
|
24766
|
24767
|
24768
|
24769
|
24770
|
24771
|
24772
|
24777
|
24792
|
24793
|
24794
|
24795
|
24796
|
24797
|
24798
|
24799
|
24800
|
24801
|
24802
|
24803
|
24804
|
24805
|
24806
|
24807
|
24808
|
24809
|
24810
|
24811
|
24812
|
24813
|
24814
|
24815
|
24816
|
24817
|
24818
|
24819
|
24820
|
24821
|
24822
|
24823
|
24824
|
24825
|
24826
|
24827
|
24828
|
24829
|
24830
|
24831
|
24832
|
24833
|
24834
|
24835
|
24836
|
24837
|
24838
|
24839
|
24840
|
24841
|
24842
|
24843
|
24844
|
25777
|
25778
|
25779
|
25780
|
25781
|
25782
|
25783
|
25784
|
25785
|
25786
|
25787
|
25788
|
25789
|
25790
|
25791
|
25792
|
25793
|
25794
|
25795
|
25796
|
25797
|
25798
|
25799
|
25800
|
25801
|
25802
|
25803
|
25804
|
25805
|
25806
|
25807
|
25808
|
25809
|
25810
|
25811
|
25812
|
25813
|
25814
|
25815
|
25816
|
25930
|
25932
|
25933
|
25934
|
26033
|
26034
|
26035
|
26036
|
26107
|
27167
|
27168
|
27169
|
27170
|
27171
|
27172
|
27173
|
27174
|
27175
|
27176
|
27177
|
27178
|
27179
|
27180
|
27181
|
27182
|
27183
|
27184
|
27185
|
27186
|
27187
|
27189
|
27190
|
27197
|
28067
|
28068
|
28069
|
28070
|
28071
|
28072
|
28073
|
28074
|
28075
|
28076
|
28077
|
28078
|
28079
|
28080
|
28081
|
28082
|
28083
|
28084
|
28085
|
28086
|
28087
|
28088
|
28089
|
28090
|
28091
|
28527
|
28528
|
28529
|
28530
|
28531
|
28532
|
28533
|
28534
|
28535
|
28536
|
28537
|
28538
|
28539
|
28540
|
28541
|
28542
|
28543
|
28544
|
28545
|
28546
|
28547
|
28548
|
28549
|
28550
|
28551
|
28552
|
28553
|
28555
|
28556
|
28561
|
28563
|
28564
|
28795
|
28796
|
28797
|
28798
|
28799
|
28800
|
28801
|
28802
|
28803
|
28804
|
28805
|
28806
|
28807
|
28808
|
28809
|
28810
|
28811
|
28812
|
28813
|
28814
|
28815
|
28816
|
28817
|
28818
|
28819
|
28820
|
28821
|
28822
|
28887
|
28888
|
28889
|
28890
|
28909
|
29176
|
29230
|
29231
|
29232
|
29233
|
29234
|
29235
|
29236
|
29237
|
29238
|
29239
|
29240
|
29241
|
29242
|
29243
|
29244
|
29245
|
29246
|
29247
|
29248
|
29249
|
29250
|
29251
|
29252
|
29253
|
29254
|
29255
|
29256
|
29257
|
29258
|
29259
|
29260
|
29261
|
29262
|
29263
|
29264
|
29265
|
29706
|
29707
|
29708
|
29709
|
29710
|
29711
|
29712
|
29713
|
29714
|
29715
|
29716
|
29717
|
29719
|
29720
|
29721
|
29722
|
29723
|
29724
|
29725
|
29726
|
29727
|
29728
|
29729
|
29730
|
30271
|
30272
|
30273
|
30274
|
30275
|
30276
|
30277
|
30278
|
30279
|
30280
|
30281
|
30282
|
30320
|
30321
|
30322
|
30323
|
30324
|
30325
|
30326
|
30327
|
30328
|
30329
|
30330
|
30331
|
30416
|
30417
|
30418
|
30419
|
30420
|
30421
|
30422
|
30423
|
30424
|
30425
|
30426
|
30427
|
31477
|
31478
|
31479
|
31480
|
31481
|
31482
|
31483
|
31484
|
31485
|
31486
|
31487
|
31488
|
31754
|
31755
|
31756
|
31757
|
31758
|
31759
|
31760
|
31761
|
31762
|
31763
|
31764
|
31765
|
31766
|
31767
|
31768
|
31769
|
31770
|
31771
|
31772
|
31773
|
31774
|
31775
|
31776
|
31777
|
32478
|
32479
|
32480
|
32481
|
32482
|
32483
|
32484
|
32485
|
32486
|
32487
|
32488
|
32489
|
32591
|
32592
|
32593
|
32594
|
32595
|
32596
|
32597
|
32598
|
32599
|
32600
|
32601
|
32602
|
32827
|
32828
|
32829
|
32830
|
32831
|
32832
|
32833
|
32834
|
32835
|
32836
|
32837
|
32838
|
33251
|
33252
|
33253
|
33254
|
33255
|
33256
|
33257
|
33258
|
33259
|
33260
|
33261
|
33262
|
34096
|
34097
|
34098
|
34099
|
34100
|
34101
|
34102
|
34103
|
34104
|
34105
|
34106
|
34107
|
34204
|
34205
|
34206
|
34207
|
34208
|
34209
|
34210
|
34211
|
34212
|
34213
|
34214
|
34215
|
35196
|
35197
|
35198
|
35199
|
35200
|
35201
|
35202
|
35203
|
35204
|
35205
|
35206
|
35207
|
35208
|
35302
|
36324
|
36326
|
36327
|
36328
|
36329
|
36330
|
36331
|
36332
|
36333
|
36334
|
36335
|
36337
|
36338
|
36340
|
36380
|
36391
|
36393
|
37127
|
37128
|
37129
|
37130
|
37131
|
37133
|
37134
|
37135
|
37136
|
37137
|
37138
|
37139
|
37140
|
37141
|
37142
|
37143
|
37147
|
37148
|
37149
|
37150
|
37151
|
37152
|
37153
|
37154
|
37155
|
37156
|
37157
|
37158
|
37159
|
37160
|
37161
|
37162
|
37229
|
37230
|
37231
|
37232
|
37233
|
37234
|
37235
|
37236
|
37237
|
37238
|
37239
|
37240
|
37241
|
37242
|
37243
|
37244
|
38247
|
38248
|
38249
|
38250
|
38251
|
38252
|
38253
|
38254
|
38255
|
38256
|
38257
|
38258
|
38259
|
38260
|
38261
|
38262
|
39063
|
39064
|
39065
|
39066
|
39067
|
39069
|
39070
|
39071
|
39072
|
39073
|
39074
|
39075
|
39076
|
39077
|
39078
|
39079
|
39671
|
39672
|
39673
|
39674
|
39675
|
39676
|
39677
|
39678
|
39679
|
39680
|
39681
|
39682
|
39683
|
39684
|
39685
|
39686