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

(-)a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql (-1 / +1 lines)
Lines 1-3 Link Here
1
ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `lastseen`;
1
ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`;
2
ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`;
2
ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`;
3
ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `extended_attributes`;
3
ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `extended_attributes`;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (+11 lines)
Lines 577-582 Link Here
577
                [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
577
                [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
578
            </li>
578
            </li>
579
        [% END %]
579
        [% END %]
580
        [% UNLESS nofax %]
581
    <li>
582
      [% IF ( mandatoryfax ) %]
583
      <label for="fax" class="required">
584
      [% ELSE %]
585
      <label for="fax">
586
      [% END %]
587
      Fax: </label>
588
        <input type="text" id="fax" name="fax" value="[% fax | html %]" />
589
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
590
    </li>
580
591
581
        [% UNLESS nofax %]
592
        [% UNLESS nofax %]
582
            <li>
593
            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-1 / +1 lines)
Lines 18-24 Link Here
18
            <div class="col-xs-6">
18
            <div class="col-xs-6">
19
                <div id="patron-information">
19
                <div id="patron-information">
20
20
21
        [% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
21
     [% UNLESS ( I ) %][% IF ( patron.othernames ) %]&ldquo;[% patron.othernames %]&rdquo;[% END %]
22
        <div class = "address">
22
        <div class = "address">
23
            <ul>
23
            <ul>
24
                [% IF Koha.Preference( 'AddressFormat' ) %]
24
                [% IF Koha.Preference( 'AddressFormat' ) %]
(-)a/members/moremember.pl (-3 lines)
Lines 204-212 $template->param( Link Here
204
    fines           => $patron->account->balance,
204
    fines           => $patron->account->balance,
205
    translated_language => $translated_language,
205
    translated_language => $translated_language,
206
    detailview      => 1,
206
    detailview      => 1,
207
    borrowernumber  => $borrowernumber,
208
    othernames      => $data->{'othernames'},
209
    categoryname    => $patron->category->description,
210
    primary_contact_method  => $data->{'primary_contact_method'},
207
    primary_contact_method  => $data->{'primary_contact_method'},
211
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
208
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
212
    $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
209
    $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
(-)a/opac/opac-memberentry.pl (-12 / +11 lines)
Lines 95-112 $template->param( Link Here
95
    OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
95
    OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
96
);
96
);
97
my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
97
my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
98
        my @field_check=split(/\|/,$check_BorrowerMandatoryField);
98
my @field_check=split(/\|/,$check_BorrowerMandatoryField);
99
        my @contactprincipalloop;
99
my @contactprincipalloop;
100
        my @fieldArray = qw(phone phonepro mobile email emailpro fax);
100
my @fieldArray = qw(phone phonepro mobile email emailpro fax);
101
        foreach my $field (@fieldArray) {
101
foreach my $field (@fieldArray) {
102
           if ( !(grep { $field eq $_ } @field_check)){
102
   if ( !(grep { $field eq $_ } @field_check)){
103
                push @contactprincipalloop,{
103
        push @contactprincipalloop,{
104
                    'currentis_' . $field => 1
104
            'currentis_' . $field => 1
105
                };
105
        };
106
            }
106
    }
107
        }
107
}
108
108
109
        $template->param('contactprincipalloop' => \@contactprincipalloop);
109
$template->param('contactprincipalloop' => \@contactprincipalloop);
110
110
111
my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
111
my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
112
my $conflicting_attribute = 0;
112
my $conflicting_attribute = 0;
113
- 

Return to bug 11879