X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fupdate-child.pl;h=b0aff0d8524872e0f59881d3df676a7fd01f2ce1;hb=9f112ff75c2049cb3e5a259e38ad27a7282f53d2;hp=492219f483341868342faddd859fc2e611995b30;hpb=aef1dd15fbe37a8a9c30ba4b38f7ecd6c1fea54d;p=koha.git

diff --git a/members/update-child.pl b/members/update-child.pl
index 492219f483..b0aff0d852 100755
--- a/members/update-child.pl
+++ b/members/update-child.pl
@@ -4,35 +4,35 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 updatechild.pl
 
     script to update a child member to (usually) an adult member category
 
     - if called with op=multi, will return all available non child categories, for selection.
-    - if called with op=update, script will update member record via  ModMember().
+    - if called with op=update, script will update member record via Koha::Patron->store.
 
 =cut
 
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use C4::Members;
+use Koha::Patrons;
+use Koha::Patron::Categories;
 
 # use Smart::Comments;
 
@@ -41,11 +41,11 @@ my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/update-child.tmpl",
+        template_name   => "members/update-child.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { borrowers => 1 },
+        flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
 );
@@ -53,42 +53,44 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $borrowernumber = $input->param('borrowernumber');
 my $catcode        = $input->param('catcode');
 my $cattype        = $input->param('cattype');
-my $catcode_multi = $input->param('catcode_multi');
 my $op             = $input->param('op');
 
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+
+my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
 if ( $op eq 'multi' ) {
-    my ( $catcodes, $labels ) =
-		# FIXME - what are the possible upgrade paths?  C -> A , C -> S ...
-		#   currently just allowing C -> A because of limitation of API.
-      GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
-    my @rows;
-    foreach my $k ( keys %$labels ) {
-        my $row;
-        $row->{catcode} = $k;
-        $row->{catdesc} = $labels->{$k};
-        my $borcat = GetBorrowercategory( $row->{catcode} );
-        $row->{cattype} = $borcat->{'category_type'};
-        push @rows, $row;
-    }
+    # FIXME - what are the possible upgrade paths?  C -> A , C -> S ...
+    #   currently just allowing C -> A
     $template->param(
-        MULTI          => 1,
-        CATCODE_MULTI          => 1,
-        borrowernumber => $borrowernumber,
-        CAT_LOOP       => \@rows,
+        MULTI             => 1,
+        borrowernumber    => $borrowernumber,
+        patron_categories => $patron_categories,
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 elsif ( $op eq 'update' ) {
-    my $member = GetMember('borrowernumber'=>$borrowernumber);
-    $member->{'guarantorid'}  = 0;
-    $member->{'categorycode'} = $catcode;
-    my $borcat = GetBorrowercategory($catcode);
-    $member->{'category_type'} = $borcat->{'category_type'};
-    $member->{'description'}   = $borcat->{'description'};
-    ModMember(%$member);
-
-    if (  $catcode_multi ) {
+    my $patron         = Koha::Patrons->find( $borrowernumber );
+    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
+
+    my $adult_category;
+    if ( $patron_categories->count == 1 ) {
+        $adult_category = $patron_categories->next;
+    } else {
+        $adult_category = $patron_categories->search({'me.categorycode' => $catcode })->next;
+    }
+
+    # Just in case someone is trying something bad
+    # But we should not hit that with a normal use of the interface
+    die "You are doing something wrong updating this child" unless $adult_category;
+
+    $patron->guarantorid(undef);
+    $patron->categorycode($adult_category->categorycode);
+    $patron->store;
+
+    # FIXME We should not need that
+    # We could redirect with a friendly message
+    if ( $patron_categories->count > 1 ) {
         $template->param(
                 SUCCESS        => 1,
                 borrowernumber => $borrowernumber,