Bug 36173

Created attachment 162501 [details] [review]
Bug 36173: Display basket info when cancelling an order

The basketno is missing from the 2 links in acqui/parcel.tt

Better to retrieve the basketno from the order in the controller.

Test plan:
Create an order, receive it
On the parcel view notice that the "Cancel order" link leads to a
confirmation page that does not contain the info of the basket.
It's fixed with this patch applied.

If this patch does not apply, wait for bug 34478 to be pushed.

Created attachment 163086 [details] [review]
Bug 36173: Display basket info when cancelling an order

The basketno is missing from the 2 links in acqui/parcel.tt

Better to retrieve the basketno from the order in the controller.

Test plan:
Create an order, receive it
On the parcel view notice that the "Cancel order" link leads to a
confirmation page that does not contain the info of the basket.
It's fixed with this patch applied.

Signed-off-by: David Nind <david@davidnind.com>

Testing notes (using KTD):

1. Breadcrumb links when you cancel an order are corrected with the patch:

   . Before - no text or link to My Vendor and no link for Basket number:
     Acquisitions >  > Basket () for > Cancel order 

   . After - now correctly has text and link to the vendor and for the Basket:
     Acquisitions > My Vendor > Basket TEST1 (2) for My Vendor > Cancel order

Other notes
===========

Is there another issue here as well, with actually receiving an order? When I go to receive an order (before the patch is applied), I get an error - not sure whether this is something to do with my KTD setup, or something else:

1. Added one item to a basket
2. Closed the basket
4. Went to receive order for an order
5. Update quantity to receive - 1
6. Error in pop up window: "Order 1: An error occurred while saving"
7. Web developer tools error:

XHRPOST http://127.0.0.1:8081/cgi-bin/koha/acqui/finishreceive.pl
[HTTP/1.1 403 Forbidden 103ms]
	
POST http://127.0.0.1:8081/cgi-bin/koha/acqui/finishreceive.pl
Status 403 Forbidden
Version HTTP/1.1
Transferred 29.46 kB (29 kB size)
Referrer Policy strict-origin-when-cross-origin
Request Priority Highest
DNS Resolution System

Response Headers:
    Cache-Control no-cache
    Connection Keep-Alive
    Content-Length 28999
    Content-Script-Type text/javascript
    Content-Style-Type 	text/css
    Content-Type text/html; charset=UTF-8
    Date Tue, 12 Mar 2024 04:55:06 GMT
    Keep-Alive timeout=5, max=100
    Pragma no-cache
    Server Apache/2.4.56 (Debian)
    Set-Cookie CGISESSID=0edfe61661acb72d2e9f2c872340a966; path=/; HttpOnly; SameSite=Lax
    Vary User-Agent
    X-Frame-Options SAMEORIGIN
 
Request Headers:
    Accept */*
    Accept-Encoding gzip, deflate, br
    Accept-Language en-US,en;q=0.5
    Connection keep-alive
    Content-Length 260
    Content-Type application/x-www-form-urlencoded; charset=UTF-8
    Cookie CGISESSID=0edfe61661acb72d2e9f2c872340a966; searchToOrder=1/1
    Host 127.0.0.1:8081
    Origin http://127.0.0.1:8081
    Referer http://127.0.0.1:8081/cgi-bin/koha/acqui/orderreceive.pl?multiple_orders=1&invoiceid=1
    Sec-Fetch-Dest empty
    Sec-Fetch-Mode cors
    Sec-Fetch-Site same-origin
    User-Agent Mozilla/5.0 (X11; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0
    X-Requested-With  XMLHttpRequest

Created attachment 164262 [details] [review]
Bug 36173: Display basket info when cancelling an order

The basketno is missing from the 2 links in acqui/parcel.tt

Better to retrieve the basketno from the order in the controller.

Test plan:
Create an order, receive it
On the parcel view notice that the "Cancel order" link leads to a
confirmation page that does not contain the info of the basket.
It's fixed with this patch applied.

Note: Don't fully receive, but 'Receive shipment' from vendor, choose an invoice, and cancel the order from the list to be received

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Created attachment 164263 [details] [review]
Bug 36173: (follow-up) Tidy

(In reply to David Nind from comment #4)
> Testing notes (using KTD):

> Other notes
> ===========
> 
> Is there another issue here as well, with actually receiving an order? When
> I go to receive an order (before the patch is applied), I get an error - not
> sure whether this is something to do with my KTD setup, or something else:
> 

I didn't see this, but possibly CSRF issues that have been addressed

Pushed for 24.05!

Well done everyone, thank you!

Pushed to 23.11.x for 23.11.06

Doesn't apply cleanly to 23.05.x, no backport.