Attachment #87584 for bug #12166

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

Lines 571-577 sub ChargeReserveFee { Link Here

(-)a/C4/Reserves.pm (-1 / +1 lines)
571	Koha::Account->new( { patron_id => $borrowernumber } )->add_debit(	571	Koha::Account->new( { patron_id => $borrowernumber } )->add_debit(
572	{	572	{
573	amount => $fee,	573	amount => $fee,
574	description => "Reserve Charge - " . $title,	574	description => $title,
575	note => undef,	575	note => undef,
576	user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,	576	user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
577	library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,	577	library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,

Lines 21-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (+1 lines)
21	[%- CASE 'WO' -%]<span>Writeoff</span>	21	[%- CASE 'WO' -%]<span>Writeoff</span>
22	[%- CASE 'C' -%]<span>Credit</span>	22	[%- CASE 'C' -%]<span>Credit</span>
23	[%- CASE 'CR' -%]<span>Credit</span>	23	[%- CASE 'CR' -%]<span>Credit</span>
		24	[%- CASE 'Res' -%]<span>Hold fee</span>
24	[%- CASE -%][% account.accounttype \| html %]	25	[%- CASE -%][% account.accounttype \| html %]
25	[%- END -%]	26	[%- END -%]
26	[%- END -%]	27	[%- END -%]




    <thead>
      <tr>
          <th class="title-string">Date</th>
          <th>Account type</th>
          <th>Description of charges</th>
          <th>Barcode</th>
          <th>Due date</th>


   <tr>
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
        <td>[% PROCESS account_type_description account=account %]</td>
      <td>
        [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
        [%- IF account.description %][% account.description | html %][% END %]
        [%- IF account.description %], [% account.description | html %][% END %]
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
      <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
      <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>

  [% END %]
<tfoot>
  <tr>
    <td colspan="9">Total due</td>
    [% IF ( totalcredit ) %]
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
    [% ELSE %]




[% USE ColumnsSettings %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
[% PROCESS 'accounts.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Make a payment for  [% patron.firstname | html %] [% patron.surname | html %]</title>
[% INCLUDE 'doc-head-close.inc' %]

<tr>
    <th class="NoSort">&nbsp;</th>
    <th class="NoSort">Actions</th>
    <th>Account type</th>
    <th>Description</th>
    <th class="title-string">Date</th>
    <th>Barcode</th>
    <th>Due date</th>
    <th>Return date</th>
    <th class="NoSort">Payment note</th>
    <th>Account type</th>
    <th>Amount</th>
    <th>Amount outstanding</th>
</tr>

    <input type="hidden" name="borrowernumber[% line.accountlines_id | html %]" value="[% line.borrowernumber | html %]" />
    </td>
    <td>
        [% PROCESS account_type_description account=line %]
    </td>
    <td>
        [%- IF line.description %][% line.description | html %][% END %]
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
          [% CASE 'N' %]New card
          [% CASE 'F' %]Fine
          [% CASE 'A' %]Account management fee
          [% CASE 'M' %]Sundry
          [% CASE 'L' %]Lost item
          [% CASE 'W' %]Writeoff
          [% CASE 'FU' %]Accruing fine
          [% CASE 'HE' %]Hold waiting too long
          [% CASE 'Rent' %]Rental fee
          [% CASE 'FOR' %]Forgiven
          [% CASE 'LR' %]Lost item fee refund
          [% CASE 'PF' %]Processing fee
          [% CASE 'PAY' %]Payment
          [% CASE 'WO' %]Writeoff
          [% CASE 'C' %]Credit
          [% CASE 'CR' %]Credit
          [% CASE %][% line.accounttype | html %]
        [%- END -%]
        [%- IF line.description %], [% line.description | html %][% END %]
        [% IF line.itemnumber %]([% line.item.biblio.title | html %])[% END %]
    </td>
    <td>

        <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
        <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
    </td>
    <td>[% line.accounttype | html %]</td>
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
    <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td>
</tr>

Lines 8-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-4 / +8 lines)
8	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]	8	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
9	<th class="title-string">Date</th>	9	<th class="title-string">Date</th>
10	<th>Description</th>	10	<th>Description</th>
		11	<th>Type</th>
11	<th>Fine amount</th>	12	<th>Fine amount</th>
12	<th>Amount outstanding</th>	13	<th>Amount outstanding</th>
13	</tr>	14	</tr>
Lines 48-57 Link Here
48	[% CASE 'WO' %]Writeoff	49	[% CASE 'WO' %]Writeoff
49	[% CASE 'C' %]Credit	50	[% CASE 'C' %]Credit
50	[% CASE 'CR' %]Credit	51	[% CASE 'CR' %]Credit
		52	[%-CASE 'Res' %]Hold fee
51	[% CASE %][% ACCOUNT_LINE.accounttype \| html %]	53	[% CASE %][% ACCOUNT_LINE.accounttype \| html %]
52	[%- END -%]	54	[%- END -%]
53	[%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) \| html %][% END %]	55	</td>
54	[%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description \| html %][% END %]	56	<td>
		57	[%- IF ACCOUNT_LINE.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) \| html %][% END %]
		58	[%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description \| html %][% END %]
55	[% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title \| html %])[% END %]	59	[% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title \| html %])[% END %]
56	</td>	60	</td>
57	[% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount \| $Price %]</td>	61	[% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount \| $Price %]</td>
Lines 63-71 Link Here
63	<tfoot>	67	<tfoot>
64	<tr>	68	<tr>
65	[%- IF ENABLE_OPAC_PAYMENTS -%]	69	[%- IF ENABLE_OPAC_PAYMENTS -%]
66	[%- SET COLSPAN = 4 -%]	70	[%- SET COLSPAN = 5 -%]
67	[%- ELSE -%]	71	[%- ELSE -%]
68	[%- SET COLSPAN = 3 -%]	72	[%- SET COLSPAN = 4 -%]
69	[%- END -%]	73	[%- END -%]
70	<th class="sum" colspan="[% COLSPAN \| html %]">Total due</th>	74	<th class="sum" colspan="[% COLSPAN \| html %]">Total due</th>
71	<td class="sum">[% total \| $Price %]</td>	75	<td class="sum">[% total \| $Price %]</td>

Lines 235-241 elsif ( $patron && ( $op eq 'checkout' \|\| $op eq 'renew' ) ) { Link Here

(-)a/opac/sco/sco-main.pl (-2 / +1 lines)
235	{	235	{
236	borrowernumber => $borrower->{borrowernumber},	236	borrowernumber => $borrower->{borrowernumber},
237	accounttype => 'Res',	237	accounttype => 'Res',
238	description => 'Reserve Charge - ' . $item->biblio->title,	238	description => $item->biblio->title,
239	date => $dtf->format_date(dt_from_string)	239	date => $dtf->format_date(dt_from_string)
240	}	240	}
241	)->count,	241	)->count,
242	-

Return to bug 12166

Lines 44-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-4 / +5 lines)
44	<thead>	44	<thead>
45	<tr>	45	<tr>
46	<th class="title-string">Date</th>	46	<th class="title-string">Date</th>
		47	<th>Account type</th>
47	<th>Description of charges</th>	48	<th>Description of charges</th>
48	<th>Barcode</th>	49	<th>Barcode</th>
49	<th>Due date</th>	50	<th>Due date</th>
Lines 61-70 Link Here
61		62
62	<tr>	63	<tr>
63	<td><span title="[% account.date \| html %]">[% account.date \|$KohaDates %]</span></td>	64	<td><span title="[% account.date \| html %]">[% account.date \|$KohaDates %]</span></td>
		65	<td>[% PROCESS account_type_description account=account %]</td>
64	<td>	66	<td>
65	[% PROCESS account_type_description account=account %]	67	[%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) \| html %][% END %]
66	[%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) \| html %][% END %]	68	[%- IF account.description %][% account.description \| html %][% END %]
67	[%- IF account.description %], [% account.description \| html %][% END %]
68	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber \| uri %]&itemnumber=[% account.itemnumber \| uri %]">[% account.item.biblio.title \| html %]</a>[% END %]</td>	69	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber \| uri %]&itemnumber=[% account.itemnumber \| uri %]">[% account.item.biblio.title \| html %]</a>[% END %]</td>
69	<td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber \| uri %]&biblionumber=[% account.item.biblionumber \| uri %]#item[% account.itemnumber \| uri %]">[% account.item.barcode \| html %]</a>[% END %]</td>	70	<td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber \| uri %]&biblionumber=[% account.item.biblionumber \| uri %]#item[% account.itemnumber \| uri %]">[% account.item.barcode \| html %]</a>[% END %]</td>
70	<td>[% IF ( account.issue_id ) %][% account.checkout.date_due \| $KohaDates as_due_date => 1 %][% END %]</td>	71	<td>[% IF ( account.issue_id ) %][% account.checkout.date_due \| $KohaDates as_due_date => 1 %][% END %]</td>
Lines 89-95 Link Here
89	[% END %]	90	[% END %]
90	<tfoot>	91	<tfoot>
91	<tr>	92	<tr>
92	<td colspan="8">Total due</td>	93	<td colspan="9">Total due</td>
93	[% IF ( totalcredit ) %]	94	[% IF ( totalcredit ) %]
94	<td class="credit" style="text-align: right;">[% total \| $Price %]</td>	95	<td class="credit" style="text-align: right;">[% total \| $Price %]</td>
95	[% ELSE %]	96	[% ELSE %]

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-26 / +6 lines)
7	[% USE ColumnsSettings %]	7	[% USE ColumnsSettings %]
8	[% USE KohaDates %]	8	[% USE KohaDates %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% PROCESS 'accounts.inc' %]
10	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Koha &rsaquo; Patrons &rsaquo; Make a payment for [% patron.firstname \| html %] [% patron.surname \| html %]</title>	12	<title>Koha &rsaquo; Patrons &rsaquo; Make a payment for [% patron.firstname \| html %] [% patron.surname \| html %]</title>
12	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 44-56 Link Here
44	<tr>	45	<tr>
45	<th class="NoSort"> </th>	46	<th class="NoSort"> </th>
46	<th class="NoSort">Actions</th>	47	<th class="NoSort">Actions</th>
		48	<th>Account type</th>
47	<th>Description</th>	49	<th>Description</th>
48	<th class="title-string">Date</th>	50	<th class="title-string">Date</th>
49	<th>Barcode</th>	51	<th>Barcode</th>
50	<th>Due date</th>	52	<th>Due date</th>
51	<th>Return date</th>	53	<th>Return date</th>
52	<th class="NoSort">Payment note</th>	54	<th class="NoSort">Payment note</th>
53	<th>Account type</th>
54	<th>Amount</th>	55	<th>Amount</th>
55	<th>Amount outstanding</th>	56	<th>Amount outstanding</th>
56	</tr>	57	</tr>
Lines 80-109 Link Here
80	<input type="hidden" name="borrowernumber[% line.accountlines_id \| html %]" value="[% line.borrowernumber \| html %]" />	81	<input type="hidden" name="borrowernumber[% line.accountlines_id \| html %]" value="[% line.borrowernumber \| html %]" />
81	</td>	82	</td>
82	<td>	83	<td>
83	[% SWITCH line.accounttype %]	84	[% PROCESS account_type_description account=line %]
84	[% CASE 'Pay' %]Payment, thanks	85	</td>
85	[% CASE 'Pay00' %]Payment, thanks (cash via SIP2)	86	<td>
86	[% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)	87	[%- IF line.description %][% line.description \| html %][% END %]
87	[% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
88	[% CASE 'N' %]New card
89	[% CASE 'F' %]Fine
90	[% CASE 'A' %]Account management fee
91	[% CASE 'M' %]Sundry
92	[% CASE 'L' %]Lost item
93	[% CASE 'W' %]Writeoff
94	[% CASE 'FU' %]Accruing fine
95	[% CASE 'HE' %]Hold waiting too long
96	[% CASE 'Rent' %]Rental fee
97	[% CASE 'FOR' %]Forgiven
98	[% CASE 'LR' %]Lost item fee refund
99	[% CASE 'PF' %]Processing fee
100	[% CASE 'PAY' %]Payment
101	[% CASE 'WO' %]Writeoff
102	[% CASE 'C' %]Credit
103	[% CASE 'CR' %]Credit
104	[% CASE %][% line.accounttype \| html %]
105	[%- END -%]
106	[%- IF line.description %], [% line.description \| html %][% END %]
107	[% IF line.itemnumber %]([% line.item.biblio.title \| html %])[% END %]	88	[% IF line.itemnumber %]([% line.item.biblio.title \| html %])[% END %]
108	</td>	89	</td>
109	<td>	90	<td>
Lines 128-134 Link Here
128	<a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id \| html %]"><i class="fa fa-plus"></i> Add note</a>	109	<a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id \| html %]"><i class="fa fa-plus"></i> Add note</a>
129	<span class="payment_note" id="payment_note_[% line.accountlines_id \| html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id \| html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>	110	<span class="payment_note" id="payment_note_[% line.accountlines_id \| html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id \| html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
130	</td>	111	</td>
131	<td>[% line.accounttype \| html %]</td>
132	<td class="debit" style="text-align: right;">[% line.amount \| $Price %]</td>	112	<td class="debit" style="text-align: right;">[% line.amount \| $Price %]</td>
133	<td class="debit" style="text-align: right;">[% line.amountoutstanding \| $Price %]</td>	113	<td class="debit" style="text-align: right;">[% line.amountoutstanding \| $Price %]</td>
134	</tr>	114	</tr>