From e29b809d9acd0fee7f89dd71e5ee662fd112e68d Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 22 Apr 2025 10:58:55 +0100 Subject: [PATCH] Bug 38010: (QA follow-up) Update routes to include 'acquisition' Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- admin/aqcontract.pl | 4 ++-- debian/templates/apache-shared-intranet.conf | 2 +- .../prog/en/includes/acquisitions-search.inc | 2 +- .../prog/en/includes/acquisitions-toolbar.inc | 6 +++--- .../prog/en/modules/acqui/acqui-home.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++------ .../prog/en/modules/acqui/basketgroup.tt | 12 ++++++------ .../prog/en/modules/acqui/basketheader.tt | 4 ++-- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/cancelorder.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 4 ++-- .../prog/en/modules/acqui/edifactmsgs.tt | 4 ++-- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/moddeliverydate.tt | 2 +- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 4 ++-- .../prog/en/modules/acqui/vendor_issues.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/marc_order_accounts.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../en/modules/serials/subscription-batchedit.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/acq.js | 2 +- .../prog/js/vue/components/ERM/AgreementsList.vue | 2 +- .../components/ERM/EHoldingsLocalPackagesList.vue | 2 +- .../prog/js/vue/components/ERM/LicensesList.vue | 2 +- .../prog/js/vue/components/Vendors/VendorList.vue | 2 +- .../intranet-tmpl/prog/js/vue/routes/acquisitions.js | 2 +- t/cypress/integration/Acquisitions/Vendors_spec.ts | 12 ++++++------ 44 files changed, 68 insertions(+), 68 deletions(-) diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl index dd4ca667a98..00f1ea45a04 100755 --- a/admin/aqcontract.pl +++ b/admin/aqcontract.pl @@ -126,7 +126,7 @@ elsif ( $op eq 'cud-add_validate' ) { ); } - print $input->redirect("/cgi-bin/koha/vendors/$booksellerid"); + print $input->redirect("/cgi-bin/koha/acquisition/vendors/$booksellerid"); exit; # END $OP eq ADD_VALIDATE @@ -154,7 +154,7 @@ elsif ( $op eq 'cud-delete_confirmed' ) { my $deleted = DelContract( { contractnumber => $contractnumber } ); if ($deleted) { - print $input->redirect("/cgi-bin/koha/vendors/$booksellerid"); + print $input->redirect("/cgi-bin/koha/acquisition/vendors/$booksellerid"); exit; } else { $template->param( error => 'not_deleted' ); diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf index d34a65c20f7..1c389e28c9e 100644 --- a/debian/templates/apache-shared-intranet.conf +++ b/debian/templates/apache-shared-intranet.conf @@ -24,7 +24,7 @@ RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT] RewriteCond %{REQUEST_URI} !^/cgi-bin/koha/preservation/.*.pl$ RewriteRule ^/cgi-bin/koha/preservation/.*$ /cgi-bin/koha/preservation/home.pl [PT] RewriteRule ^/cgi-bin/koha/admin/record_sources(.*)?$ /cgi-bin/koha/admin/record_sources.pl$1 [PT] -RewriteRule ^/cgi-bin/koha/vendors(.*)?$ /cgi-bin/koha/acqui/vendors.pl$1 [PT] +RewriteRule ^/cgi-bin/koha/acquisition/vendors(.*)?$ /cgi-bin/koha/acqui/vendors.pl$1 [PT] Alias "/api" "/usr/share/koha/api" diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 2d3b54118c3..c2761b86b7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -6,7 +6,7 @@ [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="supplier_search" bt_active= 1 %] -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 3e3cbc0faa9..5e6394593dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -12,13 +12,13 @@
  • Contract
  • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %] -
  • Vendor
  • +
  • Vendor
  • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %] [% UNLESS ( basketcount OR subscriptioncount ) %]
    @@ -33,7 +33,7 @@ [% END %] [% ELSIF ( CAN_user_acquisition_vendors_manage ) %] New vendor
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a4aa54b7d8d..ecdefbb0a4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -49,7 +49,7 @@
    Search vendors - +

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 812922cfa01..d0e834b57a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -68,7 +68,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index bdad5d6f406..25592a3b50f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -51,7 +51,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% UNLESS ( basketno ) %] @@ -280,10 +280,10 @@ [% END %]

    - Go back to vendor page + Go back to vendor page [% ELSE %] Show baskets for vendor [% booksellername | html %] - Show all active baskets + Show all active baskets [% END # /IF (cannotdelbiblios) %] [% ELSE # IF ( delete_confirmed ) %] @@ -304,7 +304,7 @@ [% END # /FOR m %] -

    [% UNLESS ( basketno ) %]New[% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]

    +

    [% UNLESS ( basketno ) %]New[% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]

    [% IF ( basketno ) %]
    @@ -740,7 +740,7 @@

    Transferred from basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) on + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %]

    [% END %] @@ -914,7 +914,7 @@

    Transferred to basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) on + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %]

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index dc0ac43c28f..caa57b1f9ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -27,7 +27,7 @@ [% END %] [% IF ( grouping ) %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket grouping @@ -37,7 +37,7 @@ [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Basket grouping @@ -77,11 +77,11 @@
    [% END %] [% IF (name && closedbg) %] -

    Basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    +

    Basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    [% ELSIF (name) %] -

    Edit basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    +

    Edit basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    [% ELSE %] -

    Add basket group for [% booksellername | html %]

    +

    Add basket group for [% booksellername | html %]

    [% END %]
    [% UNLESS (closedbg) %] @@ -253,7 +253,7 @@ > New basket group
    -

    Basket grouping for [% booksellername | html %]

    +

    Basket grouping for [% booksellername | html %]

    [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]
    No EDIFACT configuration for [% booksellername | html %]
    [% END %] [% WRAPPER tabs id= "basket_groups" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 8adf6348dbe..1468aab6da8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -31,7 +31,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% IF ( add_form ) %] [% IF ( basketno ) %] @@ -156,7 +156,7 @@ [% IF ( basketno ) %] Cancel [% ELSE %] - Cancel + Cancel [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index beb68c736aa..8aa135aa6f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -54,7 +54,7 @@ [% SET h2_class="inactive" %] [% END %]

    - + [% IF (supplier.name) %] [% supplier.name | html %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index 6d9a5dc8cd7..f7bc66f8595 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -20,7 +20,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% basket.bookseller.name | html %] + [% basket.bookseller.name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index a92186cbbac..c2aa5452452 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -39,7 +39,7 @@ [% END %] [% UNLESS blocking_error %] [% WRAPPER breadcrumb_item %] - [% vendor.name | html %] + [% vendor.name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basket.basketno | html %] @@ -130,7 +130,7 @@
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] [% order.quantityreceived | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 1ab14ccf767..1c8d8a56a17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -140,9 +140,9 @@ "render": function(data, type, row, meta) { let link; if ( row.vendor ) { - link = ''+row.vendor.name+''; + link = ''+row.vendor.name+''; } else { - link = ''+row.vendor_id+''; + link = ''+row.vendor_id+''; } return link; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 159770c14af..59a838856be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -131,7 +131,7 @@
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] [% order.quantityreceived | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index 39af104cc08..aeb50dbc9dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -38,7 +38,7 @@ [% WRAPPER 'main-container.inc' aside='acquisitions-menu' %]

    Files for invoice: [% invoicenumber | html %]

    -

    Vendor: [% suppliername | html %]

    +

    Vendor: [% suppliername | html %]


    [% IF errors %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 45b7e447e34..75cce41d388 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -55,7 +55,7 @@
    [% END %] -

    Vendor: [% suppliername | html %]

    +

    Vendor: [% suppliername | html %]

    [% INCLUDE 'csrf-token.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index dde20e5ff13..5066a25a45e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -86,7 +86,7 @@ [% END %] [% invoice.invoicenumber | html %] - [% invoice.suppliername | html %] + [% invoice.suppliername | html %] [% invoice.shipmentdate | $KohaDates %] [% invoice.billingdate | $KohaDates %] [% invoice.receivedbiblios | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt index 5e5a7bf3f54..110af9918f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -22,7 +22,7 @@ Acquisition [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketname | html %] ([% basketno | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index 5234b8389e2..2b026c2f697 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -24,7 +24,7 @@ Acquisition [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketname | html %] ([% basketno | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 74e9dc52a1d..b6ebb232f46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -241,7 +241,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 76207bdd7eb..a7b4b57b7c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -26,7 +26,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 1baa4a6a881..613b56588b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -27,7 +27,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 95337e6c2f1..2e4fc530963 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -65,7 +65,7 @@ [% END %] - [% order.vendorname | html %] + [% order.vendorname | html %] [% FOREACH itemtype IN order.itemtypes %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 4de4232aee2..b36f1d39b92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -90,7 +90,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF ( invoice ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 85abb2ec5c6..4dfc2d6ddef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -44,7 +44,7 @@ [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Receive orders from [% name | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 2afbbabff07..ee915a541b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -25,7 +25,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Receive shipment from vendor [% name | html %] @@ -38,7 +38,7 @@
    [% INCLUDE 'messages.inc' %] -

    Receive shipment from vendor [% name | html %]

    +

    Receive shipment from vendor [% name | html %]

    [% IF closed_invoices %]

    [% I18N.tnx("There is one closed invoice not included in this search.", "There are {closed_invoices} closed invoices not included in this search.", closed_invoices, { closed_invoices => closed_invoices }) %]

    @@ -197,7 +197,7 @@ [% IF available_additional_fields %] [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] [% END %] -
    Cancel
    +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 3e782786fd2..84ec2f98b13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -59,7 +59,7 @@ [% order.ordernumber | html %] - [% order.vendorname | html %] + [% order.vendorname | html %] [% order.invoicenumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index e4cefd52bbc..abdb566a100 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -30,7 +30,7 @@ [% END %] [% IF ( booksellername ) %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Uncertain prices for vendor [% booksellername | html %] @@ -51,7 +51,7 @@ [% ELSE %] [% IF ( booksellername ) %] -

    Orders with uncertain prices for vendor [% booksellername | html %]

    +

    Orders with uncertain prices for vendor [% booksellername | html %]

    Contact information

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt index d9f1e58aa8b..c52799f92a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt @@ -39,7 +39,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% vendor.name | html %] + [% vendor.name | html %] [% END %] [% IF op == 'list' %] [% WRAPPER breadcrumb_item bc_active= 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 8be3301830a..4b7acc6314f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -62,7 +62,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index e57d68735be..1743ad819cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -37,7 +37,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% IF ( else ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 4a14562aafc..7c591889cfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -315,7 +315,7 @@ [% FOREACH account IN ediaccounts %] [% account.id | html %] - [% account.vendor.name | html %] + [% account.vendor.name | html %] [% account.description | html %] [% account.transport | html %] [% account.host | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt index 824dd9a0ac2..53c4541a9b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt @@ -58,7 +58,7 @@ [% FOREACH account IN accounts %] [% account.id | html %] - [% account.vendor.name | html %] + [% account.vendor.name | html %] [% account.budget.budget_name | html %] [% account.description | html %] [% account.download_directory | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 0666397a68d..dd588e48741 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -600,7 +600,7 @@ [% SET vendor = basket.bookseller %] - [% vendor.name | html %] + [% vendor.name | html %] [% IF order.invoiceid %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt index aea94db24b3..4a185e469f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -64,7 +64,7 @@ [% FOREACH data IN datas %] - [% data.name | html %] + [% data.name | html %] [% data.title | html %] [% data.subscriptionid | html %] [% Branches.GetName( data.branchcode ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index 6037cca03e3..37d5a9f357f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -58,7 +58,7 @@ [% subscription.biblio.biblioitem.issn | html %] [% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %]) - [% subscription.vendor.name | html %] + [% subscription.vendor.name | html %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %] [% Branches.GetName(subscription.branchcode) | html %] [% ItemTypes.GetDescription( subscription.itemtype ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index ae8ffb35f33..6d25533f1ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -110,7 +110,7 @@
    1. Subscription ID: [% subscriptionid | html %]
    2. Librarian identity: [% librarian | html %]
    3. -
    4. Vendor: [% aqbooksellername | html %]
    5. +
    6. Vendor: [% aqbooksellername | html %]
    7. Bibliographic record: [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] ([% subscription.biblionumber | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/js/acq.js b/koha-tmpl/intranet-tmpl/prog/js/acq.js index 8da6391b643..627bdb1381e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/js/acq.js @@ -445,7 +445,7 @@ $(document).ready(function () { contentType: "application/json", }; $.ajax(options).then(function (thing, result) { - window.location.href = "/cgi-bin/koha/vendors"; + window.location.href = "/cgi-bin/koha/acquisition/vendors"; }); }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index 16c5076d465..8e0989f35d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -335,7 +335,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue index 49c148186bd..8f931267cf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue @@ -235,7 +235,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue index 7a9606cb6e0..7e5409856df 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue @@ -227,7 +227,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue index f8b2d8ff780..2fc5ec1cd2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue @@ -201,7 +201,7 @@ export default { orderable: true, render(data, type, row, meta) { return ( - '' + escape_str(`${row.name} (#${row.id})`) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js index aa6ee9a597f..49ab9629198 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js @@ -21,7 +21,7 @@ export const routes = [ is_navigation_item: false, }, { - path: "/cgi-bin/koha/vendors", + path: "/cgi-bin/koha/acquisition/vendors", title: $__("Vendors"), icon: "fa fa-shopping-cart", is_end_node: true, diff --git a/t/cypress/integration/Acquisitions/Vendors_spec.ts b/t/cypress/integration/Acquisitions/Vendors_spec.ts index 51d4d0f2024..f15b71afe51 100644 --- a/t/cypress/integration/Acquisitions/Vendors_spec.ts +++ b/t/cypress/integration/Acquisitions/Vendors_spec.ts @@ -66,7 +66,7 @@ describe("Vendor CRUD operations", () => { cy.visit("/cgi-bin/koha/acqui/acqui-home.pl"); cy.intercept("GET", "/api/v1/acquisitions/vendors*", []); - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); cy.get("#vendors_list").contains("There are no vendors defined"); const vendor = getVendor(); @@ -79,7 +79,7 @@ describe("Vendor CRUD operations", () => { }, }); cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor); - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); cy.get("#vendors_list").contains("Showing 1 to 1 of 1 entries"); }); @@ -92,7 +92,7 @@ describe("Vendor CRUD operations", () => { }); // Click the button in the toolbar - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); cy.contains("New vendor").click(); cy.get("#vendor_add h1").contains("Add vendor"); @@ -180,7 +180,7 @@ describe("Vendor CRUD operations", () => { it("should edit a vendor", () => { const vendor = getVendor(); - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor).as( "get-vendor" ); @@ -218,7 +218,7 @@ describe("Vendor CRUD operations", () => { "X-Total-Count": "1", }, }); - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); const name_link = cy.get( "#vendors_list table tbody tr:first td:first a" ); @@ -244,7 +244,7 @@ describe("Vendor CRUD operations", () => { }, }); cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor); - cy.visit("/cgi-bin/koha/vendors"); + cy.visit("/cgi-bin/koha/acquisition/vendors"); cy.get("#vendors_list table tbody tr:first").contains("Delete").click(); cy.get(".alert-warning.confirmation h1").contains("remove this vendor"); -- 2.34.1