Attachment #105368 for bug #18086

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




package Koha::OverdueRule;

# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Carp;

use Koha::Database;

use base qw(Koha::Object);

=head1 NAME

Koha::OverdueRule - Koha OverdueRule Object class

=head1 API

=head2 Class Methods

=head3 type

=cut

sub _type {
    return 'Overduerule';
}

1;




package Koha::OverdueRules;

# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::OverdueRule;

use base qw(Koha::Objects);

=head1 NAME

Koha::OverdueRules - Koha OverdueRule Object set class

=head1 API

=head2 Class Methods

=head3 _type

=cut

sub _type {
    return 'Overduerule';
}

sub object_class {
    return 'Koha::OverdueRule';
}

1;

Lines 1-5 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_18086.perl (+4 lines)
1	$DBversion = 'XXX'; # will be replaced by the RM	1	$DBversion = 'XXX'; # will be replaced by the RM
2	if( CheckVersion( $DBversion ) ) {	2	if( CheckVersion( $DBversion ) ) {
		3	$dbh->do(q{
		4
		5	});
3	$dbh->do(q{	6	$dbh->do(q{
4	DELETE overduerules FROM overduerules LEFT JOIN categories USING ( categorycode ) where categories.categorycode IS NULL;	7	DELETE overduerules FROM overduerules LEFT JOIN categories USING ( categorycode ) where categories.categorycode IS NULL;
5	});	8	});
Lines 10-15 if( CheckVersion( $DBversion ) ) { Link Here
10		13
11	$dbh->do(q{	14	$dbh->do(q{
12	ALTER TABLE overduerules	15	ALTER TABLE overduerules
		16	MODIFY `branchcode` varchar(10) NULL default NULL,
13	ADD CONSTRAINT `fk_branchcode` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,	17	ADD CONSTRAINT `fk_branchcode` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
14	ADD CONSTRAINT `fk_categorycode` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE;	18	ADD CONSTRAINT `fk_categorycode` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE;
15	});	19	});

Lines 1224-1230 CREATE TABLE `oai_sets_biblios` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
1224	DROP TABLE IF EXISTS `overduerules`;	1224	DROP TABLE IF EXISTS `overduerules`;
1225	CREATE TABLE `overduerules` ( -- overdue notice status and triggers	1225	CREATE TABLE `overduerules` ( -- overdue notice status and triggers
1226	`overduerules_id` int(11) NOT NULL AUTO_INCREMENT, -- unique identifier for the overduerules	1226	`overduerules_id` int(11) NOT NULL AUTO_INCREMENT, -- unique identifier for the overduerules
1227	`branchcode` varchar(10) NOT NULL default '', -- foreign key from the branches table to define which branch this rule is for (if blank it's all libraries)	1227	`branchcode` varchar(10) NULL default NULL, -- foreign key from the branches table to define which branch this rule is for (if blank it's all libraries)
1228	`categorycode` varchar(10) NOT NULL default '', -- foreign key from the categories table to define which patron category this rule is for	1228	`categorycode` varchar(10) NOT NULL default '', -- foreign key from the categories table to define which patron category this rule is for
1229	`delay1` int(4) default NULL, -- number of days after the item is overdue that the first notice is sent	1229	`delay1` int(4) default NULL, -- number of days after the item is overdue that the first notice is sent
1230	`letter1` varchar(20) default NULL, -- foreign key from the letter table to define which notice should be sent as the first notice	1230	`letter1` varchar(20) default NULL, -- foreign key from the letter table to define which notice should be sent as the first notice




use C4::Members;
use C4::Overdues;
use Koha::Libraries;
use Koha::OverdueRules;
use Koha::Patron::Categories;

our $input = new CGI;

  : C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? C4::Context::mybranch()
  : Koha::Libraries->search->count() == 1                              ? undef
  :                                                                      undef;
$branch ||= undef;

my $op = $input->param('op');
$op ||= q{};

my $input_saved = 0;
if ($op eq 'save') {
    my @names=$input->multi_param();
    my $sth_search = $dbh->prepare("SELECT count(*) AS total FROM overduerules WHERE branchcode=? AND categorycode=?");

    my $sth_insert = $dbh->prepare("INSERT INTO overduerules (branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3) VALUES (?,?,?,?,?,?,?,?,?,?,?)");
    my $sth_update=$dbh->prepare("UPDATE overduerules SET delay1=?, letter1=?, debarred1=?, delay2=?, letter2=?, debarred2=?, delay3=?, letter3=?, debarred3=? WHERE branchcode=? AND categorycode=?");
    my $sth_delete=$dbh->prepare("DELETE FROM overduerules WHERE branchcode=? AND categorycode=?");
    my $sth_insert_mtt = $dbh->prepare("
        INSERT INTO overduerules_transport_types(
            overduerules_id, letternumber, message_transport_type

            if (($temphash{$bor}->{delay1} and ($temphash{$bor}->{"letter1"} or $temphash{$bor}->{"debarred1"}))
                or ($temphash{$bor}->{delay2} and ($temphash{$bor}->{"letter2"} or $temphash{$bor}->{"debarred2"}))
                or ($temphash{$bor}->{delay3} and ($temphash{$bor}->{"letter3"} or $temphash{$bor}->{"debarred3"}))) {
                    my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $bor });
                    if ( $overdue_rule ) {
                        $overdue_rule->update({
                            delay1 => ( $temphash{$bor}->{"delay1"} ? $temphash{$bor}->{"delay1"} : undef ),
                            letter1 => ( $temphash{$bor}->{"letter1"} ? $temphash{$bor}->{"letter1"} : "" ),
                            debarred1 => ( $temphash{$bor}->{"debarred1"} ? $temphash{$bor}->{"debarred1"} : 0 ),
                            delay2 => ( $temphash{$bor}->{"delay2"} ? $temphash{$bor}->{"delay2"} : undef ),
                            letter2 => ( $temphash{$bor}->{"letter2"} ? $temphash{$bor}->{"letter2"} : "" ),
                            debarred2 => ( $temphash{$bor}->{"debarred2"} ? $temphash{$bor}->{"debarred2"} : 0 ),
                            delay3 => ( $temphash{$bor}->{"delay3"} ? $temphash{$bor}->{"delay3"} : undef ),
                            letter3 => ( $temphash{$bor}->{"letter3"} ? $temphash{$bor}->{"letter3"} : "" ),
                            debarred3 => ( $temphash{$bor}->{"debarred3"} ? $temphash{$bor}->{"debarred3"} : 0 ),
                        });
                            $branch ,$bor
                            );
                    } else {
                        $overdue_rule = Koha::OverdueRule->new({
                            branchcode => $branch,
                            categorycode => $bor,
                            delay1 => ( $temphash{$bor}->{"delay1"} ? $temphash{$bor}->{"delay1"} : undef ),
                            letter1 => ( $temphash{$bor}->{"letter1"} ? $temphash{$bor}->{"letter1"} : "" ),
                            debarred1 => ( $temphash{$bor}->{"debarred1"} ? $temphash{$bor}->{"debarred1"} : 0 ),
                            delay2 => ( $temphash{$bor}->{"delay2"} ? $temphash{$bor}->{"delay2"} : undef ),
                            letter2 => ( $temphash{$bor}->{"letter2"} ? $temphash{$bor}->{"letter2"} : "" ),
                            debarred2 => ( $temphash{$bor}->{"debarred2"} ? $temphash{$bor}->{"debarred2"} : 0 ),
                            delay3 => ( $temphash{$bor}->{"delay3"} ? $temphash{$bor}->{"delay3"} : undef ),
                            letter3 => ( $temphash{$bor}->{"letter3"} ? $temphash{$bor}->{"letter3"} : "" ),
                            debarred3 => ( $temphash{$bor}->{"debarred3"} ? $temphash{$bor}->{"debarred3"} : 0 ),
                        })->store();
                    }

                    $sth_delete_mtt->execute( $branch, $bor );

    }
    unless ($err) {
        for my $category_code (@rows_to_delete) {
            my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $category_code });
            $overdue_rule->delete if $overdue_rule;
        }
        $template->param(datasaved => 1);
        $input_saved = 1;

        }
    } else {
    #getting values from table
        my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $patron_category->categorycode });
        my $dat = $overdue_rule ? $overdue_rule->unblessed : {};
        my $dat=$sth2->fetchrow_hashref;
        for my $i ( 1..3 ){
            my %row = (
                overduename => $patron_category->categorycode,
- 

Return to bug 18086

Lines 27-33 use C4::Letters; Link Here

(-)a/tools/overduerules.pl (-38 / +32 lines)
27	use C4::Members;	27	use C4::Members;
28	use C4::Overdues;	28	use C4::Overdues;
29	use Koha::Libraries;	29	use Koha::Libraries;
30		30	use Koha::OverdueRules;
31	use Koha::Patron::Categories;	31	use Koha::Patron::Categories;
32		32
33	our $input = new CGI;	33	our $input = new CGI;
Lines 76-82 $branch = Link Here
76	: C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? C4::Context::mybranch()	76	: C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? C4::Context::mybranch()
77	: Koha::Libraries->search->count() == 1 ? undef	77	: Koha::Libraries->search->count() == 1 ? undef
78	: undef;	78	: undef;
79	$branch \|\|= q{};	79	$branch \|\|= undef;
80		80
81	my $op = $input->param('op');	81	my $op = $input->param('op');
82	$op \|\|= q{};	82	$op \|\|= q{};
Lines 88-98 my %temphash; Link Here
88	my $input_saved = 0;	88	my $input_saved = 0;
89	if ($op eq 'save') {	89	if ($op eq 'save') {
90	my @names=$input->multi_param();	90	my @names=$input->multi_param();
91	my $sth_search = $dbh->prepare("SELECT count(*) AS total FROM overduerules WHERE branchcode=? AND categorycode=?");
92
93	my $sth_insert = $dbh->prepare("INSERT INTO overduerules (branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3) VALUES (?,?,?,?,?,?,?,?,?,?,?)");
94	my $sth_update=$dbh->prepare("UPDATE overduerules SET delay1=?, letter1=?, debarred1=?, delay2=?, letter2=?, debarred2=?, delay3=?, letter3=?, debarred3=? WHERE branchcode=? AND categorycode=?");
95	my $sth_delete=$dbh->prepare("DELETE FROM overduerules WHERE branchcode=? AND categorycode=?");
96	my $sth_insert_mtt = $dbh->prepare("	91	my $sth_insert_mtt = $dbh->prepare("
97	INSERT INTO overduerules_transport_types(	92	INSERT INTO overduerules_transport_types(
98	overduerules_id, letternumber, message_transport_type	93	overduerules_id, letternumber, message_transport_type
Lines 159-191 if ($op eq 'save') { Link Here
159	if (($temphash{$bor}->{delay1} and ($temphash{$bor}->{"letter1"} or $temphash{$bor}->{"debarred1"}))	154	if (($temphash{$bor}->{delay1} and ($temphash{$bor}->{"letter1"} or $temphash{$bor}->{"debarred1"}))
160	or ($temphash{$bor}->{delay2} and ($temphash{$bor}->{"letter2"} or $temphash{$bor}->{"debarred2"}))	155	or ($temphash{$bor}->{delay2} and ($temphash{$bor}->{"letter2"} or $temphash{$bor}->{"debarred2"}))
161	or ($temphash{$bor}->{delay3} and ($temphash{$bor}->{"letter3"} or $temphash{$bor}->{"debarred3"}))) {	156	or ($temphash{$bor}->{delay3} and ($temphash{$bor}->{"letter3"} or $temphash{$bor}->{"debarred3"}))) {
162	$sth_search->execute($branch,$bor);	157	my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $bor });
163	my $res = $sth_search->fetchrow_hashref();	158	if ( $overdue_rule ) {
164	if ($res->{'total'}>0) {	159	$overdue_rule->update({
165	$sth_update->execute(	160	delay1 => ( $temphash{$bor}->{"delay1"} ? $temphash{$bor}->{"delay1"} : undef ),
166	($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:undef),	161	letter1 => ( $temphash{$bor}->{"letter1"} ? $temphash{$bor}->{"letter1"} : "" ),
167	($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),	162	debarred1 => ( $temphash{$bor}->{"debarred1"} ? $temphash{$bor}->{"debarred1"} : 0 ),
168	($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),	163	delay2 => ( $temphash{$bor}->{"delay2"} ? $temphash{$bor}->{"delay2"} : undef ),
169	($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:undef),	164	letter2 => ( $temphash{$bor}->{"letter2"} ? $temphash{$bor}->{"letter2"} : "" ),
170	($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),	165	debarred2 => ( $temphash{$bor}->{"debarred2"} ? $temphash{$bor}->{"debarred2"} : 0 ),
171	($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),	166	delay3 => ( $temphash{$bor}->{"delay3"} ? $temphash{$bor}->{"delay3"} : undef ),
172	($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:undef),	167	letter3 => ( $temphash{$bor}->{"letter3"} ? $temphash{$bor}->{"letter3"} : "" ),
173	($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),	168	debarred3 => ( $temphash{$bor}->{"debarred3"} ? $temphash{$bor}->{"debarred3"} : 0 ),
174	($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0),	169	});
175	$branch ,$bor
176	);
177	} else {	170	} else {
178	$sth_insert->execute($branch,$bor,	171	$overdue_rule = Koha::OverdueRule->new({
179	($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),	172	branchcode => $branch,
180	($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),	173	categorycode => $bor,
181	($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),	174	delay1 => ( $temphash{$bor}->{"delay1"} ? $temphash{$bor}->{"delay1"} : undef ),
182	($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:0),	175	letter1 => ( $temphash{$bor}->{"letter1"} ? $temphash{$bor}->{"letter1"} : "" ),
183	($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),	176	debarred1 => ( $temphash{$bor}->{"debarred1"} ? $temphash{$bor}->{"debarred1"} : 0 ),
184	($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),	177	delay2 => ( $temphash{$bor}->{"delay2"} ? $temphash{$bor}->{"delay2"} : undef ),
185	($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:0),	178	letter2 => ( $temphash{$bor}->{"letter2"} ? $temphash{$bor}->{"letter2"} : "" ),
186	($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),	179	debarred2 => ( $temphash{$bor}->{"debarred2"} ? $temphash{$bor}->{"debarred2"} : 0 ),
187	($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0)	180	delay3 => ( $temphash{$bor}->{"delay3"} ? $temphash{$bor}->{"delay3"} : undef ),
188	);	181	letter3 => ( $temphash{$bor}->{"letter3"} ? $temphash{$bor}->{"letter3"} : "" ),
		182	debarred3 => ( $temphash{$bor}->{"debarred3"} ? $temphash{$bor}->{"debarred3"} : 0 ),
		183	})->store();
189	}	184	}
190		185
191	$sth_delete_mtt->execute( $branch, $bor );	186	$sth_delete_mtt->execute( $branch, $bor );
Lines 201-207 if ($op eq 'save') { Link Here
201	}	196	}
202	unless ($err) {	197	unless ($err) {
203	for my $category_code (@rows_to_delete) {	198	for my $category_code (@rows_to_delete) {
204	$sth_delete->execute($branch, $category_code);	199	my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $category_code });
		200	$overdue_rule->delete if $overdue_rule;
205	}	201	}
206	$template->param(datasaved => 1);	202	$template->param(datasaved => 1);
207	$input_saved = 1;	203	$input_saved = 1;
Lines 252-260 for my $patron_category (@patron_categories) { Link Here
252	}	248	}
253	} else {	249	} else {
254	#getting values from table	250	#getting values from table
255	my $sth2=$dbh->prepare("SELECT * from overduerules WHERE branchcode=? AND categorycode=?");	251	my $overdue_rule = Koha::OverdueRules->find({ branchcode => $branch, categorycode => $patron_category->categorycode });
256	$sth2->execute($branch,$patron_category->categorycode);	252	my $dat = $overdue_rule ? $overdue_rule->unblessed : {};
257	my $dat=$sth2->fetchrow_hashref;
258	for my $i ( 1..3 ){	253	for my $i ( 1..3 ){
259	my %row = (	254	my %row = (
260	overduename => $patron_category->categorycode,	255	overduename => $patron_category->categorycode,
261	-

Line 0 Link Here

(-)a/Koha/OverdueRule.pm (+42 lines)
	1	package Koha::OverdueRule;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it
	6	# under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 3 of the License, or
	8	# (at your option) any later version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but
	11	# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public License
	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	17
	18	use Modern::Perl;
	19
	20	use Carp;
	21
	22	use Koha::Database;
	23
	24	use base qw(Koha::Object);
	25
	26	=head1 NAME
	27
	28	Koha::OverdueRule - Koha OverdueRule Object class
	29
	30	=head1 API
	31
	32	=head2 Class Methods
	33
	34	=head3 type
	35
	36	=cut
	37
	38	sub _type {
	39	return 'Overduerule';
	40	}
	41
	42	1;

Line 0 Link Here

(-)a/Koha/OverdueRules.pm (+48 lines)
	1	package Koha::OverdueRules;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it
	6	# under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 3 of the License, or
	8	# (at your option) any later version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but
	11	# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public License
	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	17
	18	use Modern::Perl;
	19
	20	use Carp;
	21
	22	use Koha::Database;
	23
	24	use Koha::OverdueRule;
	25
	26	use base qw(Koha::Objects);
	27
	28	=head1 NAME
	29
	30	Koha::OverdueRules - Koha OverdueRule Object set class
	31
	32	=head1 API
	33
	34	=head2 Class Methods
	35
	36	=head3 _type
	37
	38	=cut
	39
	40	sub _type {
	41	return 'Overduerule';
	42	}
	43
	44	sub object_class {
	45	return 'Koha::OverdueRule';
	46	}
	47
	48	1;