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

(-)a/installer/data/mysql/updatedatabase.pl (+1 lines)
Lines 12809-12814 foreach my $file ( sort readdir $dirh ) { Link Here
12809
    }
12809
    }
12810
}
12810
}
12811
12811
12812
12812
=head1 FUNCTIONS
12813
=head1 FUNCTIONS
12813
12814
12814
=head2 TableExists($table)
12815
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-29 / +41 lines)
Lines 554-560 $(document).ready(function() { Link Here
554
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
554
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
555
    </li>
555
    </li>
556
        [% END %]
556
        [% END %]
557
        [% UNLESS nofax %]
557
    [% UNLESS nofax %]
558
    <li>
558
    <li>
559
      [% IF ( mandatoryfax ) %]
559
      [% IF ( mandatoryfax ) %]
560
      <label for="fax" class="required">
560
      <label for="fax" class="required">
Lines 567-611 $(document).ready(function() { Link Here
567
    </li>
567
    </li>
568
568
569
   [% END %]
569
   [% END %]
570
571
    <li>
570
    <li>
572
       <label for="primary_contact_method">Main Contact Method</label>
571
       <label for="primary_contact_method">Main Contact Method</label>
573
       <select id="primary_contact_method" name="primary_contact_method">
572
       <select id="primary_contact_method" name="primary_contact_method">
574
573
       <option value=""></option>
575
            [% IF ( primary_contact_method == 'phone' ) %]
574
         [% FOREACH contactprincipalloo IN contactprincipalloop %]
576
                <option value="phone" selected="selected">Primary phone</option>
575
            [% IF ( contactprincipalloo.currentis_phone ) %]
577
            [% ELSE %]
576
               [% IF ( primary_contact_method == 'phone' ) %]
578
                <option value="phone">Primary phone</option>
577
                 <option value="phone" selected="selected">Primary phone</option>
578
               [% ELSE %]
579
                 <option value="phone">Primary phone</option>
580
               [% END %]
579
            [% END %]
581
            [% END %]
580
            [% IF ( primary_contact_method == 'phonepro' ) %]
582
            [% IF ( contactprincipalloo.currentis_phonepro ) %]
581
                <option value="phonepro" selected="selected">Secondary phone</option>
583
               [% IF ( primary_contact_method == 'phonepro' ) %]
582
            [% ELSE %]
584
                 <option value="phonepro" selected="selected">Secondary phone</option>
583
                <option value="phonepro">Secondary phone</option>
585
               [% ELSE %]
586
                 <option value="phonepro">Secondary phone</option>
587
               [% END %]
584
            [% END %]
588
            [% END %]
585
            [% IF ( primary_contact_method == 'mobile' ) %]
589
            [% IF ( contactprincipalloo.currentis_mobile ) %]
586
                <option value="mobile" selected="selected">Other phone</option>
590
               [% IF ( primary_contact_method == 'mobile' ) %]
587
            [% ELSE %]
591
                 <option value="mobile" selected="selected">Mobile phone</option>
588
                <option value="mobile">Other phone</option>
592
               [% ELSE %]
593
                 <option value="mobile">Mobile phone</option>
594
               [% END %]
589
            [% END %]
595
            [% END %]
590
            [% IF ( primary_contact_method == 'email' ) %]
596
            [% IF ( contactprincipalloo.currentis_email ) %]
591
                <option value="email" selected="selected">Primary email</option>
597
               [% IF ( primary_contact_method == 'email' ) %]
592
            [% ELSE %]
598
                 <option value="email" selected="selected">Primary email</option>
593
                <option value="email">Primary email</option>
599
               [% ELSE %]
600
                 <option value="email">Primary email</option>
601
               [% END %]
594
            [% END %]
602
            [% END %]
595
            [% IF ( primary_contact_method == 'emailpro' ) %]
603
            [% IF ( contactprincipalloo.currentis_emailpro ) %]
596
                <option value="emailpro" selected="selected">Secondary email</option>
604
               [% IF ( primary_contact_method == 'emailpro' ) %]
597
            [% ELSE %]
605
                 <option value="emailpro" selected="selected">Secondary email</option>
598
                <option value="emailpro">Secondary email</option>
606
               [% ELSE %]
607
                 <option value="emailpro">Secondary email</option>
608
               [% END %]
599
            [% END %]
609
            [% END %]
600
            [% IF ( primary_contact_method == 'fax' ) %]
610
            [% IF ( contactprincipalloo.currentis_fax ) %]
601
                <option value="fax" selected="selected">Fax</option>
611
               [% IF ( primary_contact_method == 'fax' ) %]
602
            [% ELSE %]
612
                 <option value="fax" selected="selected">Fax</option>
603
                <option value="fax">Fax</option>
613
               [% ELSE %]
614
                 <option value="fax">Fax</option>
615
               [% END %]
604
            [% END %]
616
            [% END %]
617
         [% END %]
605
       </select>
618
       </select>
606
    </li>
619
    </li>
607
620
    </ol>
608
</ol>
609
621
610
  </fieldset>
622
  </fieldset>
611
[%END # hide fieldset %]
623
[%END # hide fieldset %]
(-)a/members/memberentry.pl (-1 / +10 lines)
Lines 536-541 $template->param('typeloop' => \@typeloop, Link Here
536
        no_categories => $no_categories);
536
        no_categories => $no_categories);
537
if($no_categories){ $no_add = 1; }
537
if($no_categories){ $no_add = 1; }
538
538
539
my @contactprincipalloop;
540
my @fieldArray = qw(phone phonepro mobile email emailpro fax);
541
foreach my $field (@fieldArray) {
542
   if ( !(grep { $field eq $_ } @field_check)){
543
        push @contactprincipalloop,{
544
            'currentis_' . $field => 1
545
        };
546
    }
547
}
548
$template->param('contactprincipalloop' => \@contactprincipalloop);
539
549
540
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
550
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
541
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
551
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
542
- 

Return to bug 11879