Attachment #100244 for bug #24083

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24083_UnseenRenewals_syspref.perl (+6 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	$dbh->do( q\| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('UnseenRenewals', '0', 'If enabled, a renewal can be recorded as "unseen" by the library and count against the borrowers unseen renewals limit', '', 'YesNo'); \| );
	4	SetVersion( $DBversion );
	5	print "Upgrade to $DBversion done (Bug 24083 - Add UnseenRenewals syspref)\n";
	6	}




$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    if( !column_exists( 'issues', 'unseen_renewals' ) ) {
        $dbh->do( q| ALTER TABLE issues ADD unseen_renewals TINYINT(4) DEFAULT 0 NOT NULL AFTER renewals | );
    }
    if( !column_exists( 'old_issues', 'unseen_renewals' ) ) {
        $dbh->do( q| ALTER TABLE old_issues ADD unseen_renewals TINYINT(4) DEFAULT 0 NOT NULL AFTER renewals | );
    }

    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug 24083 - Add issues.unseen_renewals & old_issues.unseen_renewals)\n";
}

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24083_add_issuingrules_unseen_renewals_allowed.perl (+7 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	$dbh->do( q\| INSERT IGNORE INTO circulation_rules (rule_name) VALUES ('unseen_renewals_allowed') \| );
	4
	5	SetVersion( $DBversion );
	6	print "Upgrade to $DBversion done (Bug 24083 - Add circulation_rules 'unseen_renewals_allowed' rule)\n";
	7	}




$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) {
            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' %]\n";
                    push @lines_out, "You have reach the maximum of consecutive renewals without visiting the library.\n";
                }
            }
            push @lines_out, $line;
        }
        if (scalar @lines_out > 0) {
            my $joined = join "", @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 - Add issues.unseen_renewals & old_issues.unseen_renewals)\n";
}

Lines 644-649 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
644	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),	644	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),
645	('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'),	645	('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'),
646	('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'),	646	('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'),
		647	('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit','YesNo'),
647	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),	648	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),
648	('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'),	649	('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'),
649	('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'),	650	('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 309-314 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +6 lines)
309	no: "Don't send"	309	no: "Don't send"
310	- a renewal notice according to patron checkout alert preferences.	310	- a renewal notice according to patron checkout alert preferences.
311	-	311	-
		312	- pref: UnseenRenewals
		313	choices:
		314	yes: Allow
		315	no: "Don't allow"
		316	- renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit
		317	-
312	- Prevent patrons from making holds on the OPAC if they owe more than	318	- Prevent patrons from making holds on the OPAC if they owe more than
313	- pref: maxoutstanding	319	- pref: maxoutstanding
314	class: currency	320	class: currency
315	-

Return to bug 24083

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

(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
1630	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues	1630	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues
1631	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1631	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1632	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1632	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
		1633	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
1633	`auto_renew` BOOLEAN default FALSE, -- automatic renewal	1634	`auto_renew` BOOLEAN default FALSE, -- automatic renewal
1634	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1635	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1635	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1636	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
Lines 1662-1667 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1662	`returndate` datetime default NULL, -- date the item was returned	1663	`returndate` datetime default NULL, -- date the item was returned
1663	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1664	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1664	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1665	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
		1666	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
1665	`auto_renew` BOOLEAN default FALSE, -- automatic renewal	1667	`auto_renew` BOOLEAN default FALSE, -- automatic renewal
1666	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1668	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1667	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1669	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched