From 692ee0e9dac718ba2aff53a6440f9cde9a8f3409 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 19 Mar 2012 15:50:01 +0100 Subject: [PATCH] Bug 7166: Adds edit order notes when the basket is closed When you are on parcel.pl or basket.pl you can now add or edit a note for each order. To test: Create orders with and without note. Edit/Add the note on basket.pl page Close the basket. Check you can add/edit the order note on parcel.pl page + From Owen: Correcting markup issues with modordernotes.pl: - Adding "rows" and "cols" attributes to + + + + +
+ + Cancel +
+ + + +[% INCLUDE 'intranet-bottom.inc' %] 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 e6464f22ff..26a53bb272 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -170,9 +170,9 @@ $(document).ready(function() [% IF ( basketno ) %]
-
+
Basket details -
    +
      [% IF ( basketnote ) %]
    1. Internal note: [% basketnote %]
    2. [% END %] [% IF ( basketbooksellernote ) %]
    3. Vendor note: [% basketbooksellernote %]
    4. [% END %] [% IF ( basketcontractno ) %] @@ -198,12 +198,12 @@ $(document).ready(function() -
      - +
      [% END %] + [% END %] -
    -
+ +
[% END %] 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 786c5be068..02e176982f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -246,6 +246,12 @@ Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] (suggestion #[% loop_order.suggestionid %]) [% END %] +
+ [% IF ( loop_order.notes ) %] +

Note: [% loop_order.notes|html %] [Change note]

+ [% ELSE %] + [Add note] + [% END %] MARC | Card [% loop_order.quantity %] -- 2.39.5