From 50baad4639c9ab059e6506e821cbf5c7d47e622e Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 10 Mar 2020 16:03:50 -0300 Subject: [PATCH] Bug 20212: Use API to render orders datatable --- .../prog/en/modules/acqui/parcel.tt | 418 +++++++++++++++--- 1 file changed, 362 insertions(+), 56 deletions(-) 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 414844397c..d92f36bcd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -34,16 +34,16 @@
- [% IF ( receive_error ) %] -
-

Error adding items:

-
    - [% FOREACH error_loo IN error_loop %] -
  • [% error_loo.error_param | html %][% IF ( error_loo.error_duplicate_barcode ) %]Duplicate Barcode[% END %]
  • - [% END %] -
-
- [% END %] + [% IF ( receive_error ) %] +
+

Error adding items:

+
    + [% FOREACH error_loo IN error_loop %] +
  • [% error_loo.error_param | html %][% IF ( error_loo.error_duplicate_barcode ) %]Duplicate Barcode[% END %]
  • + [% END %] +
+
+ [% END %]

[% IF datereceived %] Receipt summary for [% name | html %] [% IF ( invoice ) %] [ [% invoice | html %] ] [% END %] on [% datereceived | $KohaDates %] @@ -55,12 +55,12 @@ [% IF ( success_delorder ) %]
The order has been successfully canceled.
[% ELSE %] - [% IF ( error_delitem ) %] -
The order has been canceled, although one or more items could not have been deleted.
- [% END %] - [% IF ( error_delbiblio ) %] -
The order has been canceled, although the record has not been deleted.
- [% END %] + [% IF ( error_delitem ) %] +
The order has been canceled, although one or more items could not have been deleted.
+ [% END %] + [% IF ( error_delbiblio ) %] +
The order has been canceled, although the record has not been deleted.
+ [% END %] [% END %] [% IF (error_cancelling_receipt) %] @@ -87,6 +87,29 @@

[% END %] +

Pending orders (api)

+ + + + + + + + + + + + + + + + + + + + +
BasketBasket groupOrder lineSummaryMoreReplacement priceQuantityUnit costOrder costFund  
+ [% UNLESS no_orders_to_display %]

Invoice number: [% invoice | html %] Received by: [% logged_in_user.userid | html %] On: [% datereceived | $KohaDates %]

@@ -175,32 +198,32 @@ [% loop_order.ecost | $Price %] [% loop_order.total | $Price %] [% loop_order.budget_name | html %] - + Receive
Transfer - - - [% IF ( loop_order.left_holds_on_order ) %] + + + [% IF ( loop_order.left_holds_on_order ) %] [%# DONE %] Can't cancel order
- [% ELSE %] + [% ELSE %] [%# DONE %] Cancel order
- [% END %] - [% IF ( loop_order.can_del_bib ) %] + [% END %] [%# DONE %] + [% IF ( loop_order.can_del_bib ) %] [%# DONE %] Cancel order and catalog record
- [% ELSE %] + [% ELSE %] [%# DONE %] Can't cancel order and delete catalog record
[% END %] - [% IF ( loop_order.left_item ) %] + [% IF ( loop_order.left_item ) %] [%# DONE %] [% loop_order.items | html %] item(s) left
[% END %] - [% IF ( loop_order.left_biblio ) %] + [% IF ( loop_order.left_biblio ) %] [%# DONE %] [% loop_order.biblios | html %] order(s) left
[% END %] - [% IF ( loop_order.left_subscription ) %] + [% IF ( loop_order.left_subscription ) %] [%# DONE %] [% loop_order.subscriptions | html %] subscription(s) left
[% END %] - [% IF ( loop_order.left_holds ) %] + [% IF ( loop_order.left_holds ) %] [%# DONE %] [% loop_order.holds | html %] hold(s) left [% END %] @@ -365,12 +388,12 @@ [% END %] - [% END %] - + [% END %] + - [% ELSE %]There are no received orders.[% END %] + [% ELSE %]There are no received orders.[% END %]