@@ -, +, @@
- links to the new pages.
- syspref description
- links on the main page (intranet)
- the DISCHARGE type for debarment
---
C4/Auth.pm | 2 ++
Koha/Borrower/Debarments.pm | 2 +-
.../intranet-tmpl/prog/en/includes/borrower_debarments.inc | 2 ++
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 3 +++
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt | 3 +++
koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc | 3 +++
.../prog/en/modules/admin/preferences/patrons.pref | 6 ++++++
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 11 ++++++++++-
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 9 +++++++++
mainpage.pl | 3 +++
10 files changed, 42 insertions(+), 2 deletions(-)
--- a/C4/Auth.pm
+++ a/C4/Auth.pm
@@ -403,6 +403,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 {
@@ -511,6 +512,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"));
--- a/Koha/Borrower/Debarments.pm
+++ a/Koha/Borrower/Debarments.pm
@@ -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,
});
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -47,6 +47,8 @@
Overdues
[% CASE 'SUSPENSION' %]
Suspension
+ [% CASE 'DISCHARGE' %]
+ Discharge
[% END %]
[% d.comment %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -84,6 +84,9 @@
[% IF ( borrower_files ) %][% ELSE %][% END %]Files
[% END %]
[% IF ( suggestionsview ) %][% ELSE %][% END %]Purchase suggestions
+ [% IF CAN_user_borrowers && useDischarge %]
+ [% IF dischargeview %][% ELSE %][% END %]Discharge
+ [% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -83,6 +83,9 @@ in the global namespace %]
[% IF ( borrower_files ) %][% ELSE %][% END %]Files
[% END %]
[% IF ( suggestionsview ) %][% ELSE %][% END %]Purchase
suggestions
+ [% IF CAN_user_borrowers && useDischarge %]
+ [% IF dischargeview %][% ELSE %][% END %]Discharge
+ [% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -19,6 +19,9 @@
[% IF EnableBorrowerFiles %]
[% IF ( borrower_files ) %][% ELSE %][% END %]Files
[% END %]
+ [% IF CAN_user_borrowers && useDischarge %]
+ [% IF dischargeview %][% ELSE %][% END %]Discharge
+ [% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -139,6 +139,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
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -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 )
+ ) %]
[% IF ( CAN_user_acquisition && pendingsuggestions ) %]
@@ -143,6 +145,13 @@
[% END %]
+ [% IF CAN_user_borrowers && pending_discharge_requests %]
+
+ [% END %]
+
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -95,6 +95,15 @@
[% END %]
your lists
[% END %]
+
+ [% IF Koha.Preference( 'useDischarge' ) == 1 %]
+ [% IF ( dischargeview ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ ask for a discharge
+ [% END %]
[% END %]
--- a/mainpage.pl
+++ a/mainpage.pl
@@ -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,
);
#
--