This repository has been archived by the owner on Jan 9, 2023. It is now read-only.
Pricing types #1526
Merged
Pricing types #1526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge master from upstream
|
One other thing, you can see that I removed the reference to 'imaging_pricing_types' from the imaging/route.js' additionalModels array. But I couldn't do the same thing for labs/route.js. That's because in labs/route.js, there was only that one element in additionalModels and I found that removing it causes a problem. Basically, querying for the additionalModels in abstract-module-route's model(), even if it returns nothing, has some effect of initializing relational-pouch and if you don't do it, the code in abstract-index-route's model() will fail. I will create a new issue for that though. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1444
#877
aa09e64
#1139
Based on the previous changes and discussion above, the intention was to remove user's ability to set Pricing Type for Pricing models with Category == 'Lab' or Category == 'Imaging' and instead lock them to default value of 'Lab Procedure' or 'Imaging Procedure'. But, the lookup lists for these weren't fully removed which has confused users and the pricing/edit controller had a bug which meant the Pricing Type would sometimes be set to blank instead of the appropriate default value, and this caused that Pricing model to become unusable due to the Lab and Imaging Request pages filtering out anything that didn't match the default 'Lab Procedure' or 'Imaging Procedure'.
In this PR, I removed the lookup lists and fixed the pricing/edit controller behavior. I also removed unused code related to the old behavior (with the lookup lists). Also removed the labs/charge and imaging/charge routes entirely as they're not used now and I believe they'd need to be re-written if they were to be used. I think they were intended for adding lab or imaging charges from another route via a modal dialog.
Also changed pricing/edit controller so when you have Category set to 'Lab' or 'Imaging', it shows Pricing Type as a static text field set to the appropriate default value instead of just making it disappear as it did before.
I will add some test cases in the next couple days.
cc @HospitalRun/core-maintainers