From 4907e96ba8ecf85a3b62b6c78729274eb683dea6 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 15 Nov 2022 09:08:19 +0100
Subject: [PATCH] Bug 31711: (bug 27421 follow-up) Fix add to basket from a new
 file

We lost the display of the "Add staged files to basket" link when create
a new order from a new file

Test plan:
Add order to basket from a new file, select a file and import
See the detail of the job and notice the "Add staged files to basket",
click and confirm that it works as expected.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../en/includes/background_jobs/stage_marc_for_import.inc     | 4 ++--
 tools/stage-marc-import.pl                                    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc
index 4336b3df11..1ecc6747d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc
@@ -38,9 +38,9 @@
         <p>
             <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% report.import_batch_id | uri %]">View batch</a>
         </p>
-        [% IF report.basketno && report.booksellerid %]
+        [% IF report.basket_id && report.vendor_id %]
         <p>
-            <a id="addtobasket" class="btn btn-default" href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% report.import_batch_id | html %]&basketno=[% report.basketno | html %]&booksellerid=[% report.booksellerid | html %]">Add staged files to basket</a>
+            <a id="addtobasket" class="btn btn-default" href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% report.import_batch_id | html %]&basketno=[% report.basket_id | html %]&booksellerid=[% report.vendor_id | html %]">Add staged files to basket</a>
         </p>
         [% END %]
     [% END %]
diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index ba4859f473..2fe21b1a23 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -93,6 +93,8 @@ if ($fileID) {
         overlay_action             => $overlay_action,
         nomatch_action             => $nomatch_action,
         item_action                => $item_action,
+        basket_id                  => $basketno,
+        vendor_id                  => $booksellerid,
     };
     try {
         my $job_id = Koha::BackgroundJob::StageMARCForImport->new->enqueue( $params );
-- 
2.39.5