Bug 23710: (follow-up) Human readable error messages in request.tt, check AllowHoldPo...

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/REST/V1/Holds.pm b/Koha/REST/V1/Holds.pm
index 5ccc1fd..04d1014 100644 (file)
--- a/Koha/REST/V1/Holds.pm
+++ b/Koha/REST/V1/Holds.pm
@@ -84,6 +84,7 @@ sub add {
         my $item_type         = $body->{item_type};
         my $expiration_date   = $body->{expiration_date};
         my $notes             = $body->{notes};
+        my $hold_date         = C4::Context->preference( 'AllowHoldDateInFuture' )?$body->{hold_date}:undef;
 
         if ( $item_id and $biblio_id ) {
 
@@ -135,7 +136,9 @@ sub add {
             ? C4::Reserves::CanItemBeReserved( $patron_id, $item_id )
             : C4::Reserves::CanBookBeReserved( $patron_id, $biblio_id );
 
-        unless ( $can_place_hold->{status} eq 'OK' ) {
+        my $can_override = C4::Context->preference('AllowHoldPolicyOverride');
+
+        unless ($can_override || $can_place_hold->{status} eq 'OK' ) {
             return $c->render(
                 status => 403,
                 openapi =>
@@ -156,7 +159,7 @@ sub add {
             $biblio_id,
             undef,    # $bibitems param is unused
             $priority,
-            undef,    # hold date, we don't allow it currently
+            $hold_date,
             $expiration_date,
             $notes,
             $biblio->title,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 10c8cd7..9170dd3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -948,6 +948,17 @@
             [% END %][% END %][% END %]
         };
         var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items.");
+        var ERROR_MAP = {
+            damaged: _("Item damaged"),
+            ageRestricted: _("Age restricted"),
+            tooManyHoldsForThisRecord: _("Exceeded max holds per record"),
+            tooManyReservesToday: _("Daily hold limit reached for patron"),
+            tooManyReserves: _("Too many holds"),
+            notReservable: _("Not holdable"),
+            cannotReserveFromOtherBranches: _("Patron is from different library"),
+            itemAlreadyOnHold: _("Patron already has hold for this item"),
+            cannotBeTransferred: _("Cannot be transferred to pickup library")
+        }
         columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
 
         $(document).ready(function() {
@@ -1005,7 +1016,7 @@
 
             $("#club-request-form, #hold-request-form").on("submit", function() {
                 let $t = $(this);
-                $('.clubalert').addClass('hide');
+                $('.clubalert, .holdalert').addClass('hide');
                 let biblionumbers = [biblionumber];
                 let biblionumbers_text;
                 const data = {
@@ -1048,7 +1059,12 @@
                             document.location = url;
                         })
                         .fail(function(err) {
-                            $('.clubalert, .holdalert').removeClass('hide').html(err.responseJSON.error);
+                            var message = err.responseJSON.error;
+                            var match = err.responseJSON.error.match(/Reason: (\w+)\s*$/);
+                            if(match && ERROR_MAP[match[1]]) {
+                                message = '<div><strong>'+_("Cannot place hold")+'</strong></div><div>'+ERROR_MAP[match[1]]+'</div>'
+                            }
+                            $('.clubalert, .holdalert').removeClass('hide').html(message);
                         });
                     }
                 });