Description
Kyle M Hall (khall)
2019-06-27 16:12:23 UTC
Created attachment 91055 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Patch doesn't apply Applying: Bug 23228: Add option to automatically display payment receipt for printing after making a payment Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M members/paycollect.pl Falling back to patching base and 3-way merge... Auto-merging members/paycollect.pl CONFLICT (content): Merge conflict in members/paycollect.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref error: Failed to merge in the changes. Patch failed at 0001 Bug 23228: Add option to automatically display payment receipt for printing after making a payment Created attachment 91427 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Looks like this needs a re-rebase: +<<<<<<< HEAD $account->pay( +======= Created attachment 91652 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Thanks for the catch Owen! (In reply to Owen Leonard from comment #4) > Looks like this needs a re-rebase: > > +<<<<<<< HEAD > $account->pay( > +======= This doesn't seem to respect the new preference. I'm getting the pop-up whether or not FinePaymentAutoPopup is enabled. Also: The atomicupdate file needed some tweaking to run correctly. Created attachment 91660 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Created attachment 91665 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org> Created attachment 92073 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 92074 [details] [review] Bug 23228: (QA follow-up) Fix the DB update Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 92075 [details] [review] Bug 23228: (QA follow-up) Add required filters Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 92076 [details] [review] Bug 23228: Add option to automatically display payment receipt for printing after making a payment Some libraries would like an auto-popup after making a payment so librarians don't have to navigate to the accounts page, locate the new payment, then click the print button. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Make a payment, note no difference in behavior 4) Enable the new syspref FinePaymentAutoPopup 5) Make a payment, note the popup for the payment receipt Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 92077 [details] [review] Bug 23228: (QA follow-up) Fix the DB update Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 92078 [details] [review] Bug 23228: (QA follow-up) Add required filters Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Rescued and passing QA Nice work! Pushed to master for 19.11.00 Enhancement not pushed to 19.05.x |