From e87d5dff12de9d9dcd749303d182707478215f4e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 12 Sep 2023 15:28:34 +0000 Subject: [PATCH] Bug 34768: Remove checkbox column from relatives fines on OPAC When a patron has a guarantee and can see their fines on the opac and an opac payment plugin is enabled there is an error on the 'Charges' tab. The table uses a 'COLSPAN' variable which is set to 5 or 6 depending on if OPAC payments are enabled. The guarantees table has one less column than the patron's however, so it is going out of range and causing a JS error. Additionally, we are adding a column to the child's table which is not used as their fines cannot be selected for payment at this time. This patch removes the checkbox column and sets the colspan directly to 4 I also fix an issue where the table is not being set as we need to reference the patron object in the guarantor info to obtain the id. To test: 1 - Set system preference: AllowStaffToSetFinesVisibilityForGuarantor to allow 2 - Find a patron 3 - Add some fines to their account 4 - Install and enable an opac payment plugin (https://github.com/bywatersolutions/koha-plugin-pay-via-govolution for example) 5 - Sign in to OPAC as borrower 6 - Go to 'Charges' tab 7 - Select a fee 8 - Confirm 'Make payment' button enabled and 'amount to pay' is updated 9 - Add a guarantee to patron in staff interface 10 - Set 'Show charges to guarantors' to 'Yes' 11 - Add and pay a fine for the child 12 - View guarantor account on the OPAC 13 - Confirm you now see child's charges 14 - Confirm selecting your own fees does not enable the button or update amount to pay 15 - Note JS error in console 16 - Apply patch 17 - Reload patrons page 18 - Confirm the table loads correctly (no JS error) 19 - Confirm selecting a fine updates the total and enables button 20 - Disable the payment plugin 21 - Confirm the display is still correct, no errors Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a3e40408ea6792186e87e95a7de1dff515981432) Signed-off-by: Fridolin Somers (cherry picked from commit c61c182fda90cf2349be55a1c090a95daa42aa42) Signed-off-by: Matt Blenkinsop --- .../bootstrap/en/includes/account-table.inc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index dcd0b0f1bb..3605fcab1d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -91,10 +91,9 @@ [% FOREACH r IN relatives %]

[% r.patron.firstname | html %] [% r.patron.surname | html %]'s fines and charges

- +
- [% IF ENABLE_OPAC_PAYMENTS %][% END %] @@ -109,15 +108,6 @@ [% FOREACH a IN r.accountlines %] [% SET account_sum = account_sum + a.amountoutstanding %] - [% IF ENABLE_OPAC_PAYMENTS %] - - [% END %]
 Created Updated Description
- [% IF a.amountoutstanding > 0 %] - [% SET DISPLAY_PAYMENT_BLOCK = 1 %] - - - [% END %] - [% a.date | $KohaDates %] [% a.timestamp | $KohaDates with_hours = 1 %] -- 2.39.2