Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

add review and print button for cashier screen #1056

Merged
merged 10 commits into from
Jul 6, 2017

Conversation

baoqchau
Copy link
Contributor

@baoqchau baoqchau commented Apr 17, 2017

Fixes #303 .

Changes proposed in this pull request:

  • add "Review" button for cashier to review invoices
  • add "Print" button for cashier to print invoices
    screenshot_20170416_181910

However, I still need to refactor the code because the code for cashier route is kind of the same like index route except for the button.
Updated: I have refactored the code for print invoice.
cc @HospitalRun/core-maintainers

@baoqchau
Copy link
Contributor Author

@jkleinsc What I would like to do is that we will change the Invoice subnav into Cashier Screen if the user roles is cashier and Invoice if the role is different. Also, the buttons will also be added based on the user roles. In this way, it will look cleaner for the cashier.

@jkleinsc
Copy link
Member

@baoqchau that sounds good to me. I would change the label to Cashier instead of Cashier Screen. You also can extend the invoice controller/route for use in the cashier controller/route if the code is pretty similar, eg:

import InvoiceRoute from 'hospitalrun/invoices/route';
export default InvoiceRoute.extend({
...
});

@baoqchau
Copy link
Contributor Author

baoqchau commented Apr 22, 2017

After modifying, this is the invoices/index for admin roles.
screenshot_20170422_161853
And this is the screen for the cashier roles.
screenshot_20170422_161825
I think that we don't need to change the title to "Cashier" because when we click each type of Invoices, the title will change with it. In addition, I have 2 questions about the requirements for the cashier screen:
1/ Should the cashier allow to edit invoices? If not, we should make the bill unclickable.
2/ Should the cashier allow to add new invoices? If not, we should hide the button + new invoice

@tangollama
Copy link
Member

Thanks @baoqchau. We'll review this week and (hopefully) get this merged into master.

@baoqchau
Copy link
Contributor Author

baoqchau commented May 1, 2017

@tangollama @jkleinsc Is there anything I can do to help with this travis CI build failure? Looks like the error came from the container using to build the CI.

Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@baoqchau Travis tests are now passing with latest from master merged in. Can you remove the console.log statements you added.

@baoqchau
Copy link
Contributor Author

@jkleinsc done. Is there anything else you want me to change?

@tangollama
Copy link
Member

@baoqchau I'm going to update this with the latest and (assuming all the tests pass, which they should), I'll merge this today. Thanks for your patience.

@baoqchau
Copy link
Contributor Author

baoqchau commented Jul 6, 2017

@tangollama any updates on this yet? Just want to check up.

@jkleinsc
Copy link
Member

jkleinsc commented Jul 6, 2017

Looks good to me @baoqchau. We will merge it in.

@jkleinsc jkleinsc merged commit a218e53 into HospitalRun:master Jul 6, 2017
@baoqchau baoqchau deleted the cashier-screen branch July 6, 2017 15:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants