From ff42d0805b72c2991ec855cd1c907898f9d03955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9raud=20Frappier?= Date: Fri, 21 Oct 2022 13:56:16 -0400 Subject: [PATCH] Bug 12446: Merge conflit resolve and add missing var This patch resolve merge conflit and add the instantiation of the variable "my $categories" that was missing in memberentry.pl. --- members/memberentry.pl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 0a85c91c21..a8fee5a4fd 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -651,13 +651,14 @@ if(!defined($data{'sex'})){ my @typeloop; my $no_categories = 1; -my $no_add; + foreach my $category_type (qw(C A S P I X)) { my $categories_limits = { category_type => $category_type }; $categories_limits->{canbeguarantee} = 1 if ($guarantor_id); my $patron_categories = Koha::Patron::Categories->search_with_library_limits( $categories_limits, {order_by => ['categorycode']} ); $no_categories = 0 if $patron_categories->count > 0; - +} +my $categories; $template->param( patron_categories => $categories, no_categories => $no_categories, @@ -757,9 +758,7 @@ $template->param( step => $step ) if $step; # associate with step to know wh $template->param( BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript - category_type => $category_type,#to know the category type of the borrower - "$category_type" => 1,# associate with step to know where u are - destination => $destination,#to know where u come from and where u must go in redirect + destination => $destination,#to know wheree u come from and wheree u must go in redirect check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0) "op$op" => 1); -- 2.34.1