The SIP payment types have leaked as payment types into the refund modal.. this is a mistake.
Created attachment 117354 [details] [review] Bug 27796: Centralise payment/transaction type handling
Work in progress.. not yet ready for testing.
Created attachment 117368 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund vis point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
This patch refines the work started in bug 24525 to centralise code to reduce maintanence.
Created attachment 117369 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund vis point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
Created attachment 117370 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund vis point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
After applying the patch, I get the following error when trying to load pos/pay.pl or boraccount.pl: Template process failed: file error - transaction_types.inc: not found at /kohadevbox/koha/C4/Templates.pm line 122
Created attachment 117784 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund vis point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
(In reply to Sally from comment #7) > After applying the patch, I get the following error when trying to load > pos/pay.pl or boraccount.pl: > > Template process failed: file error - transaction_types.inc: not found at > /kohadevbox/koha/C4/Templates.pm line 122 Ooops, seems I missed the file when constructing the patch.. I've uploaded a fresh one with the missing file included now.
> 1a) Refund modal on the borrower account page (The 'Account credit' > option should appear here) Account credit is missing at this stage. The rest work as expected.
Created attachment 118145 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund via point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
Created attachment 118146 [details] [review] Bug 27796: (QA follow-up) Fix for missing 'Account credit' Good catch Sally! The data-member attribute was using an incorrect parameter name to fetch the accountline borrowernumber data.
(In reply to Sally from comment #10) > > 1a) Refund modal on the borrower account page (The 'Account credit' > > option should appear here) > > Account credit is missing at this stage. > > The rest work as expected. Great catch there Sally.. fixed in the followup :)
Created attachment 118768 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund via point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff
Created attachment 118769 [details] [review] Bug 27796: (QA follow-up) Fix for missing 'Account credit' Good catch Sally! The data-member attribute was using an incorrect parameter name to fetch the accountline borrowernumber data.
Just a quick rebase.. awaiting testing..
Created attachment 119239 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund via point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 119240 [details] [review] Bug 27796: (QA follow-up) Fix for missing 'Account credit' Good catch Sally! The data-member attribute was using an incorrect parameter name to fetch the accountline borrowernumber data. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 119678 [details] [review] Bug 27796: Centralise payment/transaction type handling This patch centralises the payment/transaction type select options handling so the SIP types are properly in all cases. Test plan 1) Check that SIP payment types are properly hidden on the following modals. 1a) Refund modal on the borrower account page (The 'Account credit' option should appear here) 1b) Payout modal on borrower account page 1c) Payment via paycollect 1d) Payment via point of sale 1e) Refund via point of sale, register details page (The 'Account credit' option should only appear for debts associated to a patron and not for payments accepted via point of sale) 2) Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 119679 [details] [review] Bug 27796: (QA follow-up) Fix for missing 'Account credit' Good catch Sally! The data-member attribute was using an incorrect parameter name to fetch the accountline borrowernumber data. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 119680 [details] [review] Bug 27796: (QA follow-up) Missing filters Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Pushed to master for 21.05, thanks to everybody involved!
Pushed to 20.11.x for 20.11.05
Doesn't apply cleanly to 20.05, please rebase for backport