X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=catalogue%2Fupdateitem.pl;h=9ff9f9b2d525ab10a49c3d11c0b610e31f5277fd;hb=b85b33f28c08178e8b73eb22baf654b7457c093e;hp=24b1a7e6ea4afb32152d5fbda95a6bb1c41a3996;hpb=c6c8e80a73178ef427fea1b66c685654a8659a91;p=srvgit

diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl
index 24b1a7e6ea..9ff9f9b2d5 100755
--- a/catalogue/updateitem.pl
+++ b/catalogue/updateitem.pl
@@ -5,105 +5,88 @@
 #
 # 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-use strict; 
-use warnings;
-use CGI;
+# 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 CGI qw ( -utf8 );
+use C4::Auth;
 use C4::Context;
 use C4::Biblio;
 use C4::Items;
 use C4::Output;
 use C4::Circulation;
-use C4::Accounts;
 use C4::Reserves;
 
-my $cgi= new CGI;
+my $cgi= CGI->new;
 
+checkauth($cgi, 0, {circulate => 'circulate_remaining_permissions'}, 'intranet');
+
+my $op = $cgi->param('op') || "";
 my $biblionumber=$cgi->param('biblionumber');
 my $itemnumber=$cgi->param('itemnumber');
 my $biblioitemnumber=$cgi->param('biblioitemnumber');
 my $itemlost=$cgi->param('itemlost');
 my $itemnotes=$cgi->param('itemnotes');
-my $wthdrawn=$cgi->param('wthdrawn');
+my $itemnotes_nonpublic=$cgi->param('itemnotes_nonpublic');
+my $withdrawn=$cgi->param('withdrawn');
 my $damaged=$cgi->param('damaged');
+my $exclude_from_local_holds_priority = $cgi->param('exclude_from_local_holds_priority');
 
 my $confirm=$cgi->param('confirm');
 my $dbh = C4::Context->dbh;
 
 # get the rest of this item's information
-my $item_data_hashref = GetItem($itemnumber, undef);
+my $item = Koha::Items->find($itemnumber);
+my $item_data_hashref = $item->unblessed;
 
 # make sure item statuses are set to 0 if empty or NULL
-for ($damaged,$itemlost,$wthdrawn) {
+for ($damaged,$itemlost,$withdrawn) {
     if (!$_ or $_ eq "") {
         $_ = 0;
     }
 }
 
+my $messages = q{};
+
 # modify MARC item if input differs from items table.
-my $item_changes = {};
-if (defined $itemnotes and ($itemnotes ne $item_data_hashref->{'itemnotes'})) {
-    $item_changes->{'itemnotes'} = $itemnotes;
-} elsif ($itemlost ne $item_data_hashref->{'itemlost'}) {
-    $item_changes->{'itemlost'} = $itemlost;
-} elsif ($wthdrawn ne $item_data_hashref->{'wthdrawn'}) {
-    $item_changes->{'wthdrawn'} = $wthdrawn;
-} elsif ($damaged ne $item_data_hashref->{'damaged'}) {
-    $item_changes->{'damaged'} = $damaged;
+if ( $op eq "set_non_public_note" ) {
+    checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
+    if ((not defined  $item_data_hashref->{'itemnotes_nonpublic'}) or $itemnotes_nonpublic ne $item_data_hashref->{'itemnotes_nonpublic'}) {
+        $item->itemnotes_nonpublic($itemnotes_nonpublic);
+    }
+}
+elsif ( $op eq "set_public_note" ) { # i.e., itemnotes parameter passed from form
+    checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
+    if ((not defined  $item_data_hashref->{'itemnotes'}) or $itemnotes ne $item_data_hashref->{'itemnotes'}) {
+        $item->itemnotes($itemnotes);
+    }
+} elsif ( $op eq "set_lost" && $itemlost ne $item_data_hashref->{'itemlost'}) {
+    $item->itemlost($itemlost);
+} elsif ( $op eq "set_withdrawn" && $withdrawn ne $item_data_hashref->{'withdrawn'}) {
+    $item->withdrawn($withdrawn);
+} elsif ( $op eq "set_exclude_priority" && $exclude_from_local_holds_priority ne $item_data_hashref->{'exclude_from_local_holds_priority'}) {
+    $item->exclude_from_local_holds_priority($exclude_from_local_holds_priority);
+    $messages = "updated_exclude_from_local_holds_priority=$exclude_from_local_holds_priority&";
+} elsif ( $op eq "set_damaged" && $damaged ne $item_data_hashref->{'damaged'}) {
+    $item->damaged($damaged);
 } else {
     #nothings changed, so do nothing.
-    print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber");
+    print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");
+	exit;
 }
 
-ModItem($item_changes, $biblionumber, $itemnumber);
+$item->store;
 
-# check issues iff itemlost.
-# http://wiki.koha.org/doku.php?id=en:development:kohastatuses
-# lost ==1 Lost, lost==2 longoverdue, lost==3 lost and paid for
-# FIXME: itemlost should be set to 3 after payment is made, should be a warning to the interface that
-# a charge has been added
-# FIXME : if no replacement price, borrower just doesn't get charged?
-if ($itemlost==1) {
-    my $sth=$dbh->prepare("SELECT * FROM issues WHERE (itemnumber=? AND returndate IS NULL)");
-    $sth->execute($itemnumber);
-    my $issues=$sth->fetchrow_hashref();
-
-    # if a borrower lost the item, add a replacement cost to the their record
-    if ( ($issues->{borrowernumber}) && ($itemlost==1) ){
-
-        # first make sure the borrower hasn't already been charged for this item
-        my $sth1=$dbh->prepare("SELECT * from accountlines
-        WHERE borrowernumber=? AND itemnumber=?");
-        $sth1->execute($issues->{'borrowernumber'},$itemnumber);
-        my $existing_charge_hashref=$sth1->fetchrow_hashref();
-
-        # OK, they haven't
-        unless ($existing_charge_hashref) {
-            # This item is on issue ... add replacement cost to the borrower's record and mark it returned
-            my $accountno = getnextacctno('',$issues->{'borrowernumber'},$dbh);
-            my $sth2=$dbh->prepare("INSERT INTO accountlines
-            (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber)
-            VALUES
-            (?,?,now(),?,?,'L',?,?)");
-            $sth2->execute($issues->{'borrowernumber'},$accountno,$item_data_hashref->{'replacementprice'},
-            "Lost Item $item_data_hashref->{'title'} $item_data_hashref->{'barcode'}",
-            $item_data_hashref->{'replacementprice'},$itemnumber);
-            $sth2->finish;
-        # FIXME: Log this ?
-        }
-    }
-    $sth->finish;
-}
+LostItem($itemnumber, 'moredetail') if $op eq "set_lost";
 
-print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber");
+print $cgi->redirect("moredetail.pl?" . $messages . "biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");