Bug 20629: Pass accountline objects to template instead of hashref

[koha.git] / members / update-child.pl

diff --git a/members/update-child.pl b/members/update-child.pl
index c7e87b1..b0aff0d 100755 (executable)
--- a/members/update-child.pl
+++ b/members/update-child.pl
@@ -22,7 +22,7 @@
     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
 
@@ -31,7 +31,6 @@ use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use C4::Members;
 use Koha::Patrons;
 use Koha::Patron::Categories;
 
@@ -46,7 +45,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { borrowers => 1 },
+        flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
 );
@@ -54,16 +53,16 @@ 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' ) {
     # FIXME - what are the possible upgrade paths?  C -> A , C -> S ...
     #   currently just allowing C -> A
-    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
     $template->param(
         MULTI             => 1,
-        CATCODE_MULTI     => 1,
         borrowernumber    => $borrowernumber,
         patron_categories => $patron_categories,
     );
@@ -71,21 +70,27 @@ if ( $op eq 'multi' ) {
 }
 
 elsif ( $op eq 'update' ) {
-    my $patron = Koha::Patrons->find( $borrowernumber );
-    unless ( $patron ) {
-        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
-        exit;
+    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;
     }
-    my $member = $patron->unblessed;
-    $member->{'guarantorid'}  = 0;
-    $member->{'categorycode'} = $catcode;
-    my $borcat = Koha::Patron::Categories->find($catcode);
-    $member->{'category_type'} = $borcat->category_type;
-    $member->{'description'}   = $borcat->description;
-    delete $member->{password};
-    ModMember(%$member);
-
-    if (  $catcode_multi ) {
+
+    # 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,