Bug 28948: Remove query params, 'q' param covers everything needed

[koha-ffzg.git] / catalogue / moredetail.pl

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 9bf2f58..e033a21 100755 (executable)
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -20,25 +20,24 @@
 
 
 use Modern::Perl;
-use C4::Koha;
+use C4::Koha qw( GetAuthorisedValues );
 use CGI qw ( -utf8 );
 use HTML::Entities;
-use C4::Biblio;
-use C4::Items;
-use C4::Acquisition;
-use C4::Output;
-use C4::Auth;
-use C4::Serials;
-use C4::Search;                # enabled_staff_search_views
+use C4::Biblio qw( GetBiblioData GetFrameworkCode GetMarcBiblio );
+use C4::Items qw( GetHostItemsInfo GetItemsInfo );
+use C4::Acquisition qw( GetOrderFromItemnumber GetBasket GetInvoice );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::Serials qw( CountSubscriptionFromBiblionumber );
+use C4::Search qw( enabled_staff_search_views z3950_search_args );
 
 use Koha::Acquisition::Booksellers;
 use Koha::AuthorisedValues;
 use Koha::Biblios;
-use Koha::DateUtils;
 use Koha::Items;
 use Koha::Patrons;
 
-my $query=new CGI;
+my $query=CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
     {
@@ -72,13 +71,21 @@ if( $query->cookie("searchToOrder") ){
 }
 
 # get variables
+my $biblionumber;
+my $itemnumber;
+if( $query->param('itemnumber') && !$query->param('biblionumber') ){
+    $itemnumber = $query->param('itemnumber');
+    my $item = Koha::Items->find( $itemnumber );
+    $biblionumber = $item->biblionumber;
+} else {
+    $biblionumber = $query->param('biblionumber');
+}
 
-my $biblionumber=$query->param('biblionumber');
 $biblionumber = HTML::Entities::encode($biblionumber);
 my $title=$query->param('title');
 my $bi=$query->param('bi');
 $bi = $biblionumber unless $bi;
-my $itemnumber = $query->param('itemnumber');
+$itemnumber = $query->param('itemnumber');
 my $data = &GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
 my $showallitems = $query->param('showallitems');
@@ -201,14 +208,13 @@ foreach my $item (@items){
         );
 
         if ( my $accountline = $accountlines->next ) {
-            my $payment_offsets = Koha::Account::Offsets->search(
+            my $payment_offsets = $accountline->debit_offsets(
                 {
-                    debit_id  => $accountline->id,
                     credit_id => { '!=' => undef }, # it is not the debit itself
-                    type => { '!=' => [ 'Writeoff', 'Forgiven' ] },
-                    amount => { '<' => 0 }    # credits are negative on the DB
+                    'credit.credit_type_code' =>
+                      { '!=' => [ 'Writeoff', 'Forgiven' ] },
                 },
-                { order_by => { '-desc' => 'created_on' } }
+                { join => 'credit', order_by => { '-desc' => 'created_on' } }
             );
 
             if ($payment_offsets->count) {
@@ -257,6 +263,38 @@ $template->param(count => $data->{'count'},
        C4::Search::enabled_staff_search_views,
 );
 
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("intranet_bib_list")){
+    my $cart_list = $query->cookie("intranet_bib_list");
+    @cart_list = split(/\//, $cart_list);
+    if ( grep {$_ eq $biblionumber} @cart_list) {
+        $template->param( incart => 1 );
+    }
+}
+
+my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        category       => 1,
+    }
+);
+my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        category       => 2,
+    }
+);
+
+
+$template->param(
+    add_to_some_private_shelves => $some_private_shelves,
+    add_to_some_public_shelves  => $some_public_shelves,
+);
+
 $template->param(
     ITEM_DATA           => \@items,
     moredetailview      => 1,