From 867131812a13d8494ffded296d65d568da94c760 Mon Sep 17 00:00:00 2001
From: Chris Cormack <crc@liblime.com>
Date: Wed, 26 Dec 2007 16:49:42 -0600
Subject: [PATCH] Fix for 1699, cant change category type

Now you can change a borrower to any category

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../en/modules/members/memberentrygen.tmpl    |  9 ++---
 members/memberentry.pl                        | 37 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 708756f72b..d7ab91d34c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -495,14 +495,13 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 	  <!-- TMPL_IF NAME="mandatorybranchcode" --><span class="required">Required</span><!-- /TMPL_IF -->
     </li>
     <li>
-    <!-- TMPL_IF NAME="catcodepopup" -->
+    <!-- TMPL_IF NAME="typeloop" -->
         <label for="categorycode">Category: </label>
         <select id="categorycode" name="categorycode">
-        <!-- TMPL_LOOP NAME="typeloop -->
-        <optgroup label="<!-- TMPL_VAR NAME="typename" -->
+        <!-- TMPL_LOOP NAME="typeloop" -->
+        <optgroup label="<!-- TMPL_IF EXPR="typename eq 'C'" -->Child<!-- /TMPL_IF --><!-- TMPL_IF EXPR="typename eq 'A'" -->Adult<!-- /TMPL_IF --><!-- TMPL_IF EXPR="typename eq 'S'" -->Staff<!-- /TMPL_IF --><!-- TMPL_IF EXPR="typename eq 'I'" -->Organisation<!-- /TMPL_IF --><!-- TMPL_IF EXPR="typename eq 'P'" -->Professional<!-- /TMPL_IF -->">
                 <!-- TMPL_LOOP NAME="categoryloop" -->
-                <option value="<!-- TMPL_VAR NAME="categorycode" -->" <!-- TMPL_IF NAME="categorycodeselected" -->selected <!-- /TMP
-L_IF -->><!-- TMPL_VAR NAME="categoryname" --></option>
+                <option value="<!-- TMPL_VAR NAME="categorycode" -->" <!-- TMPL_IF NAME="categorycodeselected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="categoryname" --></option>
                 <!-- /TMPL_LOOP -->
         </optgroup>
         <!-- /TMPL_LOOP -->
diff --git a/members/memberentry.pl b/members/memberentry.pl
index ac342c4c4c..f23dca512a 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -295,23 +295,26 @@ if ($ethnicitycategoriescount>=0) {
   $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
 }
 
-
-my $action="WHERE category_type=?";
-($categories,$labels)=GetborCatFromCatType($category_type,$action);
-  
-if(scalar(@$categories)){
-      #if you modify the borrowers you must have the right value for his category code
-  my $default_category=$newdata{'categorycode'} if ($op  eq 'modify');
-  my $catcodepopup = CGI::popup_menu(
-      -name=>'categorycode',
-  -id => 'categorycode',
-  -values=>$categories,
-    -labels=>$labels,
-  -default=>$default_category
-  );
-  $template->param(catcodepopup=>$catcodepopup);
-}
-  #test in city
+my @typeloop;
+foreach (qw(C A S P I)){
+	my $action="WHERE category_type=?";
+	($categories,$labels)=GetborCatFromCatType($_,$action);
+	my @categoryloop;
+	foreach my $cat (@$categories){
+		push @categoryloop,{'categorycode' => $cat,
+			  'categoryname' => $labels->{$cat},
+			  'categorycodeselected' => ($cat eq $borrower_data->{'categorycode'}),
+		};
+	}
+	my %typehash;
+	$typehash{'typename'}=$_;
+	$typehash{'categoryloop'}=\@categoryloop;
+	push @typeloop,{'typename' => $_,
+	  'categoryloop' => \@categoryloop};
+}  
+$template->param('typeloop' => \@typeloop);
+
+# test in city
 $select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
 ($default_city=$select_city) if ($step eq 0);
 if ($select_city eq '' ){
-- 
2.39.5