Attachment #111152 for bug #24083

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

Lines 2943-2949 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (-1 / +1 lines)
2943	$soonestrenewal->truncate( to => 'day' );	2943	$soonestrenewal->truncate( to => 'day' );
2944	}	2944	}
2945		2945
2946	if ( $soonestrenewal > DateTime->now( time_zone => C4::Context->tz() ) )	2946	if ( $soonestrenewal > dt_from_string() )
2947	{	2947	{
2948	return ( 0, "auto_too_soon" ) if $issue->auto_renew;	2948	return ( 0, "auto_too_soon" ) if $issue->auto_renew;
2949	return ( 0, "too_soon" );	2949	return ( 0, "too_soon" );




$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    my ($text) = $dbh->selectrow_array('SELECT content FROM letter WHERE module = "circulation" AND code = "AUTO_RENEWALS" AND content NOT LIKE "%too_unseen%"');

    if ($text) {
        my $find = qr/^\[\% (IF|ELSIF) checkout.auto_renew_error == 'too_many' \%\]$/;
        my @lines_in = split /^/, $text;
        my @lines_out = ();
        foreach my $line(@lines_in) {
            chomp($line);
            if ($line =~ $find) {
                if ($1) {
                    my $newline_test = $1 eq 'IF' ? 'IF' : 'ELSIF';
                    $line =~ s/\bIF\b/ELSIF/;
                    push @lines_out, "[% $newline_test checkout.auto_renew_error == 'too_unseen' %]";
                    push @lines_out, "You have reach the maximum of consecutive renewals without visiting the library.";
                }
            }
            push @lines_out, $line;
        }
        if (scalar @lines_out > 0) {
            my $joined = join "\n", @lines_out;
            $dbh->do(q{UPDATE letter SET content = ? WHERE module = "circulation" AND code = "AUTO_RENEWALS"}, undef, ($joined));
        }
    }


    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug 24083 - Update auto renewals letter)\n";
}




  `returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues
  `lastreneweddate` datetime default NULL, -- date the item was last renewed
  `renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
  `issuedate` datetime default NULL, -- date the item was checked out or issued

  `returndate` datetime default NULL, -- date the item was returned
  `lastreneweddate` datetime default NULL, -- date the item was last renewed
  `renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
  `issuedate` datetime default NULL, -- date the item was checked out or issued

Lines 669-675 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
669	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),	669	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),
670	('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'),	670	('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'),
671	('UniqueItemFields','barcode','','Pipe-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'),	671	('UniqueItemFields','barcode','','Pipe-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'),
672	('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit','YesNo'),	672	('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the patrons unseen renewals limit.','YesNo'),
673	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),	673	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),
674	('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),	674	('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),
675	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'),	675	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'),

Lines 324-330 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
324	choices:	324	choices:
325	yes: Allow	325	yes: Allow
326	no: "Don't allow"	326	no: "Don't allow"
327	- renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit	327	- renewals to be recorded as "unseen" by the library, and count against the patrons unseen renewals limit.
328	-	328	-
329	- Prevent patrons from making holds on the OPAC if they owe more than	329	- Prevent patrons from making holds on the OPAC if they owe more than
330	- pref: maxoutstanding	330	- pref: maxoutstanding

Lines 32-38 use Koha::Checkouts; Link Here

(-)a/t/db_dependent/Circulation/issue.t (-2 lines)
32	use Koha::Database;	32	use Koha::Database;
33	use Koha::DateUtils;	33	use Koha::DateUtils;
34	use Koha::Holds;	34	use Koha::Holds;
35	use Koha::IssuingRules;
36	use Koha::Items;	35	use Koha::Items;
37	use Koha::Library;	36	use Koha::Library;
38	use Koha::Patrons;	37	use Koha::Patrons;
39	-

Return to bug 24083

Lines 1-30 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24083_update_auto_renewals_letter.perl (-30 lines)
1	$DBversion = 'XXX'; # will be replaced by the RM
2	if( CheckVersion( $DBversion ) ) {
3	my ($text) = $dbh->selectrow_array('SELECT content FROM letter WHERE module = "circulation" AND code = "AUTO_RENEWALS" AND content NOT LIKE "%too_unseen%"');
4
5	if ($text) {
6	my $find = qr/^\[\% (IF\|ELSIF) checkout.auto_renew_error == 'too_many' \%\]$/;
7	my @lines_in = split /^/, $text;
8	my @lines_out = ();
9	foreach my $line(@lines_in) {
10	chomp($line);
11	if ($line =~ $find) {
12	if ($1) {
13	my $newline_test = $1 eq 'IF' ? 'IF' : 'ELSIF';
14	$line =~ s/\bIF\b/ELSIF/;
15	push @lines_out, "[% $newline_test checkout.auto_renew_error == 'too_unseen' %]";
16	push @lines_out, "You have reach the maximum of consecutive renewals without visiting the library.";
17	}
18	}
19	push @lines_out, $line;
20	}
21	if (scalar @lines_out > 0) {
22	my $joined = join "\n", @lines_out;
23	$dbh->do(q{UPDATE letter SET content = ? WHERE module = "circulation" AND code = "AUTO_RENEWALS"}, undef, ($joined));
24	}
25	}
26
27
28	SetVersion( $DBversion );
29	print "Upgrade to $DBversion done (Bug 24083 - Update auto renewals letter)\n";
30	}

Lines 1623-1630 CREATE TABLE `issues` ( -- information related to check outs or issues Link Here

(-)a/installer/data/mysql/kohastructure.sql (-2 / +2 lines)
1623	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues	1623	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues
1624	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1624	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1625	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1625	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
1626	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1627	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen	1626	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
		1627	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1628	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1628	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1629	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1629	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1630	`issuedate` datetime default NULL, -- date the item was checked out or issued	1630	`issuedate` datetime default NULL, -- date the item was checked out or issued
Lines 1656-1663 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1656	`returndate` datetime default NULL, -- date the item was returned	1656	`returndate` datetime default NULL, -- date the item was returned
1657	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1657	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1658	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1658	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
1659	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1660	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen	1659	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
		1660	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1661	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1661	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1662	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1662	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1663	`issuedate` datetime default NULL, -- date the item was checked out or issued	1663	`issuedate` datetime default NULL, -- date the item was checked out or issued