Attachment 152761 Details for Bug 33028 – Bug 33028: Remove Price formatting as we are missing JS unformat

[patch] Bug 33028: Remove Price formatting as we are missing JS unformat

Bug-33028-Remove-Price-formatting-as-we-are-missin.patch (text/plain), 3.60 KB, created by Martin Renvoize (ashimema) on 2023-06-27 15:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-06-27 15:58:46 UTC

Size: 3.60 KB

patch

obsolete

>From 70ff22deeb63616f52ec5985d94d17493fa8245b Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer@bsz-bw.de>
>Date: Wed, 21 Jun 2023 08:49:52 +0000
>Subject: [PATCH] Bug 33028: Remove Price formatting as we are missing JS
> unformat
>
>Taking a step back with the formatting as we don't have an implementation
>of unformat in JS yet. It could be readded later on a separate
>report.
>
>With this we will avoid the problem that editing a rule copies
>falsely formatted values into the input fields that trigger
>the pattern check on saving and require manual changing (or
>without the check would be falsely saved to the db)
>
>Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt   | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index 68f9cb5a65..ec9126158a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -6,7 +6,6 @@
> [% USE Categories %]
> [% USE ItemTypes %]
> [% USE CirculationRules %]
>-[% USE Price %]
> [% SET footerjs = 1 %]
> 
> [% SET branchcode = humanbranch || undef %]
>@@ -287,11 +286,11 @@
>                                                   [% END %]
>                                                 </td>
>                                                 <td>[% decreaseloanholds | html %]</td>
>-                                                <td>[% fine | $Price %]</td>
>+                                                <td>[% fine | html %]</td>
>                                                 <td>[% chargeperiod | html %]</td>
>                                                 <td>[% IF chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td>
>                                                 <td>[% firstremind | html %]</td>
>-                                                <td>[% overduefinescap | $Price %]</td>
>+                                                <td>[% overduefinescap | html %]</td>
>                                                 <td>
>                                                     [% IF cap_fine_to_replacement_price %]
>                                                         <input type="checkbox" checked="checked" disabled="disabled" />
>@@ -387,7 +386,7 @@
>                                                         [% END %]
>                                                     </td>
>                                                     <td>[% recall_due_date_interval | html %]</td>
>-                                                    <td>[% recall_overdue_fine | $Price %]</td>
>+                                                    <td>[% recall_overdue_fine | html %]</td>
>                                                     <td>[% recall_shelf_time | html %]</td>
>                                                 [% END %]
>                                                 <td class="actions">
>@@ -1030,7 +1029,7 @@
>                                     </td>
>                                     <td>
>                                         [% IF article_request_fee.defined && article_request_fee != '' %]
>-                                            [% article_request_fee | $Price %]
>+                                            [% article_request_fee | html %]
>                                         [% ELSE %]
>                                             <span>0</span>
>                                         [% END %]
>-- 
>2.41.0

Actions: View | Diff | Splinter Review

Attachments on bug 33028: 147058 | 147686 | 147687 | 147688 | 152441 | 152442 | 152443 | 152444 | 152445 | 152446 | 152509 | 152510 | 152511 | 152512 | 152513 | 152514 | 152515 | 152752 | 152753 | 152754 | 152755 | 152756 | 152757 | 152758 | 152759 | 152760 | 152761 | 152762 | 152763 | 152764 | 152803 | 152804 | 152805 | 152829 | 152928 | 152929 | 152930 | 152931 | 152932 | 152933 | 152934 | 152935 | 152936 | 153313 | 153314 | 153315 | 153316 | 153317 | 153318 | 153319 | 153320 | 153321 | 153322 | 153323 | 153619 | 153620 | 153632 | 153633 | 153634 | 153635 | 153636 | 153677