Created attachment 48350 [details] [review] Bug 15905 - Update unit tests
Created attachment 48351 [details] [review] Bug 15905 - Remove use of makepayment Test Plan: 1) Apply these patches 2) prove t/db_dependent/Accounts.t 3) 'git grep makepayment' should return no results
fatal: sha1 information is lacking or useless (t/db_dependent/Accounts.t).
(In reply to Aleisha Amohia from comment #3) > fatal: sha1 information is lacking or useless (t/db_dependent/Accounts.t). Confirmed. 15895 (3 way merge okay), 15896, 15906, and 15907 all apply.
(In reply to M. Tompsett from comment #4) > (In reply to Aleisha Amohia from comment #3) > > fatal: sha1 information is lacking or useless (t/db_dependent/Accounts.t). > > Confirmed. 15895 (3 way merge okay), 15896, 15906, and 15907 all apply. It's possible I've missed a dependency. Please check out this dependency graph: https://bugs.koha-community.org/bugzilla3/showdependencygraph.cgi?id=15894 Ideally, if we could get signoffs on the patches from top to bottom everything should work itself out. Just for posterity, the order in which I wrote the patches is as follows: 15895 15896 15897 15898 15900 15901 15902 15903 15899 15906 15907 15905 15908 15909 I could simplify the dependency graph my making simply a straight line, but that would prevent any parallel testing that could be occurring. From a practical standpoint, if you test the patches in this order everything should apply cleanly.
I've pushed out a github branch with this entire patch set applied for ease of testing: https://github.com/bywatersolutions/bywater-koha-devel/tree/bug_15894_-_Unify_all_account_fine_payment_functions
Created attachment 52136 [details] [review] Bug 15905 - Update unit tests
Created attachment 52150 [details] [review] Bug 15905 - Update unit tests
Created attachment 52151 [details] [review] Bug 15905 - Remove use of makepayment Test Plan: 1) Apply these patches 2) prove t/db_dependent/Accounts.t 3) 'git grep makepayment' should return no results
Created attachment 58821 [details] [review] Bug 15905 - Update unit tests
Created attachment 58822 [details] [review] Bug 15905 - Remove use of makepayment Test Plan: 1) Apply these patches 2) prove t/db_dependent/Accounts.t 3) 'git grep makepayment' should return no results
Created attachment 58831 [details] [review] Bug 15905 - Update unit tests Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 58832 [details] [review] Bug 15905 - Remove use of makepayment Test Plan: 1) Apply these patches 2) prove t/db_dependent/Accounts.t 3) 'git grep makepayment' should return no results Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Bug 15907 hasn't been pushed yet, so had to apply first before testing.
Created attachment 58841 [details] [review] Bug 15905 - Update unit tests Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 58842 [details] [review] Bug 15905 - Remove use of makepayment Test Plan: 1) Apply these patches 2) prove t/db_dependent/Accounts.t 3) 'git grep makepayment' should return no results Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 58843 [details] [review] Bug 15905: Remove one last occurrence of makepayment in comment
Pushed to master for 17.05!
This won't get ported back to 16.11.x as it is an enhancement.