@@ -, +, @@
-> Manage pending modification requests
-> Patron detail page
-> Edit patron
-> Set guarantor
-> Fines
-> Account, Pay fines, Create manual invoice, Create manual
credit
-> Print receipts for different kinds of charges
-> Routing lists
-> Circulation history
-> Holds history
-> Notices
-> Statistics
-> Files
-> Purchase suggestions
-> Discharges
-> Housebound
-> Set permissions
-> Change password
-> Print summary, slips, and overdues
-> Update child to adult patron type
---
.../prog/en/includes/borrower_debarments.inc | 28 -
.../prog/en/includes/members-toolbar.inc | 128 -----
.../prog/en/includes/messaging-preference-form.inc | 25 +-
.../prog/en/includes/patron-search.inc | 44 +-
.../prog/en/modules/admin/categories.tt | 1 +
.../prog/en/modules/common/patron_search.tt | 331 +++++------
.../prog/en/modules/members/boraccount.tt | 73 +--
.../prog/en/modules/members/deletemem.tt | 6 +
.../prog/en/modules/members/discharge.tt | 6 +
.../prog/en/modules/members/discharges.tt | 6 +
.../intranet-tmpl/prog/en/modules/members/files.tt | 33 +-
.../prog/en/modules/members/holdshistory.tt | 42 +-
.../prog/en/modules/members/housebound.tt | 25 +-
.../prog/en/modules/members/mancredit.tt | 21 +-
.../prog/en/modules/members/maninvoice.tt | 37 +-
.../prog/en/modules/members/member-flags.tt | 212 +++----
.../prog/en/modules/members/member-password.tt | 129 +++--
.../prog/en/modules/members/member.tt | 623 +++++++++++----------
.../prog/en/modules/members/memberentrygen.tt | 352 ++++++------
.../prog/en/modules/members/members-update.tt | 17 +-
.../prog/en/modules/members/moremember-brief.tt | 2 +
.../prog/en/modules/members/moremember-print.tt | 7 +-
.../prog/en/modules/members/moremember-receipt.tt | 9 +-
.../prog/en/modules/members/moremember.tt | 249 ++++----
.../prog/en/modules/members/nl-search.tt | 6 +
.../prog/en/modules/members/notices.tt | 44 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 82 +--
.../prog/en/modules/members/paycollect.tt | 124 ++--
.../prog/en/modules/members/printfeercpt.tt | 10 +-
.../prog/en/modules/members/printinvoice.tt | 8 +-
.../en/modules/members/purchase-suggestions.tt | 28 +-
.../prog/en/modules/members/readingrec.tt | 60 +-
.../prog/en/modules/members/routing-lists.tt | 7 +
.../prog/en/modules/members/statistics.tt | 25 +-
.../prog/en/modules/members/update-child.tt | 85 ++-
koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 154 +++++
.../prog/js/messaging-preference-form.js | 20 +
.../intranet-tmpl/prog/js/pages/circulation.js | 24 +
38 files changed, 1614 insertions(+), 1469 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/members-menu.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -1,31 +1,3 @@
-
-
[% IF ( not debarments.defined || debarments.size < 1 ) %]
Patron is currently unrestricted.
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -3,134 +3,6 @@
[% USE Branches %]
[% USE AuthorisedValues %]
[% SET NorwegianPatronDBEnable = Koha.Preference( 'NorwegianPatronDBEnable' ) %]
-
-
[% IF ( CAN_user_borrowers ) %]
[% IF ( guarantor ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -1,28 +1,5 @@
[% USE Koha %]
-
@@ -32,7 +9,7 @@ $(document).ready(function(){
[% IF Koha.Preference('SMSSendDriver') %]
SMS | [% END %]
[% IF Koha.Preference('TalkingTechItivaPhoneNotification') %]Phone | [% END %]
Email |
- Digests only |
+ Digests only |
[% UNLESS ( messaging_form_inactive ) %]Do not notify | [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -155,37 +155,15 @@
-
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -492,6 +492,7 @@
[% MACRO jsinclude BLOCK %]
+
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
@@ -124,4 +125,8 @@
[% END %]
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'slip-print.inc' #printThenClose %]
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -1,13 +1,13 @@
[% USE Koha %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Print Receipt for [% cardnumber %]
[% INCLUDE 'doc-head-close.inc' %]
-
-
-[% INCLUDE 'slip-print.inc' #printThenClose %]
+
+
@@ -69,5 +69,8 @@ Date due: [% issueloo.date_due %]
[% END %]
[% END %]
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'slip-print.inc' #printThenClose %]
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -3,6 +3,7 @@
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons ›
[% IF ( unknowuser ) %]
@@ -12,130 +13,9 @@
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-[% INCLUDE 'datatables.inc' %]
-[% INCLUDE 'columns_settings.inc' %]
-[% INCLUDE 'strings.inc' %]
-
-
-[% INCLUDE 'timepicker.inc' %]
-
-
-
-
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'patron-search.inc' %]
@@ -642,4 +522,129 @@ function validate1(date) {
[% INCLUDE 'circ-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'datatables.inc' %]
+ [% INCLUDE 'columns_settings.inc' %]
+ [% INCLUDE 'strings.inc' %]
+ [% INCLUDE 'calendar.inc' %]
+
+
+ [% INCLUDE 'timepicker.inc' %]
+
+
+
+
+
+
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt
@@ -1,4 +1,5 @@
[% USE KohaDates %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
-[% IF ( CONFIRM ) %]
-
-[% END %]
-
-[% IF ( SUCCESS ) %]
-
-[% END %]
-
-
-
[% IF ( MULTI ) %]
-
Choose Adult category
+ Choose adult category
[% IF patron_categories %]
[% END %]
[% END %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+ [% IF ( CONFIRM ) %]
+
+ [% END %]
+ [% IF ( SUCCESS ) %]
+
+ [% END %]
+[% END %]
-
-
-
[% INCLUDE 'popup-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
@@ -0,0 +1,154 @@
+/* global borrowernumber advsearch dateformat _ CAN_user_borrowers NorwegianPatronDBEnable CATCODE_MULTI catcode destination */
+
+$(document).ready(function(){
+ $("#filteraction_off, #filteraction_on").on('click', function(e) {
+ e.preventDefault();
+ $('#filters').toggle();
+ $('.filteraction').toggle();
+ });
+ if( advsearch ){
+ $("#filteraction_on").toggle();
+ $("#filters").show();
+ } else {
+ $("#filteraction_off").toggle();
+ }
+ $("#searchfieldstype").change(function() {
+ var MSG_DATE_FORMAT = "";
+ if ( $(this).val() == 'dateofbirth' ) {
+ if( dateformat == 'us' ){
+ MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'MM/DD/YYYY'");
+ } else if( dateformat == 'iso' ){
+ MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'YYYY-MM-DD'");
+ } else if( dateformat == 'metric' ){
+ MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'DD/MM/YYYY'");
+ } else if( dateformat == 'dmydot' ){
+ MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'DD.MM.YYYY'");
+ }
+ $('#searchmember').attr("title", MSG_DATE_FORMAT).tooltip('show');
+ } else {
+ $('#searchmember').tooltip('destroy');
+ }
+ });
+
+ if( CAN_user_borrowers ){
+ if( NorwegianPatronDBEnable == 1 ){
+ $("#deletepatronlocal").click(function(){
+ confirm_local_deletion();
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#deletepatronremote").click(function(){
+ confirm_remote_deletion();
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#deletepatronboth").click(function(){
+ confirm_both_deletion();
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ } else {
+ $("#deletepatron").click(function(){
+ window.location='/cgi-bin/koha/members/deletemem.pl?member=' + borrowernumber;
+ });
+ }
+ $("#renewpatron").click(function(){
+ confirm_reregistration();
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#updatechild").click(function(){
+ update_child();
+ $(".btn-group").removeClass("open");
+ });
+ }
+
+ $("#updatechild, #patronflags, #renewpatron, #deletepatron, #exportbarcodes").tooltip();
+ $("#exportcheckins").click(function(){
+ export_barcodes();
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#printsummary").click(function(){
+ printx_window("page");
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#printslip").click(function(){
+ printx_window("slip");
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#printquickslip").click(function(){
+ printx_window("qslip");
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#print_overdues").click(function(){
+ window.open("/cgi-bin/koha/members/print_overdues.pl?borrowernumber=" + borrowernumber, "printwindow");
+ $(".btn-group").removeClass("open");
+ return false;
+ });
+ $("#searchtohold").click(function(){
+ searchToHold();
+ return false;
+ });
+ $("#select_patron_messages").on("change",function(){
+ $("#borrower_message").val( $(this).val() );
+ });
+});
+function confirm_local_deletion() {
+ var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the local database? This cannot be undone."));
+ if (is_confirmed) {
+ window.location='/cgi-bin/koha/members/deletemem.pl?member=' + borrowernumber + '&deletelocal=true&deleteremote=false';
+ }
+}
+function confirm_remote_deletion() {
+ var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the Norwegian national patron database? This cannot be undone."));
+ if (is_confirmed) {
+ window.location='/cgi-bin/koha/members/deletemem.pl?member=' + borrowernumber + '&deletelocal=false&deleteremote=true';
+ }
+}
+function confirm_both_deletion() {
+ var is_confirmed = window.confirm(_("Are you sure you want to delete this patron both from the local database and from the Norwegian national patron database? This cannot be undone."));
+ if (is_confirmed) {
+ window.location='/cgi-bin/koha/members/deletemem.pl?member=' + borrowernumber + '&deletelocal=true&deleteremote=true';
+ }
+}
+
+function confirm_updatechild() {
+ var is_confirmed = window.confirm(_("Are you sure you want to update this child to an Adult category? This cannot be undone."));
+ if (is_confirmed) {
+ window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=' + borrowernumber + '&catcode=' + catcode + '&catcode_multi=' + CATCODE_MULTI;
+ }
+}
+
+function update_child() {
+ if( CATCODE_MULTI ){
+ window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=' + borrowernumber,'UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
+ } else {
+ confirm_updatechild();
+ }
+}
+
+function confirm_reregistration() {
+ var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
+ if (is_confirmed) {
+ window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=' + borrowernumber + '&destination=' + destination + '&reregistration=y';
+ }
+}
+function export_barcodes() {
+ window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=' + borrowernumber + '&op=export_barcodes');
+}
+var slip_re = /slip/;
+function printx_window(print_type) {
+ var handler = print_type.match(slip_re) ? "printslip" : "summary-print";
+ window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=" + borrowernumber + "&print=" + print_type, "printwindow");
+ return false;
+}
+function searchToHold(){
+ var date = new Date();
+ date.setTime(date.getTime() + (10 * 60 * 1000));
+ $.cookie("holdfor", borrowernumber, { path: "/", expires: date });
+ location.href="/cgi-bin/koha/catalogue/search.pl";
+}
--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
@@ -0,0 +1,20 @@
+$(document).ready(function(){
+ $(".none").click(function(){
+ if($(this).prop("checked")){
+ var rowid = $(this).attr("id");
+ var newid = Number(rowid.replace("none",""));
+ $("#sms"+newid).prop("checked", false);
+ $("#email"+newid).prop("checked", false);
+ $("#phone"+newid).prop("checked", false);
+ $("#digest"+newid).prop("checked", false);
+ $("#rss"+newid).prop("checked", false);
+ }
+ });
+ $(".active_notify").on("change",function(){
+ var attr_id = $(this).data("attr-id");
+ if( $(this).prop("checked") ){
+ $("#none" + attr_id ).prop("checked", false);
+ }
+ });
+ $("#info_digests").tooltip();
+});
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
@@ -85,6 +85,30 @@ $(document).ready(function() {
$("#itemSearchFallback").modal("show");
});
+ // Debarments
+ $("div#reldebarments .remove_restriction").on("click",function(){
+ return confirm(_("Remove restriction?"));
+ });
+ var mrform = $("#manual_restriction_form");
+ var mrlink = $("#add_manual_restriction");
+ mrform.hide();
+ mrlink.on("click",function(e){
+ $(this).hide();
+ mrform.show();
+ e.preventDefault();
+ });
+ $("#cancel_manual_restriction").on("click",function(e){
+ mrlink.show();
+ mrform.hide();
+ e.preventDefault();
+ });
+ $(".clear-date").on("click",function(e){
+ e.preventDefault();
+ var fieldID = this.id.replace("clear-date-","");
+ $("#" + fieldID).val("");
+ });
+
+
});
function export_checkouts(format) {
--