Fix for 1599 getting expiry date prepopulating on member entry

[koha_gimpoz] / members / memberentry.pl

diff --git a/members/memberentry.pl b/members/memberentry.pl
index f23dca5..67a9ccf 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -155,7 +155,7 @@ if (($category_type eq 'C' || $category_type eq 'P') and $guarantorid ne '' ){
     $data{'contactfirstname'}= $guarantordata->{'firstname'}; 
     $data{'contactname'}     = $guarantordata->{'surname'};
     $data{'contacttitle'}    = $guarantordata->{'title'};  
-       foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro)) {
+         foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) {
                $data{$_} = $guarantordata->{$_};
        }
   }
@@ -232,10 +232,10 @@ if ((!$nok) and ($op eq 'insert' or $op eq 'save')){
                        delete $newdata{'password'};
                        delete $newdata{'userid'};
                }
-               &ModMember(%newdata);   # this is the last server-changing line.  the rest is "presentation"
+               &ModMember(%newdata);    
        }
        print scalar ($destination eq "circ") ? 
-               $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}") :
+               $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") :
                $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber") ;
        exit;           # You can only send 1 redirect!  After that, content or other headers don't matter.
 }
@@ -264,7 +264,10 @@ if (C4::Context->preference("IndependantBranches")) {
   }
 }
 if ($op eq 'add'){
-  $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+       my $arg2 = $newdata{'dateenrolled'} || sprintf('%04d-%02d-%02d', Today()); 
+       $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
+       $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+       
 } 
 if ($op eq "modify")  {
   $template->param( updtype => 'M',modify => 1 );
@@ -345,6 +348,7 @@ my $roadpopup = CGI::popup_menu(-name=>'streettype',
 my $default_borrowertitle;
 $default_borrowertitle=$data{'title'} ;
 my($borrowertitle)=GetTitles();
+$template->param( title_cgipopup => 1) if ($borrowertitle);
 my $borrotitlepopup = CGI::popup_menu(-name=>'title',
         -id => 'btitle',
         -values=>$borrowertitle,
@@ -364,27 +368,28 @@ while (@relationships) {
   }
   push(@relshipdata, \%row);
 }
-my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
-        'lost'          => ['lost', 'Lost'],
-        'debarred'      => ['debarred', 'Debarred']);
 
+my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
+        'lost'          => ['lost'],
+        'debarred'      => ['debarred']);
+
+ 
 my @flagdata;
 foreach (keys(%flags)) {
-my $key = $_;
-my %row =  ('key'   => $key,
-    'name'  => $flags{$key}[0],
-    'html'  => $flags{$key}[1]);
-if ($data{$key}) {
-  $row{'yes'}=' checked';
-  $row{'no'}='';
-} else {
-  $row{'yes'}='';
-  $row{'no'}=' checked';
-}
-push(@flagdata, \%row);
+       my $key = $_;
+       my %row =  ('key'   => $key,
+                   'name'  => $flags{$key}[0]);
+       if ($data{$key}) {
+               $row{'yes'}=' checked';
+               $row{'no'}='';
+    }
+       else {
+               $row{'yes'}='';
+               $row{'no'}=' checked';
+       }
+       push @flagdata,\%row;
 }
 
-
 #get Branches
 my @branches;
 my @select_branch;
@@ -406,7 +411,7 @@ foreach my $branch (sort keys %$branches) {
 # --------------------------------------------------------------------------------------------------------
   #in modify mod :default value from $CGIbranch comes from borrowers table
   #in add mod: default value come from branches table (ip correspendence)
-$default=$data{'branchcode'}  if ($op eq 'modify');
+$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C'));
 my $CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
             -name   => 'branchcode',
             -values => \@select_branch,