Description
Katrin Fischer
2015-12-10 09:05:45 UTC
This would still be very helpful in order to be able to react to feedback from the supplier and not send them unwanted claims. It would also be helpful when one is ordering items months in advance of the publication date. For example, if it is July, and you are ordering something that won't be published until October 24, it would be nice to be able to set the delivery time based on the expected publication date. Created attachment 114430 [details] [review] Bug 15348: Add estimated_delivey_date column to aqorders table Created attachment 114583 [details] [review] Bug 15348: WIP Working on pre-filling values Created attachment 114623 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. Work to do: - Make the Late Orders page check the estimated delivery date field - Make the Late Orders export functionality handle this - Edit the estimated delivery date from Late Orders page Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Created attachment 115121 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Created attachment 115122 [details] [review] Bug 15348: Updated schema files Created attachment 115123 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Created attachment 115124 [details] [review] Bug 15348: Updated schema files tested with ptfs-e sandbox, everything fine, sign-off didn't work :-( Created attachment 116517 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmüller@bsz-bw.de> I added Christian's sign-off line. I also had to fix a minor conflict in kohastructure.sql and I have removed the Schema file update as this would no longer apply. We used the "Refresh schema" action from the sandbox to achieve that step. Created attachment 118788 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 118789 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. No regressions found, all appears to work as expected. QA script is happy and tests pass. Passing QA Created attachment 119297 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 119298 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Patches rebased. 1. https://snipboard.io/xZtHsv.jpg MariaDB [koha_kohadev]> select ordernumber, estimated_delivery_date from aqorders; +-------------+-------------------------+ | ordernumber | estimated_delivery_date | +-------------+-------------------------+ | 7 | NULL | | 8 | 2021-04-14 | | 9 | NULL | | 10 | NULL | +-------------+-------------------------+ If I set a "from" date: https://snipboard.io/sGRCWS.jpg I am expecting to see the same 4 orders. 2. There is a JS error on lateorders.pl Uncaught TypeError: f is undefined 3. The CSV export does not work but it's certainly caused by the JS error. 4. Permissions for acqui/moddeliverydate.pl is acquisition => *, shouldn't it be acquisition => order_manage? 5. (not blocker) please keep in mind that new variables must be named in snaked_case, as well as new files. Created attachment 119299 [details] [review] Bug 15348: trivial code simplification I'm stuck on that JS error, and it looks like the internal note and vendor note also no longer open in pop up windows. Any thoughts on the datatables error? (In reply to Aleisha Amohia from comment #22) > I'm stuck on that JS error, and it looks like the internal note and vendor > note also no longer open in pop up windows. Any thoughts on the datatables > error? - <th colspan="6">Total</th> + <th colspan="7">Total</th> Why? You are not adding a new column. Created attachment 120653 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 120654 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Created attachment 120655 [details] [review] Bug 15348: trivial code simplification Created attachment 120656 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions (In reply to Jonathan Druart from comment #19) > 1. > https://snipboard.io/xZtHsv.jpg > > MariaDB [koha_kohadev]> select ordernumber, estimated_delivery_date from > aqorders; > +-------------+-------------------------+ > | ordernumber | estimated_delivery_date | > +-------------+-------------------------+ > | 7 | NULL | > | 8 | 2021-04-14 | > | 9 | NULL | > | 10 | NULL | > +-------------+-------------------------+ > > If I set a "from" date: > https://snipboard.io/sGRCWS.jpg > > I am expecting to see the same 4 orders. Did you fix that, Aleisha? I couldn't reproduce your bug. Is someone else about to reproduce it? I don't know if it's the mentioned bug, but im getting an error on step 5 from the test plan. Error trace Undefined subroutine &CGI::Compile::ROOT::kohadevbox_koha_acqui_addorder_2epl::dt_from_string called at /kohadevbox/koha/acqui/addorder.pl line 318 in (eval) at /kohadevbox/koha/acqui/addorder.pl line 318 315: } 316: ); 317: 318: $orderinfo->{estimated_delivery_date} = $orderinfo->{estimated_delivery_date} ? dt_from_string($orderinfo->{estimated_delivery_date}) : undef; 319: 320: # if we already have $ordernumber, then it's an ordermodif 321: my $order = Koha::Acquisition::Order->new($orderinfo); Hi Aleisha, I tried to have a look at this patch set too, but it currently doesn't apply. I fixed the first conflict, but got stuck at the second. Could you please rebase and have a look at the problem Christian noted in comment#30? Thx! I tried to look at the patch set, but it's a little confusing like that in Bugzilla. Noticed that the first patch has a @hotmail.com address, not sure if that was intentional or if you want to fix. Created attachment 136560 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 136561 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Created attachment 136562 [details] [review] Bug 15348: trivial code simplification Created attachment 136563 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions Have hopefully fixed up the error and fixed the author email address on my two patches. Created attachment 137057 [details] [review] Bug 15348: (follow-up) Fix TT filters from html to uri Created attachment 137058 [details] [review] Bug 15348: (follow-up) Fix export of dt_from_string FAIL acqui/addorder.pl FAIL valid " dt_from_string " is not exported by the Koha::DateUtils module Can't continue after import errors Created attachment 137061 [details] [review] Bug 15348: (QA follow-up) Fix useless use of proviate variable in void context FAIL acqui/moddeliverydate.pl FAIL valid Useless use of private variable in void context Created attachment 137098 [details] [review] Bug 15348: (follow-up) Fix imports in moddeliverydate.pl Created attachment 137099 [details] [review] Bug 15348: (follow-up) Update calendar widget to flatpickr Hi Aleisha, 1) there were several complaints by the QA tools that I have fixed 2 in separate follow-up patches. Could you please fix the third one? I have not been able to figure this one out: FAIL acqui/moddeliverydate.pl FAIL valid Useless use of private variable in void context 2) This bit here is not translatable: var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")"; 3) When adding a new order, there is no calendar widget for the estimated delivery date column. I have tried to do an update to flatpickr in a follow-up, but I think it's not complete yet. I believe these type of lines need to be removed from the files as well: $("#estimated_delivery_date").datepicker(); 4) Looking for 'datepicker' in the code, I saw that there is code for a modal in lateorders.tt, but it doesn't appear to be used, it looks like moddeliverdatey.tt is used instead. A modal like the edit notes one on the same page would really nice and more consistent: <div class="modal-content"> <div class="modal-header"> <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4> </div> <div class="modal-body"> <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="datepicker" value="[% estimated_delivery_date | html %]"/> <div class="hint">[% INCLUDE 'date-format.inc' %]</div> <input type="hidden" id="date_ordernumber" name="ordernumber" value="" /> <input type="hidden" name="op" value="save" /> </div> 5) It's not possible to edit the estimated delivery date from a closed basket. If you reopen and close the basket, the close date will be updated, that is also used as the order date. So we need to be able to update this without reopening. 6) When editing the delivery date from the late orders page, things would explode. I fixed the import statements in a follow-up. Hope I caught them all. Created attachment 137740 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Created attachment 137741 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Created attachment 137742 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Created attachment 137743 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Hi Aleisha, thanks a lot for the follow-ups! The modals look really nice now. Found a small glitch: you cannot empty the estimated delivery date from the modal on the basket summary page once it has been set. When emptying the field using the red X next to the field, the field empties, but today's date will be saved. It's always today's date, independent of the setting for the vendor. I have created 3 orders: 2022-07-30 2022-07-19 NULL - calculated from 10 days in vendor: 2022-07-29 When I search for: - 2022-07-01 - 2022-07-30 - OK, all show - 2022-07-01 - 2022-07-29 - NOT OK, still all three show, but 30 should not - 2022-07-01 - 2022-07-27 - NOT OK, 30t and 19 show, but 29, the calculated one does not I've tried the dd.mm.yyyy and the yyyy-mm-dd Dateformat settings and the behaviour is the same. Can you help? Are moddelivery.tt/.pl fallbacks for no JavaScript? Created attachment 138110 [details] [review] Bug 15348: (follow-up) Fix modal to edit delivery date This allows you to empty the delivery date and ensures the current date shows (In reply to Katrin Fischer from comment #48) > I have created 3 orders: > 2022-07-30 > 2022-07-19 > NULL - calculated from 10 days in vendor: 2022-07-29 > > When I search for: > - 2022-07-01 - 2022-07-30 - OK, all show > - 2022-07-01 - 2022-07-29 - NOT OK, still all three show, but 30 should not > - 2022-07-01 - 2022-07-27 - NOT OK, 30t and 19 show, but 29, the calculated > one does not > > I've tried the dd.mm.yyyy and the yyyy-mm-dd Dateformat settings and the > behaviour is the same. Can you help? > Still working on this > Are moddelivery.tt/.pl fallbacks for no JavaScript? Yes, it matches the behaviour of the internal and vendor notes *** Bug 31273 has been marked as a duplicate of this bug. *** Created attachment 138491 [details] [review] Bug 15348: (follow-up) Fix filtering results on estimated delivery date Adding another clause to the SQL so that the specified estimated delivery date is used for filtering first, and the calculated delivery date is used if there is no specified estimated delivery date. Created attachment 138529 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138530 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138531 [details] [review] Bug 15348: trivial code simplification Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138532 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138533 [details] [review] Bug 15348: (follow-up) Fix TT filters from html to uri Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138534 [details] [review] Bug 15348: (follow-up) Fix export of dt_from_string FAIL acqui/addorder.pl FAIL valid " dt_from_string " is not exported by the Koha::DateUtils module Can't continue after import errors Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138535 [details] [review] Bug 15348: (follow-up) Fix imports in moddeliverydate.pl Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138536 [details] [review] Bug 15348: (follow-up) Update calendar widget to flatpickr Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138537 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138538 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138539 [details] [review] Bug 15348: (follow-up) Fix modal to edit delivery date This allows you to empty the delivery date and ensures the current date shows Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Created attachment 138540 [details] [review] Bug 15348: (follow-up) Fix filtering results on estimated delivery date Adding another clause to the SQL so that the specified estimated delivery date is used for filtering first, and the calculated delivery date is used if there is no specified estimated delivery date. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Changing status to reflect signoffs from Christian Created attachment 139245 [details] [review] Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings On the basket summary page the estimated delivery date column was moved before the supplier report column, that is only visible when EDIFACT has been activated. It also adds the new column to the table configuration. Created attachment 139274 [details] [review] Bug 15348: (follow-up) Fix sorting of estimated delivery date on basket summary page Also removes some unneded variables from the table footers that are used to display amount totals. Created attachment 139301 [details] [review] Bug 15348: (follow-up) Fix pre-selected date when editing from late orders page When editing the estimated delivery date from the late orders page, with multiple late orders, the selected date in the edit form would always be the same, not matching the edited date. With this page, the edited date will match what is shown in the form. Handing over to Martin for final QA. Created attachment 139329 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139330 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139331 [details] [review] Bug 15348: trivial code simplification Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139332 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139333 [details] [review] Bug 15348: (follow-up) Fix TT filters from html to uri Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139334 [details] [review] Bug 15348: (follow-up) Fix export of dt_from_string FAIL acqui/addorder.pl FAIL valid " dt_from_string " is not exported by the Koha::DateUtils module Can't continue after import errors Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139335 [details] [review] Bug 15348: (follow-up) Fix imports in moddeliverydate.pl Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139336 [details] [review] Bug 15348: (follow-up) Update calendar widget to flatpickr Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139337 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139338 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139339 [details] [review] Bug 15348: (follow-up) Fix modal to edit delivery date This allows you to empty the delivery date and ensures the current date shows Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139340 [details] [review] Bug 15348: (follow-up) Fix filtering results on estimated delivery date Adding another clause to the SQL so that the specified estimated delivery date is used for filtering first, and the calculated delivery date is used if there is no specified estimated delivery date. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139341 [details] [review] Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings On the basket summary page the estimated delivery date column was moved before the supplier report column, that is only visible when EDIFACT has been activated. It also adds the new column to the table configuration. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139342 [details] [review] Bug 15348: (follow-up) Fix sorting of estimated delivery date on basket summary page Also removes some unneded variables from the table footers that are used to display amount totals. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139343 [details] [review] Bug 15348: (follow-up) Fix pre-selected date when editing from late orders page When editing the estimated delivery date from the late orders page, with multiple late orders, the selected date in the edit form would always be the same, not matching the edited date. With this page, the edited date will match what is shown in the form. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 139351 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139352 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139353 [details] [review] Bug 15348: trivial code simplification Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139354 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139355 [details] [review] Bug 15348: (follow-up) Fix TT filters from html to uri Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139356 [details] [review] Bug 15348: (follow-up) Fix export of dt_from_string FAIL acqui/addorder.pl FAIL valid " dt_from_string " is not exported by the Koha::DateUtils module Can't continue after import errors Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139357 [details] [review] Bug 15348: (follow-up) Fix imports in moddeliverydate.pl Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139358 [details] [review] Bug 15348: (follow-up) Update calendar widget to flatpickr Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139359 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139360 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139361 [details] [review] Bug 15348: (follow-up) Fix modal to edit delivery date This allows you to empty the delivery date and ensures the current date shows Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139362 [details] [review] Bug 15348: (follow-up) Fix filtering results on estimated delivery date Adding another clause to the SQL so that the specified estimated delivery date is used for filtering first, and the calculated delivery date is used if there is no specified estimated delivery date. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139363 [details] [review] Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings On the basket summary page the estimated delivery date column was moved before the supplier report column, that is only visible when EDIFACT has been activated. It also adds the new column to the table configuration. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139364 [details] [review] Bug 15348: (follow-up) Fix sorting of estimated delivery date on basket summary page Also removes some unneded variables from the table footers that are used to display amount totals. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139365 [details] [review] Bug 15348: (follow-up) Fix pre-selected date when editing from late orders page When editing the estimated delivery date from the late orders page, with multiple late orders, the selected date in the edit form would always be the same, not matching the edited date. With this page, the edited date will match what is shown in the form. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> The code works and there are no obvious regressions.. QA scripts are also happy.. I don't really understand why we introduce a new controller here where an API would have made more sense.. code only appears to have been submitted in 2020 and the API was already starting to get a lot more use. Passing QA however.. it just means more work for someone down the line to update it to use API's. Happy to coach on converting to API later btw.. it would be good to get more devs up to speed on it.. I'm under no illusions there are certainly rough edges still ;P (In reply to Martin Renvoize from comment #101) > Happy to coach on converting to API later btw.. it would be good to get more > devs up to speed on it.. I'm under no illusions there are certainly rough > edges still ;P Planning to 'harass' you guys for helping me sort the API related pages in the wiki once the update has happened, we have a lot of pages but I have no idea which information is actually current. Hi, please rebase. Bug 29955 made a small change that makes the first patch fail to apply. Created attachment 139831 [details] [review] Bug 15348: Add estimated delivery date field to individual orders This patch allows you to specify an estimated delivery date per order. The specified estimated delivery date is also considered when searching for late orders and exporting late orders. You can also edit the estimated delivery date from the late orders page. Test plan: 1. Update database, rebuild schema, restart services 2. Go to Acquisitions, search for a vendor, and create a new basket 3. Add an order to the basket. When filling in the accounting details, notice the new 'estimated delivery date' field, but don't add a date. Save the order. 4. Confirm no date shows in the estimated delivery date column in the orders table. 5. Modify the order. Add a date in the estimated delivery date field and save the order. 6. Confirm the date now shows in the orders table. 7. Close the basket. 8. Go to the Late Orders page. 9. Put estimated delivery date from and to parameters in the search filters on the left. Ensure the from and to dates encapsulate the date you entered in the estimated delivery date field for the order. 10. Click Filter and ensure the order shows. 11. Select the checkbox next to the order. Click the Export as CSV button. 12. Open the CSV and confirm the estimated delivery date that you entered shows as expected in the file. 13. Click Edit under the estimated delivery date. Confirm the estimated delivery date modal pops up with the correct order line number in the modal header. 14. Remove the estimated delivery date and click Save. 15. Confirm that the estimated delivery date calculated by Koha now shows in the late orders table. 16. Select the checkbox next to the order. Click the Export as CSV button. 17. Open the CSV and confirm the calculated estimated delivery date shows in the CSV. 18. Confirm tests pass: t/db_dependent/Koha/Acquisition/Order.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139832 [details] [review] Bug 15348: (QA follow-up) Remove superflous filters The QA script highlighted the addition of some unneeded extra TT filters. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139833 [details] [review] Bug 15348: trivial code simplification Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139834 [details] [review] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139835 [details] [review] Bug 15348: (follow-up) Fix TT filters from html to uri Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139836 [details] [review] Bug 15348: (follow-up) Fix export of dt_from_string FAIL acqui/addorder.pl FAIL valid " dt_from_string " is not exported by the Koha::DateUtils module Can't continue after import errors Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139837 [details] [review] Bug 15348: (follow-up) Fix imports in moddeliverydate.pl Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139838 [details] [review] Bug 15348: (follow-up) Update calendar widget to flatpickr Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139839 [details] [review] Bug 15348: (follow-up) Fix calendar widget, translateability, etc Also add functionality to edit the estimated delivery date from a closed basket. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139840 [details] [review] Bug 15348: DBIC changes DO NOT PUSH For testing purposes Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139841 [details] [review] Bug 15348: (follow-up) Fix modal to edit delivery date This allows you to empty the delivery date and ensures the current date shows Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139842 [details] [review] Bug 15348: (follow-up) Fix filtering results on estimated delivery date Adding another clause to the SQL so that the specified estimated delivery date is used for filtering first, and the calculated delivery date is used if there is no specified estimated delivery date. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139843 [details] [review] Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings On the basket summary page the estimated delivery date column was moved before the supplier report column, that is only visible when EDIFACT has been activated. It also adds the new column to the table configuration. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139844 [details] [review] Bug 15348: (follow-up) Fix sorting of estimated delivery date on basket summary page Also removes some unneded variables from the table footers that are used to display amount totals. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139845 [details] [review] Bug 15348: (follow-up) Fix pre-selected date when editing from late orders page When editing the estimated delivery date from the late orders page, with multiple late orders, the selected date in the edit form would always be the same, not matching the edited date. With this page, the edited date will match what is shown in the form. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Rebased, tests pass and retested functionality on addorder.pl Created attachment 140708 [details] [review] Bug 15348: (QA follow-up) DB update fixes Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Pushed to master for 22.11. Nice work everyone, thanks! Created attachment 140735 [details] [review] Bug 15348: Add estimated_delivery_date to object spec Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Enchancement will not be backported to 22.05.x series This does not work. Because of bug 30718 you don't need the KohaDates filter on the flatpickr's input. The commit "Fix calendar widget" is actually messing with the date. The bug I found appears when you edit an order. (In reply to Jonathan Druart from comment #124) > This does not work. > > Because of bug 30718 you don't need the KohaDates filter on the flatpickr's > input. > The commit "Fix calendar widget" is actually messing with the date. > > The bug I found appears when you edit an order. I think there was an overlap in development/time gap between this passing and being pushed. Can you explain more what needs to be fixed/what is broken? Created attachment 143896 [details] [review] Bug 15348: (follow-up) Fix filters on input fields With bug 30718 we on longer need the KohaDates TT filter on the inputs. This patch removes them. Created attachment 143900 [details] [review] Bug 15348: Store estimated delivery date when adding an order When the estimated delivery date was entered on adding or modifying and order, it was not saved to the database. To test: * Add new order, fill in estimated delivery date * Save * Verify the estimated delivery date is empty * Modify order line, date will also not be saved * Apply patch * The date should now save and update correctly I believe the first fix is what Joubu asked for and the second is something I found while testing. I have a remaining issue: when clicking on 'edit' from basket, the date in the modal is no longer pre-set with the stored date. This might also appear in other spots where the modal is used (late orders). Created attachment 143903 [details] [review] Bug 15348: (follow-up) Fix modals to pre-set input with stored date Makes sure that when an estimated delivery day is edited using the modals on the basket summary or late order pages, the date input is pre-set to the stored estimated delivery date. To test: * Create some order lines with and without estimated delivery date set * Make sure that on the basket summary the edit link comes up with an empty modal * Close the basket * Check that on late orders the dates are pre-filled incorrectly as well * Apply patch * Refresh basket summary and late order pages * All edit links now should bring up the modal with the correct date filled in Thanks Owen for the hints and explanations! Created attachment 143904 [details] [review] Bug 15348: (follow-up) Fix modals to pre-set input with stored date Makes sure that when an estimated delivery day is edited using the modals on the basket summary or late order pages, the date input is pre-set to the stored estimated delivery date. To test: * Create some order lines with and without estimated delivery date set * Make sure that on the basket summary the edit link comes up with an empty modal * Close the basket * Check that on late orders the dates are pre-filled incorrectly as well * Apply patch * Refresh basket summary and late order pages * All edit links now should bring up the modal with the correct date filled in Hi Tomas, did you miss these? Last 3 commits haven't been pushed yet. Follow-ups have been pushed now. Should this be needs documenting? (In reply to Katrin Fischer from comment #135) > Should this be needs documenting? I don,t think so. I already submitted something to the manual for this last week. I left it "Pushed to master" because to me, that means release maintainers haven't decided to backport it or not. If they have decided not to backport it, it can be set to resolved. |