From c448d504120bcdc32c36c7142520a31df751690e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 Oct 2014 12:31:46 -0400 Subject: [PATCH] [PASSED QA] Bug 13183 - Improve visibility of automatic on-site checkout rule when OnSiteCheckoutsForce is on This patch addresses the case where OnSiteCheckoutsForce is enabled and the user is checking out to a patron who is blocked from checking out. Instead of showing the 'specify due date' form (which is disabled) this patch hides it and highlights the on-site checkout controls. This patch adds some CSS and consolidates some redundant CSS. To test, load a patron for checkout under the following conditions: 1. OnSiteCheckoutsForce is off and patron is not blocked from checkout 2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for being expired or restricted). 3. OnSiteCheckoutsForce is on and patron is not blocked from checkout 4. OnSiteCheckoutsForce is on and patron is blocked from checkout Signed-off-by: Liz Rea Checked these 4 conditions, plus that if a specified due date was allowed, that it was enforced. I noted that the on-site checkouts seemed to take longer to process, but this probably isn't the place for that sort of complaint. Signed-off-by: Katrin Fischer Small visual improvment for a new feature. No problems found. --- .../intranet-tmpl/prog/en/css/staff-global.css | 15 ++++--- .../prog/en/modules/circ/circulation.tt | 50 +++++++++++++--------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 69f5dc5..2ebb88d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -968,7 +968,8 @@ tr.highlight th[scope=row] { margin: .2em 0; } -.date-select { +.date-select, +.onsite_checkout-select { font-size : 85%; padding-top : .3em; } @@ -2715,16 +2716,16 @@ span.browse-button { color : #FFF; } -.onsite_checkout-select { - font-size : 85%; - font-weight: normal; - padding-top : .3em; -} #circ_circulation_issue .onsite_checkout-select label, .onsite_checkout-select label { font-size : inherit; font-weight: normal; } span.onsite_checkout { - color: red; + color: #cc0000; } +.onsite-checkout-only { + background-color : rgba(255, 242, 206, 0.5); + border-radius: 4px; + border : 1px solid #FFF2CE; +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 7421979..1d38654 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -536,29 +536,39 @@ No patron matched [% message %] - [% IF ( SpecifyDueDate ) %]
-
Specify due date [% INCLUDE 'date-format.inc' %]:
- [% IF ( duedatespec ) %][% ELSE %] -[% END %] - -[% IF ( stickyduedate ) %] - -[% ELSE %] - -[% END %] - -
[% END %] + [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] + [% IF ( SpecifyDueDate ) %] +
+
Specify due date [% INCLUDE 'date-format.inc' %]:
+ [% IF ( duedatespec ) %] + + [% ELSE %] + + [% END %] + + [% IF ( stickyduedate ) %] + + [% ELSE %] + + [% END %] + +
+ [% END %] + [% END %] - [% IF Koha.Preference('OnSiteCheckouts') %] + [% IF Koha.Preference('OnSiteCheckouts') %]
- [% IF noissues %] - - - [% ELSE %] - - [% END %] + [% IF noissues %] +
+ + + +
+ [% ELSE %] + + [% END %]
- [% END %] + [% END %] -- 1.9.1