Attachment 98771 Details for Bug 24646 – Bug 24646: Move RoundFinesAtPayment to 'Fines policy' section

[patch] Bug 24646: Move RoundFinesAtPayment to 'Fines policy' section

Bug-24646-Move-RoundFinesAtPayment-to-Fines-policy.patch (text/plain), 3.69 KB, created by Nick Clemens (kidclamp) on 2020-02-12 18:46:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2020-02-12 18:46:15 UTC

Size: 3.69 KB

patch

obsolete

>From 7ce3f928f98b79501555fe54750090eeb222fb6e Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 12 Feb 2020 18:44:05 +0000
>Subject: [PATCH] Bug 24646: Move RoundFinesAtPayment to 'Fines policy' section
>
>To test:
> - Search Admin->System preferences for 'RoundFinesAtPayment'
> - Note it is listed under self-check
> - Apply patch
> - Restart/refresh
> - Note it is now under 'Fines Policy'
>---
> Koha/Z3950Responder.pm                                       |  2 +-
> .../prog/en/modules/admin/preferences/circulation.pref       | 12 ++++++------
> members/paycollect.pl                                        |  3 +++
> misc/z3950_responder.pl                                      |  3 ++-
> 4 files changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/Koha/Z3950Responder.pm b/Koha/Z3950Responder.pm
>index fe335c5b26..199bbce0aa 100644
>--- a/Koha/Z3950Responder.pm
>+++ b/Koha/Z3950Responder.pm
>@@ -107,7 +107,7 @@ sub new {
> 
>     # Set num to prefetch if not passed
>     $self->{num_to_prefetch} //= 20;
>-
>+warn Data::Dumper::Dumper( @_ );
>     $self->{server} = Net::Z3950::SimpleServer->new(
>         INIT => sub { $self->init_handler(@_) },
>         SEARCH => sub { $self->search_handler(@_) },
>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 6eb5af0660..f761a0c65a 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
>@@ -902,6 +902,12 @@ Circulation:
>             - pref: ProcessingFeeNote
>               type: textarea
>               class: code
>+        -
>+            - pref: RoundFinesAtPayment
>+              choices:
>+                  yes: Do
>+                  no: "Don't"
>+            - round fines to the nearest cent when collecting payments. Enabling this preference allows paying fines of partial cents which may not be visible in the interface.
>     Self check-in module:
>         -
>             - "Include the following HTML on the self check-in screen:"
>@@ -932,12 +938,6 @@ Circulation:
>               type: textarea
>               syntax: javascript
>               class: code
>-        -
>-            - pref: RoundFinesAtPayment
>-              choices:
>-                  yes: Do
>-                  no: "Don't"
>-            - round fines to the nearest cent when collecting payments. Enabling this preference allows paying fines of partial cents which may not be visible in the interface.
>     Self Checkout:
>         -
>             - "Include the following JavaScript on all pages in the web-based self checkout:"
>diff --git a/members/paycollect.pl b/members/paycollect.pl
>index a7f0e39108..c3962751a3 100755
>--- a/members/paycollect.pl
>+++ b/members/paycollect.pl
>@@ -159,6 +159,9 @@ if ( $selected_accts ) {
> 
> if ( $total_paid and $total_paid ne '0.00' ) {
>     $total_paid = $total_due if (abs($total_paid - $total_due) < 0.01) && C4::Context->preference('RoundFinesAtPayment');
>+    warn $total_paid;
>+    warn $total_due;
>+    warn C4::Context->preference('RoundFinesAtPayment');
>     if ( $total_paid < 0 or $total_paid > $total_due ) {
>         $template->param(
>             error_over => 1,
>diff --git a/misc/z3950_responder.pl b/misc/z3950_responder.pl
>index 871fca676f..e9f729ea91 100755
>--- a/misc/z3950_responder.pl
>+++ b/misc/z3950_responder.pl
>@@ -165,7 +165,8 @@ if (!$config_dir) {
> }
> 
> # Create and start the server.
>-
>+warn Data::Dumper::Dumper(@yaz_options);
>+warn Data::Dumper::Dumper($config_dir);
> my $z = Koha::Z3950Responder->new( {
>     add_item_status_subfield => $add_item_status_subfield,
>     add_status_multi_subfield => $add_status_multi_subfield,
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24646: 98771 | 99064 | 99234 | 99293 | 99459 | 99464 | 100685