@@ -, +, @@
informations.
---
.../borrowers_primary_contact_method.sql | 3 ++
installer/data/mysql/kohastructure.sql | 5 +-
installer/data/mysql/updatedatabase.pl | 1 +
.../prog/en/modules/members/memberentrygen.tt | 61 ++++++++++++++++++++--
.../prog/en/modules/members/moremember.tt | 14 +++++
.../bootstrap/en/modules/opac-memberentry.tt | 50 ++++++++++++++++++
members/memberentry.pl | 11 +++-
members/moremember.pl | 3 +-
opac/opac-memberentry.pl | 13 +++++
9 files changed, 153 insertions(+), 8 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,3 @@
+ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `privacy_guarantor_checkouts`;
+ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `privacy_guarantor_checkouts`;
+ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `privacy`;
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -632,7 +632,7 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower
`checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'.
`updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- time of last change could be useful for synchronization with external systems (among others)
`lastseen` datetime default NULL, -- last time a patron has been seed (connected at the OPAC or staff interface)
- `overdrive_auth_token` text default NULL, -- persist OverDrive auth token
+ `primary_contact_method` varchar(45) DEFAULT NULL, -- useful for reporting purposes
KEY borrowernumber (borrowernumber),
KEY `cardnumber` (`cardnumber`),
KEY `sms_provider_id` (`sms_provider_id`)
@@ -1664,7 +1664,7 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons
`checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'.
`updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- time of last change could be useful for synchronization with external systems (among others)
`lastseen` datetime default NULL, -- last time a patron has been seed (connected at the OPAC or staff interface)
- `overdrive_auth_token` text default NULL, -- persist OverDrive auth token
+ `primary_contact_method` varchar(45) DEFAULT NULL, -- useful for reporting purposes
UNIQUE KEY `cardnumber` (`cardnumber`),
PRIMARY KEY `borrowernumber` (`borrowernumber`),
KEY `categorycode` (`categorycode`),
@@ -3438,6 +3438,7 @@ CREATE TABLE IF NOT EXISTS `borrower_modifications` (
`smsalertnumber` varchar(50) DEFAULT NULL,
`privacy` int(11) DEFAULT NULL,
`extended_attributes` text DEFAULT NULL,
+ `primary_contact_method` varchar(45) DEFAULT NULL, -- useful for reporting purposes
PRIMARY KEY (`verification_token`,`borrowernumber`),
KEY `verification_token` (`verification_token`),
KEY `borrowernumber` (`borrowernumber`)
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -14352,6 +14352,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
@@ -493,7 +493,8 @@ $(document).ready(function() {
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
[%END # hide fieldset %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -273,6 +273,20 @@ function validate1(date) {
[% END %]
[% END %]
+ [% 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
@@ -571,6 +571,56 @@
[% IF mandatory.defined('fax') %]Required[% END %]
[% END %]
+