Bug 33082: Add yellow buttons and page sections to 'copy order' pages
authorKatrin Fischer <katrin.fischer.83@web.de>
Mon, 27 Feb 2023 21:44:09 +0000 (21:44 +0000)
committerTomas Cohen Arazi <tomascohen@theke.io>
Fri, 17 Mar 2023 12:59:04 +0000 (09:59 -0300)
When creating a new order from an existing order (copy),
there was no page section on the search results and the
submit buttons were not yellow (primary).

To test:
1. Make sure you have budgets, funds and vendors
2. In Acquisitions, search for a vendor
3. Create a basket
4. Add an order to that basket (Order from new (empty) record is easiest)
5. Add to the basket again, choosing the "From existing orders (copy)" option
6. Search for you previous order
7. The table of ordres has no white background (missing page-section) and
   the "Next" button is not yellow
8. Check the order and click Next
9. The "Duplicate orders" button is not yellow
10. Apply patch
11. Verify buttons are now yellow and the table has a white background

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt

index b0cb7b4..721c0d4 100644 (file)
@@ -132,8 +132,8 @@ Acquisitions &rsaquo; Koha
 
 
 [% IF op == 'select' && ( result_order_loop || selected_order_loop ) %]
-    <div id="xxx">
-        <form method="post" action="/cgi-bin/koha/acqui/duplicate_orders.pl">
+<form method="post" action="/cgi-bin/koha/acqui/duplicate_orders.pl">
+    <div id="orders_to_copy" class="page-section">
         <table id="table_orders">
             <caption>
                 <span class="actions"><a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
@@ -169,13 +169,13 @@ Acquisitions &rsaquo; Koha
             [% END %]
             </tbody>
         </table>
-        <fieldset class="action">
-            <input type="hidden" name="op" value="batch_edit" />
-            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
-            <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
-        </fieldset>
-        </form>
     </div>
+    <fieldset class="action">
+        <input type="hidden" name="op" value="batch_edit" />
+        <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
+        <button type="submit" class="btn btn-primary go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
+    </fieldset>
+</form>
 
 [% ELSIF op == "batch_edit" %]
 
@@ -253,7 +253,7 @@ Acquisitions &rsaquo; Koha
         <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
         <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
         <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
-        <button type="submit" class="btn btn-default">Duplicate orders</button>
+        <button type="submit" class="btn btn-primary">Duplicate orders</button>
         <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | html %]">Cancel</a>
     </fieldset>
 </form>