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/installer/data/mysql/updatedatabase.pl (-1 lines)
Lines 17263-17269 foreach my $file ( sort readdir $dirh ) { Link Here
17263
    }
17263
    }
17264
}
17264
}
17265
17265
17266
17267
=head1 FUNCTIONS
17266
=head1 FUNCTIONS
17268
17267
17269
=head2 TableExists($table)
17268
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +2 lines)
Lines 430-437 Link Here
430
430
431
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
431
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
432
  <fieldset class="rows" id="memberentry_contact">
432
  <fieldset class="rows" id="memberentry_contact">
433
    <legend id="contact_lgd">Contact</legend>
433
    <legend id="contact_lgd">Contact</legend><ol>
434
<ol>
435
        [% UNLESS nophone %]
434
        [% UNLESS nophone %]
436
      <li>
435
      <li>
437
      [% IF ( mandatoryphone ) %]
436
      [% IF ( mandatoryphone ) %]
Lines 494-500 Link Here
494
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
493
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
495
    </li>
494
    </li>
496
        [% END %]
495
        [% END %]
497
    [% UNLESS nofax %]
496
        [% UNLESS nofax %]
498
    <li>
497
    <li>
499
      [% IF ( mandatoryfax ) %]
498
      [% IF ( mandatoryfax ) %]
500
      <label for="fax" class="required">
499
      <label for="fax" class="required">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-4 / +4 lines)
Lines 19-25 Link Here
19
            <div class="col-xs-6">
19
            <div class="col-xs-6">
20
                <div id="patron-information">
20
                <div id="patron-information">
21
21
22
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]
22
     [% UNLESS ( I ) %][% IF ( patron.othernames ) %]&ldquo;[% patron.othernames %]&rdquo;[% END %]
23
        <div class = "address">
23
        <div class = "address">
24
            <ul>
24
            <ul>
25
                [% IF Koha.Preference( 'AddressFormat' ) %]
25
                [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 61-69 Link Here
61
	<h3>Library use</h3>
61
	<h3>Library use</h3>
62
	<div class="rows">
62
	<div class="rows">
63
	<ol>
63
	<ol>
64
    <li><span class="label">Card number: </span>[% cardnumber | html %]</li>
64
    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
65
	<li><span class="label">Borrowernumber: </span> [% borrowernumber | html %]</li>
65
    <li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
66
    <li><span class="label">Category: </span>[% categoryname | html %] ([% categorycode | html %])</li>
66
    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
67
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
67
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
68
    <li><span class="label">Expiration date: </span>
68
    <li><span class="label">Expiration date: </span>
69
    [% IF ( was_renewed ) %]
69
    [% IF ( was_renewed ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-9 lines)
Lines 239-253 Link Here
239
                                                    [% END %]
239
                                                    [% END %]
240
                                                </ul>
240
                                                </ul>
241
                                            </li>
241
                                            </li>
242
                                        [% ELSIF guarantor %]
243
                                            <li>
244
                                                <span class="label">Guarantor:</span>
245
                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
246
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
247
                                                [% ELSE %]
248
                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
249
                                                [% END %]
250
                                            </li>
251
                                        [% END %]
242
                                        [% END %]
252
243
253
                                        [% IF ( primary_contact_method ) %]
244
                                        [% IF ( primary_contact_method ) %]
(-)a/members/moremember.pl (-3 lines)
Lines 313-321 $template->param( Link Here
313
    patron          => $patron,
313
    patron          => $patron,
314
    translated_language => $translated_language,
314
    translated_language => $translated_language,
315
    detailview      => 1,
315
    detailview      => 1,
316
    borrowernumber  => $borrowernumber,
317
    othernames      => $data->{'othernames'},
318
    categoryname    => $patron->category->description,
319
    primary_contact_method  => $data->{'primary_contact_method'},
316
    primary_contact_method  => $data->{'primary_contact_method'},
320
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
317
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
321
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
318
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
(-)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