From bd5bb14007edd4e406ce509806f811a1dff5efef Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 21 Jul 2020 10:52:49 +0100
Subject: [PATCH] Bug 24786: Update borroaccount to use session register

This patch adds handling to allow for the use of the session cash
register by default if it has been set, otherwise it defaults to '--
None --' and requires the end user to select the register to proceed
with the refund or payout action.
---
 .../prog/en/modules/members/boraccount.tt     | 27 +++++++++----------
 members/boraccount.pl                         | 27 +------------------
 2 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 94f0b9620a..4752d7759c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -8,6 +8,7 @@
 [% USE Price %]
 [% USE Branches %]
 [% SET footerjs = 1 %]
+[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
 
 [% PROCESS 'accounts.inc' %]
 
@@ -141,6 +142,11 @@
                         <h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4>
                     </div>
                     <div class="modal-body">
+                        [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]
+                        <div id="error_message" class="dialog alert">
+                            You must have at least one cash register associated with this branch before you can record cash payouts.
+                        </div>
+                        [% END %]
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -170,13 +176,7 @@
                                 <li>
                                     <label for="registerid">Cash register: </label>
                                     <select name="registerid" id="payout_registerid">
-                                        [% FOREACH register IN registers %]
-                                          [% IF register.id == registerid %]
-                                        <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
-                                          [% ELSE %]
-                                        <option value="[% register.id | html %]">[% register.name | html %]</option>
-                                          [% END %]
-                                        [% END %]
+                                        [% PROCESS options_for_registers register_required => 1 %]
                                     </select>
                                 </li>
                                 [% END %]
@@ -207,6 +207,11 @@
                         <h4 class="modal-title" id="issueRefundLabel">Issue refund</h4>
                     </div>
                     <div class="modal-body">
+                        [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]
+                        <div id="error_message" class="dialog alert">
+                            You must have at least one cash register associated with this branch before you can record cash refunds.
+                        </div>
+                        [% END %]
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -237,13 +242,7 @@
                                 <li>
                                     <label for="registerid">Cash register: </label>
                                     <select name="registerid" id="refund_registerid">
-                                        [% FOREACH register IN registers %]
-                                          [% IF register.id == registerid %]
-                                        <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
-                                          [% ELSE %]
-                                        <option value="[% register.id | html %]">[% register.name | html %]</option>
-                                          [% END %]
-                                        [% END %]
+                                        [% PROCESS options_for_registers register_required => 1 %]
                                     </select>
                                 </li>
                                 [% END %]
diff --git a/members/boraccount.pl b/members/boraccount.pl
index a1ca911724..5f43abe582 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -67,32 +67,7 @@ unless ( $patron ) {
 
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-my $registerid;
-if ( C4::Context->preference('UseCashRegisters') ) {
-    $registerid = scalar $input->param('registerid');
-    my $registers  = Koha::Cash::Registers->search(
-        { branch   => $library_id, archived => 0 },
-        { order_by => { '-asc' => 'name' } }
-    );
-
-    if ( !$registers->count ) {
-        $template->param( error_registers => 1 );
-    }
-    else {
-
-        if ( !$registerid ) {
-            my $default_register = Koha::Cash::Registers->find(
-                { branch => $library_id, branch_default => 1 } );
-            $registerid = $default_register->id if $default_register;
-        }
-        $registerid = $registers->next->id if !$registerid;
-
-        $template->param(
-            registerid => $registerid,
-            registers  => $registers,
-        );
-    }
-}
+my $registerid = $input->param('registerid');
 
 if ( $action eq 'void' ) {
     my $payment_id = scalar $input->param('accountlines_id');
-- 
2.20.1