Attachment #128665 for bug #27946

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

Lines 129-138 if ( !$patron && $patron_cardnumber ) { Link Here

(-)a/circ/request-article.pl (-2 / +6 lines)
129	}	129	}
130	}	130	}
131		131
132	if( $patron && !$patron->can_request_article) {	132	if ( $patron && !$patron->can_request_article ) {
133	$patron = undef;	133	$patron = undef;
		134	$template->param( error_message => 'article_request_limit_reached' );
		135	}
		136
		137	if ( $patron ) {
134	$template->param(	138	$template->param(
135	error_message => 'article_request_limit_reached'	139	article_request_fee => $patron->article_request_fee
136	);	140	);
137	}	141	}
138		142





[%- BLOCK debit_type_description -%]
    [%- SWITCH debit_type.code -%]
        [%- CASE 'ACCOUNT'             -%]Account creation fee
        [%- CASE 'ACCOUNT_RENEW'       -%]Account renewal fee
        [%- CASE 'ARTICLE_REQUEST_FEE' -%]Article scan request fee
        [%- CASE 'LOST'                -%]Lost item
        [%- CASE 'MANUAL'              -%]Manual fee
        [%- CASE 'NEW_CARD'            -%]New card
        [%- CASE 'OVERDUE'             -%]Fine
        [%- CASE 'PROCESSING'          -%]Lost item processing fee
        [%- CASE 'RENT'                -%]Rental fee
        [%- CASE 'RENT_DAILY'          -%]Daily rental fee
        [%- CASE 'RENT_RENEW'          -%]Renewal of rental item
        [%- CASE 'RENT_DAILY_RENEW'    -%]Renewal of daily rental item
        [%- CASE 'RESERVE'             -%]Hold fee
        [%- CASE 'RESERVE_EXPIRED'     -%]Hold waiting too long
        [%- CASE 'Payout'              -%]Payout
        [%- CASE                       -%][% debit_type.description | html %]
    [%- END -%]
[%- END -%]


Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-1 / +6 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
		8	[% USE Price %]
8	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
9	[% SET article_requests_view = 1 %]	10	[% SET article_requests_view = 1 %]
10	[% SET biblionumber = biblio.biblionumber %]	11	[% SET biblionumber = biblio.biblionumber %]
Lines 143-149 Link Here
143	</form>	144	</form>
144	[% ELSE %]	145	[% ELSE %]
145	[% IF biblio.can_article_request( patron ) %]	146	[% IF biblio.can_article_request( patron ) %]
146		147	[% IF article_request_fee > 0 %]
		148	<div class="dialog alert">
		149	Patron will be charged with <strong>[% article_request_fee \| $Price %]</strong> for every request
		150	</div>
		151	[% END %]
147	<form id="place-article-request" method="post" action="/cgi-bin/koha/circ/request-article.pl">	152	<form id="place-article-request" method="post" action="/cgi-bin/koha/circ/request-article.pl">
148	<input type="hidden" name="action" value="create" />	153	<input type="hidden" name="action" value="create" />
149	<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblio.biblionumber \| html %]" />	154	<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblio.biblionumber \| html %]" />





[%- BLOCK debit_type_description -%]
    [%- SWITCH debit_type_code -%]
        [%- CASE 'ACCOUNT'             -%]Account creation fee
        [%- CASE 'ACCOUNT_RENEW'       -%]Account renewal fee
        [%- CASE 'ARTICLE_REQUEST_FEE' -%]Article scan request fee
        [%- CASE 'LOST'                -%]Lost item
        [%- CASE 'MANUAL'              -%]Manual fee
        [%- CASE 'NEW_CARD'            -%]New card
        [%- CASE 'OVERDUE'             -%]Fine
        [%- CASE 'PROCESSING'          -%]Lost item processing fee
        [%- CASE 'RENT'                -%]Rental fee
        [%- CASE 'RENT_DAILY'          -%]Daily rental fee
        [%- CASE 'RENT_RENEW'          -%]Renewal of rental item
        [%- CASE 'RENT_DAILY_RENEW'    -%]Renewal of daily rental item
        [%- CASE 'RESERVE'             -%]Hold fee
        [%- CASE 'RESERVE_EXPIRED'     -%]Hold waiting too long
        [%- CASE 'Payout'              -%]Payout
        [%- CASE                       -%][% debit_type.description | html %]
    [%- END -%]
[%- END -%]


Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt (+7 lines)
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE ItemTypes %]	3	[% USE ItemTypes %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
		5	[% USE Price %]
5	[% USE raw %]	6	[% USE raw %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7		8
Lines 57-62 Link Here
57	[% IF article_request_type == 'item_only' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsItemOnly') %] [% END %]	58	[% IF article_request_type == 'item_only' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsItemOnly') %] [% END %]
58		59
59		60
		61	[% IF article_request_fee > 0 %]
		62	<div class="alert alert-warning">
		63	You will be charged with <strong>[% article_request_fee \| $Price %]</strong> for every request
		64	</div>
		65	[% END %]
		66
60	<form id="place-article-request" method="post" action="/cgi-bin/koha/opac-request-article.pl">	67	<form id="place-article-request" method="post" action="/cgi-bin/koha/opac-request-article.pl">
61	<legend class="sr-only">Place article request</legend>	68	<legend class="sr-only">Place article request</legend>
62	<input type="hidden" name="action" value="create" />	69	<input type="hidden" name="action" value="create" />

Lines 128-133 if(!$patron->can_request_article) { Link Here

(-)a/opac/opac-request-article.pl (-1 / +3 lines)
128	);	128	);
129	}	129	}
130		130
		131	$template->param( article_request_fee => $patron->article_request_fee )
		132	if $action ne 'create';
		133
131	$template->param(	134	$template->param(
132	biblio => $biblio,	135	biblio => $biblio,
133	patron => $patron,	136	patron => $patron,
134	-

Return to bug 27946

Lines 11-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-15 / +16 lines)
11		11
12	[%- BLOCK debit_type_description -%]	12	[%- BLOCK debit_type_description -%]
13	[%- SWITCH debit_type.code -%]	13	[%- SWITCH debit_type.code -%]
14	[%- CASE 'ACCOUNT' -%]Account creation fee	14	[%- CASE 'ACCOUNT' -%]Account creation fee
15	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee	15	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
16	[%- CASE 'LOST' -%]Lost item	16	[%- CASE 'ARTICLE_REQUEST_FEE' -%]Article scan request fee
17	[%- CASE 'MANUAL' -%]Manual fee	17	[%- CASE 'LOST' -%]Lost item
18	[%- CASE 'NEW_CARD' -%]New card	18	[%- CASE 'MANUAL' -%]Manual fee
19	[%- CASE 'OVERDUE' -%]Fine	19	[%- CASE 'NEW_CARD' -%]New card
20	[%- CASE 'PROCESSING' -%]Lost item processing fee	20	[%- CASE 'OVERDUE' -%]Fine
21	[%- CASE 'RENT' -%]Rental fee	21	[%- CASE 'PROCESSING' -%]Lost item processing fee
22	[%- CASE 'RENT_DAILY' -%]Daily rental fee	22	[%- CASE 'RENT' -%]Rental fee
23	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	23	[%- CASE 'RENT_DAILY' -%]Daily rental fee
24	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item	24	[%- CASE 'RENT_RENEW' -%]Renewal of rental item
25	[%- CASE 'RESERVE' -%]Hold fee	25	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
26	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long	26	[%- CASE 'RESERVE' -%]Hold fee
27	[%- CASE 'Payout' -%]Payout	27	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
28	[%- CASE -%][% debit_type.description \| html %]	28	[%- CASE 'Payout' -%]Payout
		29	[%- CASE -%][% debit_type.description \| html %]
29	[%- END -%]	30	[%- END -%]
30	[%- END -%]	31	[%- END -%]
31		32

Lines 11-31 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc (-15 / +16 lines)
11		11
12	[%- BLOCK debit_type_description -%]	12	[%- BLOCK debit_type_description -%]
13	[%- SWITCH debit_type_code -%]	13	[%- SWITCH debit_type_code -%]
14	[%- CASE 'ACCOUNT' -%]Account creation fee	14	[%- CASE 'ACCOUNT' -%]Account creation fee
15	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee	15	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
16	[%- CASE 'LOST' -%]Lost item	16	[%- CASE 'ARTICLE_REQUEST_FEE' -%]Article scan request fee
17	[%- CASE 'MANUAL' -%]Manual fee	17	[%- CASE 'LOST' -%]Lost item
18	[%- CASE 'NEW_CARD' -%]New card	18	[%- CASE 'MANUAL' -%]Manual fee
19	[%- CASE 'OVERDUE' -%]Fine	19	[%- CASE 'NEW_CARD' -%]New card
20	[%- CASE 'PROCESSING' -%]Lost item processing fee	20	[%- CASE 'OVERDUE' -%]Fine
21	[%- CASE 'RENT' -%]Rental fee	21	[%- CASE 'PROCESSING' -%]Lost item processing fee
22	[%- CASE 'RENT_DAILY' -%]Daily rental fee	22	[%- CASE 'RENT' -%]Rental fee
23	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	23	[%- CASE 'RENT_DAILY' -%]Daily rental fee
24	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item	24	[%- CASE 'RENT_RENEW' -%]Renewal of rental item
25	[%- CASE 'RESERVE' -%]Hold fee	25	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
26	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long	26	[%- CASE 'RESERVE' -%]Hold fee
27	[%- CASE 'Payout' -%]Payout	27	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
28	[%- CASE -%][% debit_type.description \| html %]	28	[%- CASE 'Payout' -%]Payout
		29	[%- CASE -%][% debit_type.description \| html %]
29	[%- END -%]	30	[%- END -%]
30	[%- END -%]	31	[%- END -%]
31		32