gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 8007: Discharge - Glue 

This patch adds:
- links to the new pages.
- syspref description
- links on the main page (intranet)
- the DISCHARGE type for debarment

Signed-off-by: Lucie <lucie.rousseaux@dracenie.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Yohann Dufour 2014-08-04 16:09:35 +02:00 committed by Tomas Cohen Arazi
parent 58845be2ad
commit 45975f4087
10 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Auth.pm
View File

@ -421,6 +421,7 @@ sub get_template_and_user {
EnableBorrowerFiles => C4::Context->preference('EnableBorrowerFiles'),
UseKohaPlugins => C4::Context->preference('UseKohaPlugins'),
UseCourseReserves => C4::Context->preference("UseCourseReserves"),
useDischarge => C4::Context->preference('useDischarge'),
);
}
else {
@ -532,6 +533,7 @@ sub get_template_and_user {
OPACLocalCoverImages => C4::Context->preference("OPACLocalCoverImages"),
PatronSelfRegistration => C4::Context->preference("PatronSelfRegistration"),
PatronSelfRegistrationDefaultCategory => C4::Context->preference("PatronSelfRegistrationDefaultCategory"),
useDischarge => C4::Context->preference('useDischarge'),
);
$template->param( OpacPublic => '1' ) if ( $user || C4::Context->preference("OpacPublic") );

2
Koha/Borrower/Debarments.pm
View File

@ -131,7 +131,7 @@ sub DelDebarment {
my $success = ModDebarment({
borrower_debarment_id => $borrower_debarment_id,
expiration => $expiration,
type => $type, ## enum('FINES','OVERDUES','MANUAL')
type => $type, ## enum('FINES','OVERDUES','MANUAL','DISCHARGE')
comment => $comment,
});

2
koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
View File

@ -47,6 +47,8 @@
Overdues
[% CASE 'SUSPENSION' %]
Suspension
[% CASE 'DISCHARGE' %]
Discharge
[% END %]
</td>
<td>[% d.comment %]</td>

3
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -91,6 +91,9 @@
[% IF ( CAN_user_borrowers ) %]
[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
[% END %]
[% IF CAN_user_borrowers && useDischarge %]
[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
[% END %]
</ul></div>
[% END %]

3
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
View File

@ -92,6 +92,9 @@ in the global namespace %]
[% IF ( CAN_user_borrowers ) %]
[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrower.borrowernumber %]">Purchase<br/>suggestions</a></li>
[% END %]
[% IF CAN_user_borrowers && useDischarge %]
[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
[% END %]
</ul></div>
[% END %]

3
koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
View File

@ -19,6 +19,9 @@
[% IF EnableBorrowerFiles %]
[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
[% END %]
[% IF CAN_user_borrowers && useDischarge %]
[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
[% END %]
</ul>
</div>
[% END %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
View File

@ -132,6 +132,12 @@ Patrons:
- pref: CardnumberLength
- "characters long. The length can be a single number to specify an exact length, a range separated by a comma (i.e., 'Min,Max'), or a maximum with no minimum (i.e., ',Max')."
- "If 'cardnumber' is included in the BorrowerMandatoryField list, the minimum length, if not specified here, defaults to one."
-
- pref: useDischarge
choices:
yes: Allows
no: "Don't allow"
- librarians to discharge borrowers and borrowers to request a discharge.
"Norwegian patron database":
-
- pref: NorwegianPatronDBEnable

11
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
View File

@ -111,7 +111,9 @@
[% IF ( ( CAN_user_tools_moderate_comments && pendingcomments )
|| ( CAN_user_tools_moderate_tags && pendingtags )
|| ( CAN_user_borrowers && pending_borrower_modifications )
|| ( CAN_user_acquisition && pendingsuggestions ) ) %]
|| ( CAN_user_acquisition && pendingsuggestions )
|| ( CAN_user_borrowers && pending_discharge_requests )
) %]
<div id="area-pending">
[% IF ( CAN_user_acquisition && pendingsuggestions ) %]
<div class="pending-info" id="suggestions_pending">
@ -143,6 +145,13 @@
</div>
[% END %]
[% IF CAN_user_borrowers && pending_discharge_requests %]
<div class="pending-info" id="patron_discharges_pending">
<a href="/cgi-bin/koha/members/discharges.pl">Discharge requests pending</a>:
<span class="pending-number-link">[% pending_discharge_requests %]</span>
</div>
[% END %]
</div>
[% END %]

9
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
View File

@ -95,6 +95,15 @@
[% END %]
<a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">your lists</a></li>
[% END %]
[% IF Koha.Preference( 'useDischarge' ) == 1 %]
[% IF ( dischargeview ) %]
<li class="active">
[% ELSE %]
<li>
[% END %]
<a href="/cgi-bin/koha/opac-discharge.pl">ask for a discharge</a></li>
[% END %]
</ul>
</div>
[% END %]

3
mainpage.pl
View File

@ -29,6 +29,7 @@ use C4::Review qw/numberofreviews/;
use C4::Suggestions qw/CountSuggestion/;
use C4::Tags qw/get_count_by_tag_status/;
use Koha::Borrower::Modifications;
use Koha::Borrower::Discharge;
my $query = new CGI;
@ -65,12 +66,14 @@ my $pendingtags = get_count_by_tag_status(0);
my $pendingsuggestions = CountSuggestion("ASKED");
my $pending_borrower_modifications =
Koha::Borrower::Modifications->GetPendingModificationsCount( $branch );
my $pending_discharge_requests = Koha::Borrower::Discharge::count({ pending => 1 });
$template->param(
pendingcomments => $pendingcomments,
pendingtags => $pendingtags,
pendingsuggestions => $pendingsuggestions,
pending_borrower_modifications => $pending_borrower_modifications,
pending_discharge_requests => $pending_discharge_requests,
);
#