From 695aba77d21743190d5ebc7ca3fa6df035b32a6b Mon Sep 17 00:00:00 2001 From: remi Date: Tue, 1 Mar 2016 16:50:34 -0500 Subject: [PATCH] Bug 11879 QA follow-up Changed "Mobile Phone" to Other Phone, modified deletedborrowers table structute and added the field in opac --- Koha/Schema/Result/BorrowerModification.pm | 9 ++++ Koha/Schema/Result/Deletedborrower.pm | 6 +-- .../borrowers_primary_contact_method.sql | 4 +- installer/data/mysql/kohastructure.sql | 2 + .../prog/en/modules/members/memberentrygen.tt | 4 +- .../bootstrap/en/modules/opac-memberentry.tt | 50 ++++++++++++++++++++++ members/memberentry.pl | 7 --- opac/opac-memberentry.pl | 13 ++++++ 8 files changed, 82 insertions(+), 13 deletions(-) diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm index 0e55830..afbafb2 100644 --- a/Koha/Schema/Result/BorrowerModification.pm +++ b/Koha/Schema/Result/BorrowerModification.pm @@ -406,6 +406,13 @@ __PACKAGE__->table("borrower_modifications"); =cut +=head2 primary_contact_method + + data_type: 'tinyint' + default_value: 0 + is_nullable: 0 + +=cut __PACKAGE__->add_columns( "timestamp", { @@ -566,6 +573,8 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 50 }, "privacy", { data_type => "integer", is_nullable => 1 }, + "primary_contact_method", + { data_type => "varchar", is_nullable => 1, size => 45 }, ); =head1 PRIMARY KEY diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm index 57cea85..da10347 100644 --- a/Koha/Schema/Result/Deletedborrower.pm +++ b/Koha/Schema/Result/Deletedborrower.pm @@ -398,7 +398,7 @@ __PACKAGE__->table("deletedborrowers"); default_value: 1 is_nullable: 0 -=head2 privacy_guarantor_checkouts +=head2 primary_contact_method data_type: 'tinyint' default_value: 0 @@ -559,8 +559,8 @@ __PACKAGE__->add_columns( { data_type => "integer", is_nullable => 1 }, "privacy", { data_type => "integer", default_value => 1, is_nullable => 0 }, - "privacy_guarantor_checkouts", - { data_type => "tinyint", default_value => 0, is_nullable => 0 }, + "primary_contact_method", + { data_type => "varchar", is_nullable => 1, size => 45 }, ); diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql index 69665f3..8baf7e0 100644 --- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql +++ b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql @@ -1 +1,3 @@ -ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL; \ No newline at end of file +ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL; +ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL; +ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL; \ No newline at end of file diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 3170626..2967c1f 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -918,6 +918,7 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower `sms_provider_id` int(11) DEFAULT NULL, -- the provider of the mobile phone number defined in smsalertnumber `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their reading history KEY `borrowernumber` (`borrowernumber`), `privacy_guarantor_checkouts` tinyint(1) NOT NULL DEFAULT '0', -- controls if relatives can see this patron's checkouts + `primary_contact_method` varchar(45) DEFAULT NULL, -- useful for reporting purposes KEY borrowernumber (borrowernumber), KEY `cardnumber` (`cardnumber`), KEY `sms_provider_id` (`sms_provider_id`) @@ -3383,6 +3384,7 @@ CREATE TABLE IF NOT EXISTS `borrower_modifications` ( `altcontactphone` varchar(50) DEFAULT NULL, `smsalertnumber` varchar(50) DEFAULT NULL, `privacy` int(11) 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`) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 4341f5d..f79b7cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -488,9 +488,9 @@ [% END %] [% IF ( contactprincipalloo.currentis_mobile ) %] [% IF ( primary_contact_method == 'mobile' ) %] - + [% ELSE %] - + [% END %] [% END %] [% IF ( contactprincipalloo.currentis_email ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 0ea468d..d36956f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -498,6 +498,56 @@ [% IF mandatory.defined('fax') %]Required[% END %] [% END %] +
  • + + +
  • [% END %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 762b5a6..b932d78 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -548,13 +548,6 @@ foreach my $field (@fieldArray) { } $template->param('contactprincipalloop' => \@contactprincipalloop); -my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } ); -my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE', $data{streettype} ); -$template->param( - roadtypes => $roadtypes, - cities => $cities, -); - my $default_borrowertitle = ''; unless ( $op eq 'duplicate' ) { $default_borrowertitle=$data{'title'} } my($borrowertitle)=GetTitles(); diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 46c91f9..ddd0fb0 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -70,6 +70,19 @@ $template->param( branches => GetBranchesLoop(), OPACPatronDetails => C4::Context->preference('OPACPatronDetails'), ); +my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField"); + my @field_check=split(/\|/,$check_BorrowerMandatoryField); + 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); if ( $action eq 'create' ) { -- 1.9.1