Bug 9456: (follow-up) use datatables.inc

[koha.git] / acqui / parcel.pl

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 8e82283..839c2a9 100755 (executable)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -117,9 +117,10 @@ my ($template, $loggedinuser, $cookie)
                  debug => 1,
 });
 
-my $invoiceid = $input->param('invoiceid');
 my $op = $input->param('op') // '';
 
+# process cancellation first so that list of
+# orders to display is calculated after
 if ($op eq 'cancelreceipt') {
     my $ordernumber = $input->param('ordernumber');
     my $parent_ordernumber = CancelReceipt($ordernumber);
@@ -128,29 +129,23 @@ if ($op eq 'cancelreceipt') {
     }
 }
 
-my $invoice = GetInvoiceDetails($invoiceid);
+my $invoiceid = $input->param('invoiceid');
+my $invoice;
+$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
+
+unless( $invoiceid and $invoice->{invoiceid} ) {
+    $template->param(
+        error_invoice_not_known => 1,
+        no_orders_to_display    => 1
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+    exit;
+}
+
 my $booksellerid = $invoice->{booksellerid};
 my $bookseller = GetBookSellerFromId($booksellerid);
 my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
 my $datereceived = C4::Dates->new();
-my $code            = $input->param('code');
-my @rcv_err         = $input->param('error');
-my @rcv_err_barcode = $input->param('error_bc');
-
-
-
-# If receiving error, report the error (coming from finishrecieve.pl(sic)).
-if( scalar(@rcv_err) ) {
-       my $cnt=0;
-       my $error_loop;
-       for my $err (@rcv_err) {
-               push @$error_loop, { "error_$err" => 1 , barcode => $rcv_err_barcode[$cnt] };
-               $cnt++;
-       }
-       $template->param( receive_error => 1 ,
-                                               error_loop => $error_loop,
-                                       );
-}
 
 my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
 my @parcelitems   = @{ $invoice->{orders} };
@@ -169,8 +164,7 @@ for my $item ( @parcelitems ) {
     $item->{unitprice} = get_value_with_gst_params( $item->{unitprice}, $item->{gstrate}, $bookseller );
     $total = ( $item->{'unitprice'} ) * $item->{'quantityreceived'};
     $item->{'unitprice'} += 0;
-    my %line;
-    %line          = %{ $item };
+    my %line = %{ $item };
     my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
     $line{ecost} = sprintf( "%.2f", $ecost );
     $line{invoice} = $invoice->{invoicenumber};
@@ -209,18 +203,35 @@ for my $item ( @parcelitems ) {
 push @book_foot_loop, map { $_ } values %foot;
 
 my @loop_orders = ();
-if(!defined $invoice->{closedate}) {
+unless( defined $invoice->{closedate} ) {
     my $pendingorders;
-    if($input->param('op') eq "search"){
+    if($op eq "search"){
         my $search   = $input->param('summaryfilter') || '';
         my $ean      = $input->param('eanfilter') || '';
-        my $basketno = $input->param('basketfilter') || '';
+        my $basketname = $input->param('basketfilter') || '';
         my $orderno  = $input->param('orderfilter') || '';
-        my $grouped;
-        my $owner;
-        $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean);
+        my $basketgroupname = $input->param('basketgroupnamefilter') || '';
+        $pendingorders = SearchOrders({
+            booksellerid => $booksellerid,
+            basketname => $basketname,
+            ordernumber => $orderno,
+            search => $search,
+            ean => $ean,
+            basketgroupname => $basketgroupname,
+            pending => 1,
+        });
+        $template->param(
+            summaryfilter => $search,
+            eanfilter => $ean,
+            basketfilter => $basketname,
+            orderfilter => $orderno,
+            basketgroupnamefilter => $basketgroupname,
+        );
     }else{
-        $pendingorders = GetPendingOrders($booksellerid);
+        $pendingorders = SearchOrders({
+            booksellerid => $booksellerid,
+            pending => 1
+        });
     }
     my $countpendings = scalar @$pendingorders;