@@ -, +, @@
---
.../borrowers_primary_contact_method.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +--
.../prog/en/modules/members/memberentrygen.tt | 68 +++++++++++++---------
members/memberentry.pl | 10 ++++
4 files changed, 53 insertions(+), 33 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
--- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
+++ a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
@@ -0,0 +1, @@
+ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -8719,12 +8719,6 @@ if ( CheckVersion($DBversion) ) {
print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n";
SetVersion($DBversion);
}
-$DBversion = "XXX";
-if ( CheckVersion($DBversion) ) {
- $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;");
- print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n";
- SetVersion($DBversion);
-}
$DBversion = "3.17.00.017";
if ( CheckVersion($DBversion) ) {
@@ -11915,6 +11909,7 @@ foreach my $file ( sort readdir $dirh ) {
}
}
+
=head1 FUNCTIONS
=head2 TableExists($table)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -455,7 +455,7 @@
[% IF ( mandatoryemailpro ) %]Required[% END %]
[% END %]
- [% UNLESS nofax %]
+ [% UNLESS nofax %]
[% IF ( mandatoryfax ) %]
+ [% END %]
- [% END %]
-
+
[%END # hide fieldset %]
--- a/members/memberentry.pl
+++ a/members/memberentry.pl
@@ -537,6 +537,16 @@ $template->param('typeloop' => \@typeloop,
no_categories => $no_categories);
if($no_categories){ $no_add = 1; }
+my @contactprincipalloop;
+my @fieldArray = qw(phone phonepro mobile email emailpro fax);
+foreach my $field (@fieldArray) {
+ if ( !(grep { $field eq $_ } @field_check)){
+ push @contactprincipalloop,{
+ 'currentis_' . $field => 1
+ };
+ }
+}
+$template->param('contactprincipalloop' => \@contactprincipalloop);
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE', $data{streettype} );
--