From 579a425ab2b00d056430a22f6e7f483bb04a7bd7 Mon Sep 17 00:00:00 2001 From: Bouzid Fergani Date: Tue, 5 Jan 2016 16:00:12 -0500 Subject: [PATCH] Bug 11879 - Update BDIx schema and show main contact method in moremember.pl --- Koha/Schema/Result/Borrower.pm | 12 ++++++++++-- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- members/moremember.pl | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm index 1853b6d..aa7f4d1 100644 --- a/Koha/Schema/Result/Borrower.pm +++ b/Koha/Schema/Result/Borrower.pm @@ -407,6 +407,12 @@ __PACKAGE__->table("borrowers"); default_value: 1 is_nullable: 0 +=head2 privacy_guarantor_checkouts + + data_type: 'tinyint' + default_value: 0 + is_nullable: 0 + =head2 primary_contact_method data_type: 'varchar' @@ -582,6 +588,8 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 50 }, "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 }, ); @@ -1177,8 +1185,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q85WYjBNddrsVi2U846zOA +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2016-01-05 15:49:34 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DtGJZ4OOnjXRfnPcvqJWMg __PACKAGE__->belongs_to( "guarantor", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 5d6ebf7..29b8e3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -239,7 +239,7 @@ function validate1(date) {
  • Guarantor:[% guarantorsurname %][%IF ( guarantorfirstname ) %], [% guarantorfirstname %] [% END %]
  • [% END %] [% END %] -
  • Main contact method: [% primary_contact_method %]
  • +
  • Main contact method: [% primary_contact_method %]
  • diff --git a/members/moremember.pl b/members/moremember.pl index a91f436..74cb44e 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -337,7 +337,7 @@ $template->param( borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, - primary_contact_method => $data->{'primary_contact_method'}, + primary_contact_method => $data->{'primary_contact_method'}, was_renewed => $input->param('was_renewed') ? 1 : 0, branch => $branch, todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), -- 1.9.1