Attachment 28868 Details for Bug 11708 – Bug 11708: Add aqbasketgroups.closeddate

[patch] Bug 11708: Add aqbasketgroups.closeddate

Bug-11708-Add-aqbasketgroupscloseddate.patch (text/plain), 3.38 KB, created by Julian Maurice on 2014-06-16 14:49:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2014-06-16 14:49:06 UTC

Size: 3.38 KB

patch

obsolete

>From b8ec249b941229f2c4f24cfda824e570bd01b6dc Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 7 Feb 2014 11:01:30 +0100
>Subject: [PATCH] Bug 11708: Add aqbasketgroups.closeddate
>
>---
> C4/Acquisition.pm                      |   19 +++++++++++++++++--
> installer/data/mysql/kohastructure.sql |    1 +
> installer/data/mysql/updatedatabase.pl |   10 ++++++++++
> 3 files changed, 28 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 2e013ac..a25bf82 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -424,7 +424,8 @@ sub CloseBasketgroup {
>     my $dbh        = C4::Context->dbh;
>     my $sth = $dbh->prepare("
>         UPDATE aqbasketgroups
>-        SET    closed=1
>+        SET    closed=1,
>+               closeddate=CAST(NOW() AS DATE)
>         WHERE  id=?
>     ");
>     $sth->execute($basketgroupno);
>@@ -445,7 +446,7 @@ sub ReOpenBasketgroup {
>     my $dbh        = C4::Context->dbh;
>     my $sth = $dbh->prepare("
>         UPDATE aqbasketgroups
>-        SET    closed=0
>+        SET    closed=0, closeddate=NULL
>         WHERE  id=?
>     ");
>     $sth->execute($basketgroupno);
>@@ -877,10 +878,17 @@ sub NewBasketgroup {
>             push(@params, $basketgroupinfo->{$field});
>         }
>     }
>+
>+    if ($basketgroupinfo->{closed}) {
>+        $query .= "closeddate, ";
>+    }
>     $query .= "booksellerid) VALUES (";
>     foreach (@params) {
>         $query .= "?, ";
>     }
>+    if ($basketgroupinfo->{closed}) {
>+        $query .= "CAST(NOW() AS DATE), ";
>+    }
>     $query .= "?)";
>     push(@params, $basketgroupinfo->{'booksellerid'});
>     my $dbh = C4::Context->dbh;
>@@ -929,6 +937,13 @@ sub ModBasketgroup {
>     my $dbh = C4::Context->dbh;
>     my $query = "UPDATE aqbasketgroups SET ";
>     my @params;
>+
>+    if ($basketgroupinfo->{closed}) {
>+        $query .= "closeddate = IF(closed = 0, CAST(NOW() AS DATE), closeddate), ";
>+    } elsif (defined $basketgroupinfo->{closed}) {
>+        $query .= "closeddate = NULL, ";
>+    }
>+
>     foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment closed)) {
>         if ( defined $basketgroupinfo->{$field} ) {
>             $query .= "$field=?, ";
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index b46dc6a..fdc78c7 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -2791,6 +2791,7 @@ CREATE TABLE `aqbasketgroups` (
>   `id` int(11) NOT NULL auto_increment,
>   `name` varchar(50) default NULL,
>   `closed` tinyint(1) default NULL,
>+  closeddate date default NULL, -- the date the basketgroup was closed
>   `booksellerid` int(11) NOT NULL,
>   `deliveryplace` varchar(10) default NULL,
>   `freedeliveryplace` text default NULL,
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index c68ba51..7603662 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8560,6 +8560,16 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
>+$DBversion = "XXX";
>+if (CheckVersion($DBversion)) {
>+    $dbh->do(q|
>+        ALTER TABLE aqbasketgroups
>+        ADD COLUMN closeddate DATE DEFAULT NULL AFTER closed
>+    |);
>+    print "Upgrade to $DBversion done (Bug XXXXX: Add aqbasketgroups.closeddate)\n";
>+    SetVersion($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11708: 25115 | 25116 | 25117 | 26003 | 26004 | 26006 | 28868 | 28869 | 28870 | 28871 | 28872 | 31305 | 31306 | 31307 | 31308 | 31309 | 31530 | 31531 | 31532 | 31533 | 31534 | 31535 | 31536 | 31537 | 31538 | 31539 | 31540 | 31541 | 31542 | 31543 | 31544 | 31702 | 31703 | 31704 | 31705 | 31748 | 31749 | 31750 | 31751 | 31752 | 31753 | 32909 | 32910 | 32911 | 32912 | 32913 | 32914 | 33308 | 33309 | 33310 | 33311 | 33312 | 33313 | 34936 | 34937 | 34938 | 34939 | 34940 | 34941 | 34977 | 35748 | 35749 | 35750 | 35751 | 35752 | 35753 | 35754 | 35755 | 35756 | 35971 | 35972 | 35973 | 35974 | 35975 | 35976 | 35977 | 35978 | 35979 | 40260 | 40261 | 40262 | 40263 | 40264 | 40265 | 40266 | 40267 | 40268 | 40272 | 48992 | 48993 | 48994 | 48995 | 48996 | 52417 | 52418 | 52419 | 52420 | 52421 | 55277 | 55278 | 55279 | 58770 | 58771 | 58772 | 58773 | 58774 | 58775 | 58776 | 58777 | 58778 | 59301 | 59302 | 59303 | 59304 | 59305 | 59306 | 59307 | 59308 | 59309 | 61018 | 61019 | 61020 | 61021 | 61022 | 61023 | 61024 | 61025 | 61026 | 71260 | 71261 | 71262 | 71263 | 71264 | 71265 | 71266 | 71267 | 71268 | 72069 | 72070 | 72071 | 72072 | 72073 | 72074 | 72075 | 72076 | 72077 | 72691 | 72692 | 72693 | 72694 | 72695 | 72696 | 72697 | 72698 | 72699 | 74213 | 74214 | 74215 | 74216 | 74217 | 74218 | 74219 | 74220 | 74221 | 74222 | 74302 | 74303 | 74304 | 74305 | 74306 | 74307 | 74308 | 74309 | 74310 | 74311 | 74349 | 74350 | 74351 | 74352 | 74353 | 74354 | 74355 | 74356 | 74357 | 74358 | 75003 | 75004 | 75908 | 75909 | 78662 | 78663 | 78664 | 80697 | 80698 | 80699 | 80700 | 80979 | 80980 | 80981 | 80982 | 85786 | 85787 | 91285 | 91286 | 92378 | 92379 | 92380 | 92381 | 92382 | 93460 | 93461 | 93462 | 93463 | 93464 | 93482 | 93483 | 93484 | 93485 | 93487 | 104928 | 104929 | 104930 | 104931 | 104932 | 104933 | 104934 | 104935