Attachment 70577 Details for Bug 19188 – Bug-19188: Self checkout missing space for price

[patch] Bug-19188: Self checkout missing space for price

Bug-19188-Self-checkout-missing-space-for-price.patch (text/plain), 3.24 KB, created by jwayway on 2018-01-16 22:17:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jwayway

Created: 2018-01-16 22:17:00 UTC

Size: 3.24 KB

patch

obsolete

>From f98ac7b8347e224bcf3f764de8afbaf50c6ad01a Mon Sep 17 00:00:00 2001
>From: Jenny Way <jwayway@hotmail.com>
>Date: Tue, 16 Jan 2018 22:05:39 +0000
>Subject: [PATCH] Bug-19188: Self checkout missing space for price
>
>Test plan:
>1. Under administration and system preferences, enable WebBasedSelfCheck
>2. Login to localhost:8081 and issue a book
>3. In OPAC give user fine by going to 'my account' at top right
>4. Then under fines tab 'create manual invoice'
>5. Make sure this amount is more than OPACFineNoRenenwals which can be
>changed  under System prefernces
>6. Back in localhost:8081, try renewing the book
>7. Error 'Item cannot be checked out' should occur
>8. Without patch the currency symbol and amount is together
>9. With patch there should be a space in between
>---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 ++-
> opac/sco/sco-main.pl                                     | 6 ++++--
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index 2ab9367..9a2213e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -1,6 +1,7 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE AudioAlerts %]
>+[% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>@@ -53,7 +54,7 @@
>                                 [% ELSIF ( circ_error_NOT_FOR_LOAN ) %]
>                                     This item is not for loan.
>                                 [% ELSIF ( circ_error_DEBT ) %]
>-                                    You owe the library [% amount %] and cannot check out.
>+                                    You owe the library [% currencySym %] [% amount | $Price %] and cannot check out.
>                                 [% ELSIF ( circ_error_WTHDRAWN ) %]
>                                     This item has been withdrawn from the collection.
>                                 [% ELSIF ( circ_error_RESTRICTED ) %]
>diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
>index 4a14858..b2a956b 100755
>--- a/opac/sco/sco-main.pl
>+++ b/opac/sco/sco-main.pl
>@@ -163,7 +163,8 @@ elsif ( $patron and $op eq "checkout" ) {
>             hide_main                 => 1,
>         );
>         if ($issue_error eq 'DEBT') {
>-            $template->param(amount => $currencySymbol.$impossible->{DEBT});
>+            $template->param(currencySym => $currencySymbol,
>+                    amount => $impossible->{DEBT});
>         }
>         #warn "issue_error: " . $issue_error ;
>         if ( $issue_error eq "NO_MORE_RENEWALS" ) {
>@@ -195,7 +196,8 @@ elsif ( $patron and $op eq "checkout" ) {
>             hide_main                 => 1,
>         );
>         if ($issue_error eq 'DEBT') {
>-            $template->param(amount => $currencySymbol.$needconfirm->{DEBT});
>+            $template->param(currencySym => $currencySymbol,
>+                    amount => $needconfirm->{DEBT});
>         }
>     } else {
>         if ( $confirmed || $issuenoconfirm ) {    # we'll want to call getpatroninfo again to get updated issues.
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19188: 70577 | 70608 | 70624 | 71124 | 145708 | 145709 | 145763 | 145764 | 145864 | 145865