@@ -, +, @@
---
installer/data/mysql/updatedatabase.pl | 6 ------
.../prog/en/modules/members/memberentrygen.tt | 6 +++---
.../intranet-tmpl/prog/en/modules/members/moremember.tt | 15 ++++++++++++++-
.../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +-
4 files changed, 18 insertions(+), 11 deletions(-)
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -8724,12 +8724,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) ) {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -568,7 +568,7 @@ $(document).ready(function() {
[% END %]
-
+
[% END %]
- Main contact method: [% primary_contact_method %]
+ [% SWITCH primary_contact_method %]
+ [% CASE 'phone' %]
+ Main contact method: Phone
+ [% CASE 'phonepro' %]
+ Main contact method: Secondary phone
+ [% CASE 'mobile' %]
+ Main contact method: Other Phone
+ [% CASE 'email' %]
+ Main contact method: Primary email
+ [% CASE 'emailpro' %]
+ Main contact method: Secondary email
+ [% CASE 'fax' %]
+ Main contact method: Fax
+ [% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -544,7 +544,7 @@
[% END %]
-
+