|
Description
Barton Chittenden
2018-08-06 22:40:52 UTC
Created attachment 77518 [details]
Screenshot from Home › Patrons › Account
Created attachment 77596 [details] [review] Bug 21167: Fix price formatting on printed fee invoice and receipt The prices were not formatted correctly on the printed receipts for fines and payments in the patron account. This patch introduces the use of the Price TT plugin to those templates. Also: - Fixes a few capitalization errors - Removes spaces in front of : - Updates accounttype-to-description list to the one used in other templats as a lot of values were missing (Credit etc.) To test: - Create several fines, use some .00 and some with other values - Pay some fines - Create a manual credit - Use print button for all of those (credit, fee, payment) - Verify that: - prices ending in .00 are displayed without the decimal part - instead of Credit only C is shown in the description - Apply patch - Print invoices and receipts again - Verify that: - prices are now formatted according to CurrencyFormat system preference, decimal part always included - verify that correct description for Credit is shown Unable to duplicate the issue in Biblibre Sandbox 7 (see attachment). Created attachment 78209 [details] Bug 21167 Unable to duplicate. Perhaps not printing correct invoice/ receipt? Hi Cab, you printed the account summary. Try the printing links next to payments and created fees/fines fees in the fines table. Let me know if I should be changing status (Patch doesn't apply? Failed QA?) Tested in PTFS Sandbox 0. Biblibre sandboxes are failing silently :-( <h1>Something went wrong !</h1>Applying: Bug 21167: Fix price formatting on printed fee invoice and receipt error: Failed to merge in the changes. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt Patch failed at 0001 Bug 21167: Fix price formatting on printed fee invoice and receipt The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 21167 - Correct price formatting on printed fee receipt and invoice 77596 - Bug 21167: Fix price formatting on printed fee invoice and receipt Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-21167-Fix-price-formatting-on-printed-fee-invo-0XLKVz.patch . Please rebase on master. M koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt Thanks Mike Created attachment 78919 [details] [review] Bug 21167: Fix price formatting on printed fee invoice and receipt The prices were not formatted correctly on the printed receipts for fines and payments in the patron account. This patch introduces the use of the Price TT plugin to those templates. Also: - Fixes a few capitalization errors - Removes spaces in front of : - Updates accounttype-to-description list to the one used in other templats as a lot of values were missing (Credit etc.) To test: - Create several fines, use some .00 and some with other values - Pay some fines - Create a manual credit - Use print button for all of those (credit, fee, payment) - Verify that: - prices ending in .00 are displayed without the decimal part - instead of Credit only C is shown in the description - Apply patch - Print invoices and receipts again - Verify that: - prices are now formatted according to CurrencyFormat system preference, decimal part always included - verify that correct description for Credit is shown Rebased and back to needs sign-off! Hi Katrin, I've just etst this bug anh here some questions. If I print one paylemt line values are with correct format except Amount, this value are without decimal part like .00 https://prnt.sc/kuyham If decimal isn't .00 but for example 0.25, all values are formated well http://prntscr.com/kuyhsc Desriptions of charge are correct at Credit type except "Print Summary" http://prntscr.com/kuyi4x Meybe we can fix these details befere Singned-pff. What do You think? Thank You Mike Created attachment 79020 [details] [review] Bug 21167: Fix price formatting on printed fee invoice and receipt The prices were not formatted correctly on the printed receipts for fines and payments in the patron account. This patch introduces the use of the Price TT plugin to those templates. Also: - Fixes a few capitalization errors - Removes spaces in front of : - Updates accounttype-to-description list to the one used in other templats as a lot of values were missing (Credit etc.) To test: - Create several fines, use some .00 and some with other values - Pay some fines - Create a manual credit - Use print button for all of those (credit, fee, payment) - Verify that: - prices ending in .00 are displayed without the decimal part - instead of Credit only C is shown in the description - Apply patch - Print invoices and receipts again - Verify that: - prices are now formatted according to CurrencyFormat system preference, decimal part always included - verify that correct description for Credit is shown Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Hi Brandan, thank You for new update. I've two small things: 1. Credit description is missing on Print Summary https://prnt.sc/kvamze 2. No decimals with zero like .00 if I print one payment http://prntscr.com/kvanzm Just one small step ... :-) Thank You Mike Created attachment 79073 [details] [review] Bug 21167: Fix price formatting on printed fee invoice and receipt The prices were not formatted correctly on the printed receipts for fines and payments in the patron account. This patch introduces the use of the Price TT plugin to those templates. Also: - Fixes a few capitalization errors - Removes spaces in front of : - Updates accounttype-to-description list to the one used in other templats as a lot of values were missing (Credit etc.) To test: - Create several fines, use some .00 and some with other values - Pay some fines - Create a manual credit - Use print button for all of those (credit, fee, payment) - Verify that: - prices ending in .00 are displayed without the decimal part - instead of Credit only C is shown in the description - Apply patch - Print invoices and receipts again - Verify that: - prices are now formatted according to CurrencyFormat system preference, decimal part always included - verify that correct description for Credit is shown Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Created attachment 79074 [details] [review] Bug 21167 (QA follow-up) Fix amount formatting on invoice receipt Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Created attachment 79075 [details] [review] Bug 21167: (QA follow-up) Fix amount formatting on invoice receipt Signed-off-by: Josef Moravec <josef.moravec@gmail.com> (In reply to Michal Denar from comment #12) > 1. Credit description is missing on Print Summary > https://prnt.sc/kvamze This is the same in master, so out of the scope of this report > 2. No decimals with zero like .00 if I print one payment > http://prntscr.com/kvanzm > I fixed this in follow-up Created attachment 79076 [details] [review] Bug 21167: (QA follow-up) Use accounttype.inc for generating account description Switching back to singed of - I would like to somebody from qa team look on my follow-ups.. (In reply to Katrin Fischer from comment #2) > Created attachment 77596 [details] [review] [review] > - Updates accounttype-to-description list to the one used > in other templats as a lot of values were missing (Credit etc.) Feeling lazy to check right now but, are you sure it is needed? IIRC I have already faced that, and the template is not used in the missing cases. Created attachment 79513 [details] [review] Bug 21167: Fix price formatting on printed fee invoice and receipt The prices were not formatted correctly on the printed receipts for fines and payments in the patron account. This patch introduces the use of the Price TT plugin to those templates. Also: - Fixes a few capitalization errors - Removes spaces in front of : - Updates accounttype-to-description list to the one used in other templats as a lot of values were missing (Credit etc.) To test: - Create several fines, use some .00 and some with other values - Pay some fines - Create a manual credit - Use print button for all of those (credit, fee, payment) - Verify that: - prices ending in .00 are displayed without the decimal part - instead of Credit only C is shown in the description - Apply patch - Print invoices and receipts again - Verify that: - prices are now formatted according to CurrencyFormat system preference, decimal part always included - verify that correct description for Credit is shown Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 79514 [details] [review] Bug 21167: (QA follow-up) Fix amount formatting on invoice receipt Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 79515 [details] [review] Bug 21167: (QA follow-up) Use accounttype.inc for generating account description Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> The patches here (and their followups) appear to be sound to me. Passing QA Awesome work all! Pushed to master for 18.11 Jenkins is not happy since these changes (xt/find-missing-filters.t). The Price filter is not correctly handled by the tests, we should not need to html escape the result. I will try and provide a global fix on a separate bug report. (In reply to Jonathan Druart from comment #25) > Jenkins is not happy since these changes (xt/find-missing-filters.t). The > Price filter is not correctly handled by the tests, we should not need to > html escape the result. I will try and provide a global fix on a separate > bug report. See bug 21454. Pushed to 18.05.x for 18.05.05 Does not apply easy on 17.11.x. Please provide a rebased patch. |