View | Details | Raw Unified | Return to bug 20828
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-2 / +5 lines)
Lines 147-153 Link Here
147
<input type="hidden" name="op" value="insert" />
147
<input type="hidden" name="op" value="insert" />
148
[% ELSE %]
148
[% ELSE %]
149
<input type="hidden" name="op" value="save" />
149
<input type="hidden" name="op" value="save" />
150
[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 %]
150
[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %]
151
[%# Only put the cardnumber if we arent showing it in the form later %]
151
[%# Only put the cardnumber if we arent showing it in the form later %]
152
[% IF cardnumber %]
152
[% IF cardnumber %]
153
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
153
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
Lines 976-982 Link Here
976
976
977
[% END %]
977
[% END %]
978
978
979
[% IF ( step_4 ) %]
979
[% IF ( step_7 ) %]
980
[% IF Koha.Preference('HouseboundModule') %]
980
[% IF Koha.Preference('HouseboundModule') %]
981
  <fieldset class="rows" id="memberentry_housebound_roles">
981
  <fieldset class="rows" id="memberentry_housebound_roles">
982
    <legend id="housebound_roles">Housebound roles</legend>
982
    <legend id="housebound_roles">Housebound roles</legend>
Lines 1026-1031 Link Here
1026
    </ol>
1026
    </ol>
1027
  </fieldset>
1027
  </fieldset>
1028
[% END # hide fieldset %]
1028
[% END # hide fieldset %]
1029
[% END # IF step_7 %]
1030
1031
[% IF ( step_4 ) %]
1029
[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
1032
[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
1030
  <fieldset class="rows" id="memberentry_patron_attributes">
1033
  <fieldset class="rows" id="memberentry_patron_attributes">
1031
    <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
1034
    <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 302-308 Link Here
302
                                    </div>
302
                                    </div>
303
                                </div>
303
                                </div>
304
                                <div class="action">
304
                                <div class="action">
305
                                    <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a>
305
                                    <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=7">Edit</a>
306
                                </div>
306
                                </div>
307
                            [% END %]
307
                            [% END %]
308
308
(-)a/members/memberentry.pl (-5 / +4 lines)
Lines 573-579 if ($nok or !$nodouble){ Link Here
573
    %data=%newdata; 
573
    %data=%newdata; 
574
    $template->param( updtype => ($op eq 'add' ?'I':'M'));	# used to check for $op eq "insert"... but we just changed $op!
574
    $template->param( updtype => ($op eq 'add' ?'I':'M'));	# used to check for $op eq "insert"... but we just changed $op!
575
    unless ($step){  
575
    unless ($step){  
576
        $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1);
576
        $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 );
577
    }  
577
    }  
578
} 
578
} 
579
if (C4::Context->preference("IndependentBranches")) {
579
if (C4::Context->preference("IndependentBranches")) {
Lines 586-596 if (C4::Context->preference("IndependentBranches")) { Link Here
586
    }
586
    }
587
}
587
}
588
if ($op eq 'add'){
588
if ($op eq 'add'){
589
    $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1);
589
    $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1);
590
}
590
}
591
if ($op eq "modify")  {
591
if ($op eq "modify")  {
592
    $template->param( updtype => 'M',modify => 1 );
592
    $template->param( updtype => 'M',modify => 1 );
593
    $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step;
593
    $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1) unless $step;
594
    if ( $step == 4 ) {
594
    if ( $step == 4 ) {
595
        $template->param( categorycode => $borrower_data->{'categorycode'} );
595
        $template->param( categorycode => $borrower_data->{'categorycode'} );
596
    }
596
    }
Lines 606-612 if ($op eq "modify") { Link Here
606
}
606
}
607
if ( $op eq "duplicate" ) {
607
if ( $op eq "duplicate" ) {
608
    $template->param( updtype => 'I' );
608
    $template->param( updtype => 'I' );
609
    $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
609
    $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 ) unless $step;
610
    $data{'cardnumber'} = "";
610
    $data{'cardnumber'} = "";
611
}
611
}
612
612
613
- 

Return to bug 20828