From 0d64db87d7764855dcb1227eeed46002a02220fc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 25 Aug 2020 09:57:27 +0000 Subject: [PATCH] Bug 25534: DBRev 20.06.00.029 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../atomicupdate/cancellation_reason.perl | 24 ------------------ installer/data/mysql/updatedatabase.pl | 25 +++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/cancellation_reason.perl diff --git a/Koha.pm b/Koha.pm index 1abed2c25b..3b6ae3f730 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "20.06.00.028"; +$VERSION = "20.06.00.029"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/cancellation_reason.perl b/installer/data/mysql/atomicupdate/cancellation_reason.perl deleted file mode 100644 index 9aa9099964..0000000000 --- a/installer/data/mysql/atomicupdate/cancellation_reason.perl +++ /dev/null @@ -1,24 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('HOLD_CANCELLATION', 0); - }); - - $dbh->do(q{ -INSERT IGNORE INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default'); - }); - - if ( !column_exists( 'reserves', 'cancellation_reason' ) ) { - $dbh->do(q{ - ALTER TABLE reserves ADD COLUMN `cancellation_reason` varchar(80) default NULL AFTER cancellationdate; - }); - } - - if ( !column_exists( 'old_reserves', 'cancellation_reason' ) ) { - $dbh->do(q{ - ALTER TABLE old_reserves ADD COLUMN `cancellation_reason` varchar(80) default NULL AFTER cancellationdate; - }); - } - - NewVersion( $DBversion, 25534, "Add ability to send an email specifying a reason when canceling a hold"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 61519425e5..d01f2bab91 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22653,6 +22653,31 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 25958, "Allow LongOverdue cron to exclude specified lost values"); } +$DBversion = '20.06.00.029'; +if ( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('HOLD_CANCELLATION', 0); + }); + + $dbh->do(q{ +INSERT IGNORE INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default'); + }); + + if ( !column_exists( 'reserves', 'cancellation_reason' ) ) { + $dbh->do(q{ + ALTER TABLE reserves ADD COLUMN `cancellation_reason` varchar(80) default NULL AFTER cancellationdate; + }); + } + + if ( !column_exists( 'old_reserves', 'cancellation_reason' ) ) { + $dbh->do(q{ + ALTER TABLE old_reserves ADD COLUMN `cancellation_reason` varchar(80) default NULL AFTER cancellationdate; + }); + } + + NewVersion( $DBversion, 25534, "Add ability to send an email specifying a reason when canceling a hold"); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.39.5