Bug 21659: Fix links to basket groups from order receive page
Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> (cherry picked from commit3db5feb900) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> (cherry picked from commit6f17381213) Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
parent
531ee47223
commit
bf09bf5826
|
|
@ -129,7 +129,7 @@
|
|||
<td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
|
||||
<td>
|
||||
[% IF loop_order.basketgroupid %]
|
||||
[% loop_order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid %]">[% loop_order.basketgroupid %]</a>)
|
||||
[% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]&basketgroupid=[% loop_order.basketgroupid | uri %]">[% loop_order.basketgroupid | html %]</a>)
|
||||
[% ELSE %]
|
||||
No basket group
|
||||
[% END %]
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
<td>[% order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
|
||||
<td>
|
||||
[% IF order.basketgroupid %]
|
||||
[% order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid %]">[% order.basketgroupid %]</a>)
|
||||
[% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]&basketgroupid=[% order.basketgroupid | uri %]">[% order.basketgroupid | html %]</a>)
|
||||
[% ELSE %]
|
||||
No basket group
|
||||
[% END %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue