Attachment 93203 Details for Bug 23686 – Bug 23686: Check onsite checkout when the last checkout was an onsite one

[patch] Bug 23686: Check onsite checkout when the last checkout was an onsite one

Bug-23686-Check-onsite-checkout-when-the-last-chec.patch (text/plain), 6.17 KB, created by Owen Leonard on 2019-09-27 12:28:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-09-27 12:28:25 UTC

Size: 6.17 KB

patch

obsolete

>From 734bae5c60710b344d98a5a4629e3c92b4a26cea Mon Sep 17 00:00:00 2001
>From: Nicolas Legrand <nicolas.legrand@bulac.fr>
>Date: Fri, 27 Sep 2019 10:14:35 +0200
>Subject: [PATCH] Bug 23686: Check onsite checkout when the last checkout was
> an onsite one
>
>Prevent from checking again and again the onsite checkout box when
>doing onsite checkouts in batches. If preceding checkout was an onsite
>one, the box will be checked.
>
>Test plan:
>
>1. enable  OnSiteCheckouts
>2. make your circulation rules able to checkout onsite
>3. onsite checkout a document
>4. you should return to the checkout page, the box isn't checked
>5. apply patch
>6. updatedatabase.pl
>7. redo steps 3, it should again print a checkout page with an
>   unchecked onsite checkout box
>8. enable  OnSiteCheckoutAutoCheck system preference
>9. redo step 3
>10. when returning to the checkout page, the onsite checkout box
>    should be already checked
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> circ/circulation.pl                                               | 5 ++++-
> .../mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl    | 8 ++++++++
> installer/data/mysql/sysprefs.sql                                 | 1 +
> .../prog/en/modules/admin/preferences/circulation.pref            | 6 ++++++
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt       | 4 ++++
> 5 files changed, 23 insertions(+), 1 deletion(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 74c42d8c041..c90b2ba5538 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -148,9 +148,12 @@ my $force_allow_issue = $query->param('forceallow') || 0;
> if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
>     $force_allow_issue = 0;
> }
>-
> my $onsite_checkout = $query->param('onsite_checkout');
> 
>+if (C4::Context->preference("OnSiteCheckoutAutoCheck") && $onsite_checkout eq "on") {
>+    $template->param(onsite_checkout => $onsite_checkout);
>+}
>+
> my @failedrenews = $query->multi_param('failedrenew');    # expected to be itemnumbers
> our %renew_failed = ();
> for (@failedrenews) { $renew_failed{$_} = 1; }
>diff --git a/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl b/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl
>new file mode 100644
>index 00000000000..f48672543db
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl
>@@ -0,0 +1,8 @@
>+$DBversion = 'XXX';
>+if( CheckVersion( $DBversion ) ) {
>+
>+    $dbh->do(qq{
>+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
>+        ('OnSiteCheckoutAutoCheck','0','','onsite Checkout by default if last checkout was an onsite checkout box','YesNo')
>+    });
>+}
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 5b916426bf0..32ebc3523ad 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -243,6 +243,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('RecordedBooksLibraryID','','','Library ID for RecordedBooks integration','Integer'),
> ('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
> ('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
>+('OnSiteCheckoutAutoCheck','0','','onsite Checkout by default if last checkout was an onsite checkout box','YesNo'),
> ('INTRAdidyoumean','',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
> ('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
> ('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>index d5ea2656cfb..915d9913f2e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>@@ -160,6 +160,12 @@ Circulation:
> 
>     Checkout Policy:
>         -
>+            - pref: OnSiteCheckoutAutoCheck
>+              choices:
>+                  yes: Enable
>+                  no: Don't enable
>+            - onsite checkout by default if last checkout was an onsite one
>+        -
>             - pref: AutoReturnCheckedOutItems
>               choices:
>                   yes: Don't
>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 5fb4889bed8..86803440d4d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -600,7 +600,11 @@
>                                                                     <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
>                                                                 </div>
>                                                             [% ELSE %]
>+                                                                [% IF Koha.Preference('OnSiteCheckoutAutoCheck') && onsite_checkout == "on" %]
>+                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" checked="checked" /> <label for="onsite_checkout">On-site checkout</label>
>+                                                                [% ELSE %]
>                                                                 <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" /> <label for="onsite_checkout">On-site checkout</label>
>+                                                                [% END %]
>                                                             [% END %]
>                                                         </div>
>                                                     [% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23686: 93186 | 93203 | 93489 | 93490