View | Details | Raw Unified | Return to bug 12446
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql (-1 / +1 lines)
Lines 7-11 VALUES ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfe Link Here
7 
-- ********* --
 7 
-- ********* --
8 
-- STRUCTURE --
 8 
-- STRUCTURE --
9 
-- ********* --
 9 
-- ********* --
10 
ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0';
 10 
ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0' AFTER `checkprevcheckout`;
11 
UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
 11 
UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 316-322 CREATE TABLE `categories` ( -- this table shows information related to Koha patr Link Here
316 
  `hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
 316 
  `hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
317 
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
 317 
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
318 
  `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
 318 
  `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
319 
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
 319 
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category
320 
  `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
 320 
  `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
321 
  `reset_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can do the password reset flow,
 321 
  `reset_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can do the password reset flow,
322 
  `change_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can change their passwords in the OAPC
 322 
  `change_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can change their passwords in the OAPC
(-)a/installer/data/mysql/sysprefs.sql (-1 lines)
Lines 9-15 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
9 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
 9 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
10 
('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'),
 10 
('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'),
11 
('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
 11 
('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
12 
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
13 
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
 12 
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
14 
('AdlibrisCoversEnabled','0',NULL,'Display cover images in OPAC results and detail listing from Swedish retailer Adlibris.','YesNo'),
 13 
('AdlibrisCoversEnabled','0',NULL,'Display cover images in OPAC results and detail listing from Swedish retailer Adlibris.','YesNo'),
15 
('AdlibrisCoversURL','http://www.adlibris.com/se/organisationer/showimagesafe.aspx',NULL,'Base URL for Adlibris cover image web service.','Free'),
 14 
('AdlibrisCoversURL','http://www.adlibris.com/se/organisationer/showimagesafe.aspx',NULL,'Base URL for Adlibris cover image web service.','Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 250-256 Link Here
250 
                                                    <tr>
 250 
                                                    <tr>
251 
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
 251 
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
252 
                                                            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
 252 
                                                            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
253 
                                                            <td style='text-align:right'>[% guarantee.account.balance %]</td>
 253 
                                                            <td style='text-align:right'>[% guarantee.account.balance | html %]</td>
254 
                                                        [% ELSE %]
 254 
                                                        [% ELSE %]
255 
                                                            <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
 255 
                                                            <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
256 
                                                        [% END %]
 256 
                                                        [% END %]
Lines 258-264 Link Here
258 
                                                    [% END %]
 258 
                                                    [% END %]
259 
                                                    [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
 259 
                                                    [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
260 
                                                       <td>Total</td>
 260 
                                                       <td>Total</td>
261 
                                                       <td style='text-align:right'>[% amounttot %]</td>
 261 
                                                       <td style='text-align:right'>[% amounttot | html %]</td>
262 
                                                    [% END %]
 262 
                                                    [% END %]
263 
                                                </table>
 263 
                                                </table>
264 
                                            </li>
 264 
                                            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt (-1 / +1 lines)
Lines 18-24 Link Here
18 
                "dt_address":
 18 
                "dt_address":
19 
                    "[% INCLUDE escape_address data=data %]",
 19 
                    "[% INCLUDE escape_address data=data %]",
20 
                "dt_action":
 20 
                "dt_action":
21 
                    "<a href=\"#\" class=\"btn btn-mini select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
 21 
                    "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
22 
            }[% UNLESS loop.last %],[% END %]
 22 
            }[% UNLESS loop.last %],[% END %]
23 
        [% END %]
 23 
        [% END %]
24 
    ]
 24 
    ]
(-)a/members/moremember.pl (-2 lines)
Lines 197-203 if ( $count ) { Link Here
197 
    $template->param( guarantees => @guarantees);
 197 
    $template->param( guarantees => @guarantees);
198 
    $template->param( amounttot => sprintf("%.2f",$totalmount));
 198 
    $template->param( amounttot => sprintf("%.2f",$totalmount));
199 
}
 199 
}
200 
( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
201 

          200
          

        

        

          202
          
if (my $guarantor = $patron->guarantor){

          201
          
if (my $guarantor = $patron->guarantor){

        

        

          203
          
    $template->param(isguarantor => 1);

          202
          
    $template->param(isguarantor => 1);

        

            

              204
              
- 

              
              
            






  

  Return to bug 12446