Created attachment 53484 [details] [review] Bug 16939: Making all 'add to basket' actions buttons To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT
Comment on attachment 53484 [details] [review] Bug 16939: Making all 'add to basket' actions buttons >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -442,7 +442,7 @@ > </td> > <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td> > <td>[% batch_lis.num_records %]</td> >- <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]">Add orders</a></td> >+ <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-mini"><i clas="fa fa-plus"></i> Add orders</a></td> > </tr> There is a typo in "clas" in "fa fa-plus"
Looks great, just fix the "clas" in Add orders -> addorderiso2709.tt
Created attachment 53538 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT
Created attachment 53545 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT
Created attachment 53565 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
You are using quote inside a quoted string, I get a JS error when creating a new order: SyntaxError: missing ; before statement result += "<td class="actions">" + edit_link + " " + del_link + "</td>";
Created attachment 53716 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Please update circ/reserveratios.tt so that the "plus" icon is not shown when there is no link.
Created attachment 53791 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
(In reply to Aleisha Amohia from comment #10) > Edit: circ/reserveratios.tt updated so that the plus icon doesn't show > if there is no link I'm still getting the plus sign when there is no link. I think the template logic is off somewhere. If it helps, feel free to break up and re-indent that section since right now it's all on one line.
Created attachment 54494 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
(In reply to Owen Leonard from comment #11) > I'm still getting the plus sign when there is no link. I think the template > logic is off somewhere. If it helps, feel free to break up and re-indent > that section since right now it's all on one line. I rearranged some stuff, so hopefully this new patch works for you!
Wanted to test, but patch does not apply, sorry.
Created attachment 57874 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Created attachment 61206 [details] Strange artifact when ordering from external source Testing 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row Result Clicking on adropdown menu shows a strange artifact. Tested with Firefox 52.0 (32-Bit) Win Other points are OK
Please update the classes on the action buttons. Now that we have Bootstrap 3 the button classes should be "btn btn-default btn-xs" https://wiki.koha-community.org/wiki/Interface_patterns#Action_buttons_in_tables
Created attachment 61655 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Created attachment 61661 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch>
Aleisha, Take a look at orderreceive.tt, it also uses additem.js when AcqCreateItem = "on receiving".
(In reply to Jonathan Druart from comment #20) > Aleisha, > Take a look at orderreceive.tt, it also uses additem.js when AcqCreateItem = > "on receiving". Sorry Jonathan, can you explain the relevance to this patch? Been a while since I looked at this but I don't think that is within the scope of my bug.
You are modifying a js file that is used from different templates. You will introduced side-effects with these changes (when receiving an item if AcqCreateItem = "on receiving").
Created attachment 75641 [details] [review] Bug 16939: (follow-up) Correction for orderreceive.tt This patch makes a change to orderreceive.tt which corresponds to the changes made in the previous patch. To test, apply the patch and set the AcqCreateItem system preference to "receiving an order." - Go to Acquisitions -> Vendor -> Receive shipment. - Submit the "Receive a new shipment" form. - Click "Receive" for an order line. - Fill out the item form and click "Add item." - The table of existing items should display correctly, with a single "Actions" column containing an "Edit" and "Delete" button.
Created attachment 80791 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch>
Created attachment 80792 [details] [review] Bug 16939: (follow-up) Correction for orderreceive.tt This patch makes a change to orderreceive.tt which corresponds to the changes made in the previous patch. To test, apply the patch and set the AcqCreateItem system preference to "receiving an order." - Go to Acquisitions -> Vendor -> Receive shipment. - Submit the "Receive a new shipment" form. - Click "Receive" for an order line. - Fill out the item form and click "Add item." - The table of existing items should display correctly, with a single "Actions" column containing an "Edit" and "Delete" button.
This has now been rebased but note, it fails with ElasticSearch enabled
Does it fail with Elasitc with and without this patch?
The QA tool fails acqui/z3950_search.tt: parse error - /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt line 124: unexpected end of directive [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
Created attachment 80999 [details] [review] Bug 16939: (follow-up) Adding missing bracket
(In reply to Katrin Fischer from comment #27) > Does it fail with Elasitc with and without this patch? This is a good point. I've retested and can confirm that we cannot add to a basket with elasticsearch enabled, with or without the patch.
(In reply to Owen Leonard from comment #28) > The QA tool fails acqui/z3950_search.tt: parse error - > /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ > z3950_search.tt line 124: unexpected end of directive > [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] Fixed, ready to test
(In reply to Aleisha Amohia from comment #30) > (In reply to Katrin Fischer from comment #27) > > Does it fail with Elasitc with and without this patch? > > This is a good point. I've retested and can confirm that we cannot add to a > basket with elasticsearch enabled, with or without the patch. Hi Aleisha, could you maybe file a bug with your findings? This seems major.
(In reply to Katrin Fischer from comment #32) > (In reply to Aleisha Amohia from comment #30) > > (In reply to Katrin Fischer from comment #27) > > > Does it fail with Elasitc with and without this patch? > > > > This is a good point. I've retested and can confirm that we cannot add to a > > basket with elasticsearch enabled, with or without the patch. > > Hi Aleisha, could you maybe file a bug with your findings? This seems major. Done - see Bug 21675. Would like to see this one get through anyhow.
Created attachment 82986 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 82987 [details] [review] Bug 16939: (follow-up) Correction for orderreceive.tt This patch makes a change to orderreceive.tt which corresponds to the changes made in the previous patch. To test, apply the patch and set the AcqCreateItem system preference to "receiving an order." - Go to Acquisitions -> Vendor -> Receive shipment. - Submit the "Receive a new shipment" form. - Click "Receive" for an order line. - Fill out the item form and click "Add item." - The table of existing items should display correctly, with a single "Actions" column containing an "Edit" and "Delete" button. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 82988 [details] [review] Bug 16939: (follow-up) Adding missing bracket Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 83133 [details] [review] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 83134 [details] [review] Bug 16939: (follow-up) Correction for orderreceive.tt This patch makes a change to orderreceive.tt which corresponds to the changes made in the previous patch. To test, apply the patch and set the AcqCreateItem system preference to "receiving an order." - Go to Acquisitions -> Vendor -> Receive shipment. - Submit the "Receive a new shipment" form. - Click "Receive" for an order line. - Fill out the item form and click "Add item." - The table of existing items should display correctly, with a single "Actions" column containing an "Edit" and "Delete" button. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 83135 [details] [review] Bug 16939: (follow-up) Adding missing bracket Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Please rebase, thanks
(In reply to Nick Clemens from comment #40) > Please rebase, thanks This applies cleanly for me? Where does it need rebasing?
I must have hit the wrong bug number, apologies
Awesome work all! Pushed to master for 19.05
Enhancement, will not be backported.