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

(-)a/installer/data/mysql/updatedatabase.pl (+1 lines)
Lines 12661-12666 foreach my $file ( sort readdir $dirh ) { Link Here
12661
    }
12661
    }
12662
}
12662
}
12663
12663
12664
12664
=head1 FUNCTIONS
12665
=head1 FUNCTIONS
12665
12666
12666
=head2 TableExists($table)
12667
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-29 / +41 lines)
Lines 462-468 $(document).ready(function() { Link Here
462
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
462
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
463
    </li>
463
    </li>
464
        [% END %]
464
        [% END %]
465
        [% UNLESS nofax %]
465
    [% UNLESS nofax %]
466
    <li>
466
    <li>
467
      [% IF ( mandatoryfax ) %]
467
      [% IF ( mandatoryfax ) %]
468
      <label for="fax" class="required">
468
      <label for="fax" class="required">
Lines 475-519 $(document).ready(function() { Link Here
475
    </li>
475
    </li>
476
476
477
   [% END %]
477
   [% END %]
478
479
    <li>
478
    <li>
480
       <label for="primary_contact_method">Main Contact Method</label>
479
       <label for="primary_contact_method">Main Contact Method</label>
481
       <select id="primary_contact_method" name="primary_contact_method">
480
       <select id="primary_contact_method" name="primary_contact_method">
482
481
       <option value=""></option>
483
            [% IF ( primary_contact_method == 'phone' ) %]
482
         [% FOREACH contactprincipalloo IN contactprincipalloop %]
484
                <option value="phone" selected="selected">Primary phone</option>
483
            [% IF ( contactprincipalloo.currentis_phone ) %]
485
            [% ELSE %]
484
               [% IF ( primary_contact_method == 'phone' ) %]
486
                <option value="phone">Primary phone</option>
485
                 <option value="phone" selected="selected">Primary phone</option>
486
               [% ELSE %]
487
                 <option value="phone">Primary phone</option>
488
               [% END %]
487
            [% END %]
489
            [% END %]
488
            [% IF ( primary_contact_method == 'phonepro' ) %]
490
            [% IF ( contactprincipalloo.currentis_phonepro ) %]
489
                <option value="phonepro" selected="selected">Secondary phone</option>
491
               [% IF ( primary_contact_method == 'phonepro' ) %]
490
            [% ELSE %]
492
                 <option value="phonepro" selected="selected">Secondary phone</option>
491
                <option value="phonepro">Secondary phone</option>
493
               [% ELSE %]
494
                 <option value="phonepro">Secondary phone</option>
495
               [% END %]
492
            [% END %]
496
            [% END %]
493
            [% IF ( primary_contact_method == 'mobile' ) %]
497
            [% IF ( contactprincipalloo.currentis_mobile ) %]
494
                <option value="mobile" selected="selected">Other phone</option>
498
               [% IF ( primary_contact_method == 'mobile' ) %]
495
            [% ELSE %]
499
                 <option value="mobile" selected="selected">Mobile phone</option>
496
                <option value="mobile">Other phone</option>
500
               [% ELSE %]
501
                 <option value="mobile">Mobile phone</option>
502
               [% END %]
497
            [% END %]
503
            [% END %]
498
            [% IF ( primary_contact_method == 'email' ) %]
504
            [% IF ( contactprincipalloo.currentis_email ) %]
499
                <option value="email" selected="selected">Primary email</option>
505
               [% IF ( primary_contact_method == 'email' ) %]
500
            [% ELSE %]
506
                 <option value="email" selected="selected">Primary email</option>
501
                <option value="email">Primary email</option>
507
               [% ELSE %]
508
                 <option value="email">Primary email</option>
509
               [% END %]
502
            [% END %]
510
            [% END %]
503
            [% IF ( primary_contact_method == 'emailpro' ) %]
511
            [% IF ( contactprincipalloo.currentis_emailpro ) %]
504
                <option value="emailpro" selected="selected">Secondary email</option>
512
               [% IF ( primary_contact_method == 'emailpro' ) %]
505
            [% ELSE %]
513
                 <option value="emailpro" selected="selected">Secondary email</option>
506
                <option value="emailpro">Secondary email</option>
514
               [% ELSE %]
515
                 <option value="emailpro">Secondary email</option>
516
               [% END %]
507
            [% END %]
517
            [% END %]
508
            [% IF ( primary_contact_method == 'fax' ) %]
518
            [% IF ( contactprincipalloo.currentis_fax ) %]
509
                <option value="fax" selected="selected">Fax</option>
519
               [% IF ( primary_contact_method == 'fax' ) %]
510
            [% ELSE %]
520
                 <option value="fax" selected="selected">Fax</option>
511
                <option value="fax">Fax</option>
521
               [% ELSE %]
522
                 <option value="fax">Fax</option>
523
               [% END %]
512
            [% END %]
524
            [% END %]
525
         [% END %]
513
       </select>
526
       </select>
514
    </li>
527
    </li>
515
     
528
    </ol>
516
</ol>
517
529
518
  </fieldset>
530
  </fieldset>
519
[%END # hide fieldset %]
531
[%END # hide fieldset %]
(-)a/members/memberentry.pl (-1 / +10 lines)
Lines 537-542 $template->param('typeloop' => \@typeloop, Link Here
537
        no_categories => $no_categories);
537
        no_categories => $no_categories);
538
if($no_categories){ $no_add = 1; }
538
if($no_categories){ $no_add = 1; }
539
539
540
my @contactprincipalloop;
541
my @fieldArray = qw(phone phonepro mobile email emailpro fax);
542
foreach my $field (@fieldArray) {
543
   if ( !(grep { $field eq $_ } @field_check)){
544
        push @contactprincipalloop,{
545
            'currentis_' . $field => 1
546
        };
547
    }
548
}
549
$template->param('contactprincipalloop' => \@contactprincipalloop);
540
550
541
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
551
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
542
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
552
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
543
- 

Return to bug 11879