From 35d5c5c226b32348eb34e09f20c709ef963affd3 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 3 Jun 2021 06:57:52 -0400
Subject: [PATCH] Bug 28510: Remove marking of closed branches as
 'disable_transfer'

We no longer need to act as if closed branches were marked as
disable_transfer. This allows us to clean up a nice bit of code.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 28510: Remove unused variable

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 15373c26f060aa9dba30854096fdce32664946ab)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 C4/HoldsQueue.pm               | 10 +---------
 admin/transport-cost-matrix.pl |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
index 84ea501fd7..90be67c552 100644
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -63,13 +63,11 @@ Returns Transport Cost Matrix as a hashref <to branch code> => <from branch code
 
 sub TransportCostMatrix {
     my ( $params ) = @_;
-    my $ignore_holds_queue_skip_closed = $params->{ignore_holds_queue_skip_closed};
 
     my $dbh   = C4::Context->dbh;
     my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });
 
     my $today = dt_from_string();
-    my $calendars;
     my %transport_cost_matrix;
     foreach (@$transport_costs) {
         my $from     = $_->{frombranch};
@@ -80,14 +78,8 @@ sub TransportCostMatrix {
             cost             => $cost,
             disable_transfer => $disabled
         };
-
-        if ( !$ignore_holds_queue_skip_closed && C4::Context->preference("HoldsQueueSkipClosed") ) {
-            $calendars->{$from} ||= Koha::Calendar->new( branchcode => $from );
-            $transport_cost_matrix{$to}{$from}{disable_transfer} ||=
-              $calendars->{$from}->is_holiday( $today );
-        }
-
     }
+
     return \%transport_cost_matrix;
 }
 
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
index e28ee89b79..34f6ca7869 100755
--- a/admin/transport-cost-matrix.pl
+++ b/admin/transport-cost-matrix.pl
@@ -45,7 +45,7 @@ my $update = ( $input->param('op') // '' ) eq 'set-cost-matrix';
 
 my ($cost_matrix, $have_matrix);
 unless ($update) {
-    $cost_matrix = TransportCostMatrix({ ignore_holds_queue_skip_closed => 1 });
+    $cost_matrix = TransportCostMatrix();
     $have_matrix = keys %$cost_matrix if $cost_matrix;
 }
 
-- 
2.39.5