Bug 22762: Fix items.collection display on receiving

[koha-equinox.git] / catalogue / getitem-ajax.pl

diff --git a/catalogue/getitem-ajax.pl b/catalogue/getitem-ajax.pl
index fd69a74..80c4f61 100755 (executable)
--- a/catalogue/getitem-ajax.pl
+++ b/catalogue/getitem-ajax.pl
@@ -23,10 +23,14 @@ use JSON;
 
 use C4::Auth;
 use C4::Biblio;
-use C4::Branch;
 use C4::Items;
 use C4::Koha;
 use C4::Output;
+use Koha::Libraries;
+
+use Koha::AuthorisedValues;
+use Koha::Items;
+use Koha::ItemTypes;
 
 my $cgi = new CGI;
 
@@ -40,43 +44,42 @@ unless ($status eq "ok") {
 my $item = {};
 my $itemnumber = $cgi->param('itemnumber');
 
+my $item_unblessed = {};
 if($itemnumber) {
     my $acq_fw = GetMarcStructure(1, 'ACQ');
     my $fw = ($acq_fw) ? 'ACQ' : '';
-    $item = GetItem($itemnumber);
+    $item = Koha::Items->find($itemnumber);
+    $item_unblessed = $item->unblessed; # FIXME Not needed, call home_branch and holding_branch in the templates instead
 
-    if($item->{homebranch}) {
-        $item->{homebranchname} = GetBranchName($item->{homebranch});
+    if($item->homebranch) { # This test should not be needed, homebranch and holdingbranch are mandatory
+        $item_unblessed->{homebranchname} = $item->home_branch->branchname;
     }
 
-    if($item->{holdingbranch}) {
-        $item->{holdingbranchname} = GetBranchName($item->{holdingbranch});
+    if($item->holdingbranch) {
+        $item_unblessed->{holdingbranchname} = $item->holding_branch->branchname;
     }
 
-    if(my $code = GetAuthValCode("items.notforloan", $fw)) {
-        $item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan});
-    }
+    my $descriptions;
+    $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->notforloan });
+    $item_unblessed->{notforloan} = $descriptions->{lib} // '';
 
-    if(my $code = GetAuthValCode("items.restricted", $fw)) {
-        $item->{restricted} = GetKohaAuthorisedValueLib($code, $item->{restricted});
-    }
+    $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->restricted });
+    $item_unblessed->{restricted} = $descriptions->{lib} // '';
 
-    if(my $code = GetAuthValCode("items.location", $fw)) {
-        $item->{location} = GetKohaAuthorisedValueLib($code, $item->{location});
-    }
+    $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->location });
+    $item_unblessed->{location} = $descriptions->{lib} // '';
 
-    if(my $code = GetAuthValCode("items.ccode", $fw)) {
-        $item->{collection} = GetKohaAuthorisedValueLib($code, $item->{ccode});
-    }
+    $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.ccode', authorised_value => $item->ccode });
+    $item_unblessed->{collection} = $descriptions->{lib} // '';
 
-    if(my $code = GetAuthValCode("items.materials", $fw)) {
-        $item->{materials} = GetKohaAuthorisedValueLib($code, $item->{materials});
-    }
+    $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->materials });
+    $item_unblessed->{materials} = $descriptions->{lib} // '';
 
-    my $itemtype = getitemtypeinfo($item->{itype});
-    $item->{itemtype} = $itemtype->{description};
+    my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype );
+    # We should not do that here, but call ->itemtype->description when needed instea
+    $item_unblessed->{itemtype} = $itemtype->description; # FIXME Should not it be translated_description?
 }
 
-my $json_text = to_json( $item, { utf8 => 1 } );
+my $json_text = to_json( $item_unblessed, { utf8 => 1 } );
 
 output_with_http_headers $cgi, undef, $json_text, 'json';