|
Description
Martin Renvoize (ashimema)
2019-07-16 08:35:46 UTC
Created attachment 91596 [details] [review] Bug 23321: Add cash_registers table Created attachment 91597 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Created attachment 91598 [details] [review] Bug 23321: Add cash register preference Created attachment 91599 [details] [review] Bug 23321: Add cash register permission Created attachment 91600 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Created attachment 91601 [details] [review] Bug 23321: Allow setting of branch default Created attachment 91602 [details] [review] Bug 23321: Add cash register support to paycollect Created attachment 91621 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Created attachment 92057 [details] [review] Bug 23321: Add cash_registers table Created attachment 92058 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Created attachment 92059 [details] [review] Bug 23321: Add cash register preference Created attachment 92060 [details] [review] Bug 23321: Add cash register permission Created attachment 92061 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Created attachment 92062 [details] [review] Bug 23321: Allow setting of branch default Created attachment 92063 [details] [review] Bug 23321: Add cash register support to paycollect Created attachment 92064 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Created attachment 92065 [details] [review] Bug 23321: Koha::Library additions Created attachment 92083 [details] [review] Bug 23321: Add cash_registers table Created attachment 92084 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Created attachment 92085 [details] [review] Bug 23321: Add cash register preference Created attachment 92086 [details] [review] Bug 23321: Add cash register permission Created attachment 92087 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Created attachment 92088 [details] [review] Bug 23321: Allow setting of branch default Created attachment 92089 [details] [review] Bug 23321: Add cash register support to paycollect Created attachment 92090 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Created attachment 92091 [details] [review] Bug 23321: Koha::Library additions Created attachment 92394 [details] [review] Bug 23321: Add cash_registers table Created attachment 92395 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Created attachment 92396 [details] [review] Bug 23321: Koha::Library additions This patch adds the relationship accessor for Cash::Registers to the Koha::Library class and include the relevant tests. Created attachment 92397 [details] [review] Bug 23321: Add cash register preference Created attachment 92398 [details] [review] Bug 23321: Add cash register permission Created attachment 92399 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Test plan: 1) Enable the use of cash registers by setting 'UseCashRegisters' to 'Do' 2) Check that the 'Accounts > Manage cash registers' option now appears in the 'Administration' area. 3) Click through to 'Manage cash registers' and note the message suggesting you add your first register 4) Add you're first cash register 5) Note that the message has now been replaced by a table of cash registers including the one you have added in the previous step. 6) Edit the cash register created in step 4 and note that the table reflects the changes 7) Signoff Created attachment 92400 [details] [review] Bug 23321: Allow setting of branch default This adds the ability to set a cash register as the default selected option when making payments at a particular branch. 1) Note the addition of a 'Make branch default' button in each row of the table under 'Manage cash registers' 2) Click the button and note that the button has changed. 3) Click on an alternative cash register for the same branch and note that the default has been switched to the new register. 4) Click the 'unset' button on the default branch and note that there is no longer a default register for this branch. 5) Signoff Created attachment 92401 [details] [review] Bug 23321: Add cash register support to paycollect This patch ties in the cash registers system to the paycollect payment pages in the staff client. Test plan: 1) Add some manual fees to a test patron 2) Select some fees to pay off 3) Note the addition of a select box for selecting your cash register upon payment. 4) Set a branch default cash register for the current branch 5) Repeat step 3 and note that the pre-selected cash register is the one set in step 4. 6) Unset the branch default cash register for the current branch 7) Repeat step 3 and note that there is no cash register pre-selected 8) Set 'UseCashRegisters' to 'Do not' 9) Repeat step 3 and note that there is no longer an option to select a cash register 10) Signoff Created attachment 92402 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Test plan: 1) Ensure you have 'UseCashRegisters' set to 'Do' 2) Attempt to make a payment for a fee whilst logged into a branch that has not yet had cash registers configured. 3) Note that you are shown a warning and cannot proceed. 4) Signoff Created attachment 92467 [details] [review] Bug 23321: Add cash_registers table Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92468 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92469 [details] [review] Bug 23321: Koha::Library additions This patch adds the relationship accessor for Cash::Registers to the Koha::Library class and include the relevant tests. Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92470 [details] [review] Bug 23321: Add cash register preference Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92471 [details] [review] Bug 23321: Add cash register permission Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92472 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Test plan: 1) Enable the use of cash registers by setting 'UseCashRegisters' to 'Do' 2) Check that the 'Accounts > Manage cash registers' option now appears in the 'Administration' area. 3) Click through to 'Manage cash registers' and note the message suggesting you add your first register 4) Add you're first cash register 5) Note that the message has now been replaced by a table of cash registers including the one you have added in the previous step. 6) Edit the cash register created in step 4 and note that the table reflects the changes 7) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92473 [details] [review] Bug 23321: Allow setting of branch default This adds the ability to set a cash register as the default selected option when making payments at a particular branch. 1) Note the addition of a 'Make branch default' button in each row of the table under 'Manage cash registers' 2) Click the button and note that the button has changed. 3) Click on an alternative cash register for the same branch and note that the default has been switched to the new register. 4) Click the 'unset' button on the default branch and note that there is no longer a default register for this branch. 5) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92474 [details] [review] Bug 23321: Add cash register support to paycollect This patch ties in the cash registers system to the paycollect payment pages in the staff client. Test plan: 1) Add some manual fees to a test patron 2) Select some fees to pay off 3) Note the addition of a select box for selecting your cash register upon payment. 4) Set a branch default cash register for the current branch 5) Repeat step 3 and note that the pre-selected cash register is the one set in step 4. 6) Unset the branch default cash register for the current branch 7) Repeat step 3 and note that there is no cash register pre-selected 8) Set 'UseCashRegisters' to 'Do not' 9) Repeat step 3 and note that there is no longer an option to select a cash register 10) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92475 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Test plan: 1) Ensure you have 'UseCashRegisters' set to 'Do' 2) Attempt to make a payment for a fee whilst logged into a branch that has not yet had cash registers configured. 3) Note that you are shown a warning and cannot proceed. 4) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Followed the test plans and everything work. I resolved a small conflict in one of the patches, moving changes in staff-global.scss to _tables.scss where the styles now reside since Bug 23013. Some comments: - In the cash registers page, I noticed that there seems to be a branch filter but I can't seem to make it work... - I wonder if a link to the page should be added to the admin-menu.inc so it appears in the navigation on the admin pages? Created attachment 92803 [details] [review] Bug 23321: Add cash_registers table Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92804 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92805 [details] [review] Bug 23321: Add cash register preference Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92806 [details] [review] Bug 23321: Add cash register permission Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92807 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Test plan: 1) Enable the use of cash registers by setting 'UseCashRegisters' to 'Do' 2) Check that the 'Accounts > Manage cash registers' option now appears in the 'Administration' area. 3) Click through to 'Manage cash registers' and note the message suggesting you add your first register 4) Add you're first cash register 5) Note that the message has now been replaced by a table of cash registers including the one you have added in the previous step. 6) Edit the cash register created in step 4 and note that the table reflects the changes 7) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92808 [details] [review] Bug 23321: Koha::Library additions This patch adds the relationship accessor for Cash::Registers to the Koha::Library class and include the relevant tests. Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92809 [details] [review] Bug 23321: Allow setting of branch default This adds the ability to set a cash register as the default selected option when making payments at a particular branch. 1) Note the addition of a 'Make branch default' button in each row of the table under 'Manage cash registers' 2) Click the button and note that the button has changed. 3) Click on an alternative cash register for the same branch and note that the default has been switched to the new register. 4) Click the 'unset' button on the default branch and note that there is no longer a default register for this branch. 5) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92810 [details] [review] Bug 23321: Add cash register support to paycollect This patch ties in the cash registers system to the paycollect payment pages in the staff client. Test plan: 1) Add some manual fees to a test patron 2) Select some fees to pay off 3) Note the addition of a select box for selecting your cash register upon payment. 4) Set a branch default cash register for the current branch 5) Repeat step 3 and note that the pre-selected cash register is the one set in step 4. 6) Unset the branch default cash register for the current branch 7) Repeat step 3 and note that there is no cash register pre-selected 8) Set 'UseCashRegisters' to 'Do not' 9) Repeat step 3 and note that there is no longer an option to select a cash register 10) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92811 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Test plan: 1) Ensure you have 'UseCashRegisters' set to 'Do' 2) Attempt to make a payment for a fee whilst logged into a branch that has not yet had cash registers configured. 3) Note that you are shown a warning and cannot proceed. 4) Signoff Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92812 [details] [review] Bug 23321: (follow-up) Add cash register to admin-menu (In reply to Maryse Simard from comment #45) > Followed the test plans and everything work. > > I resolved a small conflict in one of the patches, moving changes in > staff-global.scss to _tables.scss where the styles now reside since Bug > 23013. > > Some comments: > - In the cash registers page, I noticed that there seems to be a branch > filter but I can't seem to make it work... > - I wonder if a link to the page should be added to the admin-menu.inc > so it appears in the navigation on the admin pages? Thankyou for testing Maryse :) Hmm, the cash registers filter is working for me here.. it starts out as not selected by default and then filters out on branch should you use the select box.. perhaps I'm missing something in my setup.. hopefully the QAer may catch it. As for the admin-menu missing, good catch!.. I've added it as a final followup :) Created attachment 92813 [details] [review] Bug 23321: (follow-up) Correction to exception logic This patch reduces the noisy warning of uninitialised variables Created attachment 92814 [details] [review] Bug 23321: (follow-up) Add test for Koha::Account change Created attachment 92829 [details] [review] Bug 23321: (follow-up) Add test for Koha::Account change Created attachment 92879 [details] [review] Bug 23321: Add cash_registers table Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92880 [details] [review] Bug 23321: Add cash register preference Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92881 [details] [review] Bug 23321: Add cash register permission Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92882 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Test plan: 1) Enable the use of cash registers by setting 'UseCashRegisters' to 'Do' 2) Check that the 'Accounts > Manage cash registers' option now appears in the 'Administration' area. 3) Click through to 'Manage cash registers' and note the message suggesting you add your first register 4) Add you're first cash register 5) Note that the message has now been replaced by a table of cash registers including the one you have added in the previous step. 6) Edit the cash register created in step 4 and note that the table reflects the changes 7) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92883 [details] [review] Bug 23321: Koha::Library additions This patch adds the relationship accessor for Cash::Registers to the Koha::Library class and include the relevant tests. Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92884 [details] [review] Bug 23321: Allow setting of branch default This adds the ability to set a cash register as the default selected option when making payments at a particular branch. 1) Note the addition of a 'Make branch default' button in each row of the table under 'Manage cash registers' 2) Click the button and note that the button has changed. 3) Click on an alternative cash register for the same branch and note that the default has been switched to the new register. 4) Click the 'unset' button on the default branch and note that there is no longer a default register for this branch. 5) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92885 [details] [review] Bug 23321: Add cash register support to paycollect This patch ties in the cash registers system to the paycollect payment pages in the staff client. Test plan: 1) Add some manual fees to a test patron 2) Select some fees to pay off 3) Note the addition of a select box for selecting your cash register upon payment. 4) Set a branch default cash register for the current branch 5) Repeat step 3 and note that the pre-selected cash register is the one set in step 4. 6) Unset the branch default cash register for the current branch 7) Repeat step 3 and note that there is no cash register pre-selected 8) Set 'UseCashRegisters' to 'Do not' 9) Repeat step 3 and note that there is no longer an option to select a cash register 10) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92886 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Test plan: 1) Ensure you have 'UseCashRegisters' set to 'Do' 2) Attempt to make a payment for a fee whilst logged into a branch that has not yet had cash registers configured. 3) Note that you are shown a warning and cannot proceed. 4) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Created attachment 92887 [details] [review] Bug 23321: (follow-up) Add cash register to admin-menu Sponsored-by: PTFS Europe Created attachment 92888 [details] [review] Bug 23321: (follow-up) Correction to exception logic This patch reduces the noisy warning of uninitialised variables Sponsored-by: PTFS Europe Created attachment 92889 [details] [review] Bug 23321: (follow-up) Add test for Koha::Account change Sponsored-by: PTFS Europe Created attachment 93019 [details] [review] Bug 23321: [DO NOT PUSH] DBIC Classes Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93020 [details] [review] Bug 23321: Add cash_registers table Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93021 [details] [review] Bug 23321: Add cash register preference Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93022 [details] [review] Bug 23321: Add cash register permission Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93023 [details] [review] Bug 23321: Add cash register management Add in administrative interfaces to allow the management of cash registers. Test plan: 1) Enable the use of cash registers by setting 'UseCashRegisters' to 'Do' 2) Check that the 'Accounts > Manage cash registers' option now appears in the 'Administration' area. 3) Click through to 'Manage cash registers' and note the message suggesting you add your first register 4) Add you're first cash register 5) Note that the message has now been replaced by a table of cash registers including the one you have added in the previous step. 6) Edit the cash register created in step 4 and note that the table reflects the changes 7) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93024 [details] [review] Bug 23321: Koha::Library additions This patch adds the relationship accessor for Cash::Registers to the Koha::Library class and include the relevant tests. Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93025 [details] [review] Bug 23321: Allow setting of branch default This adds the ability to set a cash register as the default selected option when making payments at a particular branch. 1) Note the addition of a 'Make branch default' button in each row of the table under 'Manage cash registers' 2) Click the button and note that the button has changed. 3) Click on an alternative cash register for the same branch and note that the default has been switched to the new register. 4) Click the 'unset' button on the default branch and note that there is no longer a default register for this branch. 5) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93026 [details] [review] Bug 23321: Add cash register support to paycollect This patch ties in the cash registers system to the paycollect payment pages in the staff client. Test plan: 1) Add some manual fees to a test patron 2) Select some fees to pay off 3) Note the addition of a select box for selecting your cash register upon payment. 4) Set a branch default cash register for the current branch 5) Repeat step 3 and note that the pre-selected cash register is the one set in step 4. 6) Unset the branch default cash register for the current branch 7) Repeat step 3 and note that there is no cash register pre-selected 8) Set 'UseCashRegisters' to 'Do not' 9) Repeat step 3 and note that there is no longer an option to select a cash register 10) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93027 [details] [review] Bug 23321: (follow-up) Require cash registers for payments This follow-up catches the case where no cash registers have been defined for the current branch and as such payments cannot be processed. Test plan: 1) Ensure you have 'UseCashRegisters' set to 'Do' 2) Attempt to make a payment for a fee whilst logged into a branch that has not yet had cash registers configured. 3) Note that you are shown a warning and cannot proceed. 4) Signoff Sponsored-by: PTFS Europe Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93028 [details] [review] Bug 23321: (follow-up) Add cash register to admin-menu Sponsored-by: PTFS Europe Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93029 [details] [review] Bug 23321: (follow-up) Correction to exception logic This patch reduces the noisy warning of uninitialised variables Sponsored-by: PTFS Europe Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93030 [details] [review] Bug 23321: (follow-up) Add test for Koha::Account change Sponsored-by: PTFS Europe Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93031 [details] [review] Bug 23321: (QA follow-up) Make atomic update idempotent Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93032 [details] [review] Bug 23321: (QA follow-up) Booleans Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93033 [details] [review] Bug 23321: (QA follow-up) Add missing TT filters Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93034 [details] [review] Bug 23321: Add Koha::Object(s) info to the schema Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Created attachment 93035 [details] [review] Bug 23321: (QA follow-up) Accounts vs. Accounting The UI uses 'Accounting' in several places (patron details tab, admin page section name, breadcrumbs, etc). Use the same name on the sysprefs. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Not much to say. Great job! It feels like some actions on the cash registers table should've been done through AJAX requests to avoid refreshing, but works for now. Things I found were all minor. The feature works as expected. Cheers! Thanks for the QA and follow-ups Tomas, much appreciated. Totally agree that it would be great to use AJAX for at least some of the actions, but at this point, I was aiming for pragmatic coding to 'get it done' and concentrating mostly on the backend implementation. I hope to switch back around to the UI again sometime soon and add API routes and correspondingly AJAXifying the UI :) Nice work! Pushed to master for 19.11.00 Created attachment 93188 [details] [review] Bug 23321: (RM follow-up) Accounts vs. Accounting The QA follow-up converting 'Accounts' to 'Accounting' missed some cases and ended up breaking the perferences screen. This follow-up corrects that. |