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

[koha.git] / acqui / parcel.pl

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 028e957..839c2a9 100755 (executable)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -117,6 +117,18 @@ my ($template, $loggedinuser, $cookie)
                  debug => 1,
 });
 
+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);
+    unless($parent_ordernumber) {
+        $template->param(error_cancelling_receipt => 1);
+    }
+}
+
 my $invoiceid = $input->param('invoiceid');
 my $invoice;
 $invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
@@ -130,16 +142,6 @@ unless( $invoiceid and $invoice->{invoiceid} ) {
     exit;
 }
 
-my $op = $input->param('op') // '';
-
-if ($op eq 'cancelreceipt') {
-    my $ordernumber = $input->param('ordernumber');
-    my $parent_ordernumber = CancelReceipt($ordernumber);
-    unless($parent_ordernumber) {
-        $template->param(error_cancelling_receipt => 1);
-    }
-}
-
 my $booksellerid = $invoice->{booksellerid};
 my $bookseller = GetBookSellerFromId($booksellerid);
 my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
@@ -201,9 +203,9 @@ 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 $basketname = $input->param('basketfilter') || '';