From 18ea0bc5a8026d60cd00b98273141d0937ed5988 Mon Sep 17 00:00:00 2001
From: Lari Taskula <lari.taskula@jns.fi>
Date: Tue, 7 Feb 2017 19:52:15 +0200
Subject: [PATCH] Bug 7534: Add configuration to admin/branches.pl

This patch adds a configuration option for pickup locations.

To test:
1. Apply patch
2. Go to cgi-bin/koha/admin/branches.pl
3. Observe there is a new column "Pickup location"
4. Click "Edit" for any library
5. Scroll to bottom of the page and select "No"
6. Click "Submit"
7. Observe your library in Libraries-table, notice the value of "Pickup location"
   has changed to "No"

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>
---
 admin/branches.pl                                         | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/admin/branches.pl b/admin/branches.pl
index ab1021cdf6..37c1def91d 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -74,6 +74,7 @@ if ( $op eq 'add_form' ) {
       branchnotes
       opac_info
       marcorgcode
+      pickup_location
     );
     my $is_a_modif = $input->param('is_a_modif');
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index cbb07301f4..ed0c4db744 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -146,6 +146,7 @@
                 <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
                 <li><label for="marcorgccode">MARC organization code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode |html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.</span>
                 <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes |html %]" /></li>
+                <li><label for="pickup_location">Pickup location: </label><select name="pickup_location" id="pickup_location"><option value="1" [% IF library.pickup_location %]selected[% END %]>Yes</option><option value="0" [% IF !library.pickup_location %]selected[% END %]>No</option></select></li>
             </ol>
         </fieldset>
         <fieldset class="action">
@@ -181,6 +182,7 @@
                     <th>Address</th>
                     <th>MARC organization code</th>
                     <th>IP</th>
+                    <th>Pickup location</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -218,6 +220,7 @@
                         </td>
                         <td>[% library.marcorgcode %]</td>
                         <td>[% library.branchip %]</td>
+                        <td>[% IF library.pickup_location %]Yes[% ELSE %]No[% END %]</td>
                         <td class="actions">
                             <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&amp;branchcode=[% library.branchcode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
                             <form action="/cgi-bin/koha/admin/branches.pl" method="post">
-- 
2.11.0