-
Notifications
You must be signed in to change notification settings - Fork 313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
O3-2996: Add billing module to openmrs distro pom file and spa config #842
Open
ODORA0
wants to merge
15
commits into
openmrs:main
Choose a base branch
from
ODORA0:alaboso-feat/billing-mvp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
13d4060
O3-2996: Add billing module to openmrs distro pom file and spa config…
25ad670
Merge branch 'openmrs:main' into feat/billing-mvp
alaboso 09982b8
Stockmanagement module version should be 2.0.1-SNAPSHOT - the version…
d64ccbe
Adding metadata (privileges and roles) for stockmanagement to support…
4bfe0f4
Added baseline billing concepts
f0ca173
Cleanup- removed empty space
c53e799
Fix merge conflicts
ODORA0 eb13fb0
Update billing module verison
ODORA0 80301dc
Add baseline billing metadata
ODORA0 23cd3e1
Remove duplicate o3 and patient flag modules
ODORA0 abd483c
Update stockmanagement module
ODORA0 1069357
Change iniz module version to latest snapshot
ODORA0 2dc3b85
Change billing module version to latest snapshot
ODORA0 9ef5aa3
change packager plugin version
ODORA0 b520bab
Merge branch 'main' into alaboso-feat/billing-mvp
ODORA0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Uuid, Void/Retire, Service Name, Short Name, Concept, Service Type, Service Status | ||
44ebd6cd-04ad-4eba-8ce1-0de4564bfd17,, Antenatal care, ANTC, 1592AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Antenatal Services, Enabled | ||
a0f7d8a1-4fa2-418c-aa8a-9b358f43d605,, Orthopedic Service, OTHS, 164949AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Orthopedic Services, Enabled | ||
16435ab4-27c3-4d91-b21e-52819bd654d8,, Nutrition counseling, NUC, 1380AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Nutrition Services, Enabled | ||
360fab13-d92b-4a9f-ad4e-0ac223e7f54c,, OPD consultation, OPDC, 160542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Orthopedic Services, Enabled |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
uuid,Void/Retire,name,description,location | ||
54065383-b4d4-42d2-af4d-d250a1fd2590,, OPD Cash Point, Opd cash point for billing, Opd Clinic | ||
ba685651-ed3b-4e63-9b35-78893060758a,, IPD Cash Point, IPD cash point for billing, Inpatient Ward | ||
1ce1b7d4-c865-4178-82b0-5932e51503d6,, Community Outreach, MCH cash point for billing, Community Outreach |
Binary file added
BIN
+70.2 KB
distro/configuration/ocl/openmrs_Billing_v20230226_autoexpand-20230226.2024-02-21_130824.zip
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
uuid, Void/Retire, name, attributes | ||
526bf278-ba81-4436-b867-c2f6641d060a,, Cash, | ||
2b1b9aae-5d35-43dd-9214-3fd370fd7737,, Bank transfer, | ||
e168c141-f5fd-4eec-bd3e-633bed1c9606,, Paypal, Maximum::Numeric::::True;Minimum |
18 changes: 18 additions & 0 deletions
18
distro/configuration/privileges/privileges_stockmanagement.csv
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
Uuid,Privilege name,Description,_order:1000 | ||
cc9b0e0c-ecaf-479d-9d7c-3071c0c1bff2,App: stockmanagement.dashboard,Able to view stock management application dashboard | ||
ffeb0885-293e-433b-a279-8de6f98026b2,App: stockmanagement.stockItems,Able to view stock items | ||
4a61b6db-03dd-43f2-969c-17dfa66ad41e,Task: stockmanagement.stockItems.mutate,Able to create and update stock items | ||
83871f7a-467e-11ed-8109-00155dcc3fc0,Task: stockmanagement.stockItems.dispense.qty,Able to view stock item quantities at dispensing locations | ||
6292e17d-4694-11ed-8109-00155dcc3fc0,Task: stockmanagement.stockItems.dispense,Able to dispense stock items | ||
a627c62a-efa1-4ac9-88e8-b816facfce0a,App: stockmanagement.userRoleScopes,Able to view stock management user role scope | ||
cc5a7ba4-ee34-4c2f-98c7-ae65cacf0094,Task: stockmanagement.userRoleScopes.mutate,Able to create and update user role scopes | ||
5d0d6f61-2188-11ed-9dff-507b9dea1806,App: stockmanagement.stockoperations,Able to view stock operations | ||
63b8815f-2188-11ed-9dff-507b9dea1806,Task: stockmanagement.stockoperations.mutate,Able to create and update stock operations | ||
7aef02ad-2189-11ed-9dff-507b9dea1806,Task: stockmanagement.stockoperations.approve,Able to aprove stock operations | ||
fd391f90-3335-11ed-a667-507b9dea1806,Task: stockmanagement.stockoperations.receiveitems,Able to receive dispatched stock items | ||
4fec772e-262a-11ed-a544-507b9dea1806,App: stockmanagement.stockSources,Able to view stock sources | ||
557acdab-262a-11ed-a544-507b9dea1806,Task: stockmanagement.stockSources.mutate,Able to create and update stock sources | ||
5a421e1a-28ad-11ed-bdcb-507b9dea1806,App: stockmanagement.stockOperationType,Able to view stock operation types | ||
55670834-28ad-11ed-bdcb-507b9dea1806,Task: stockmanagement.party.read,Able to read party information | ||
27334ff0-698d-11ed-a1c5-806d973f13a9,App: stockmanagement.reports,Able to view stock reports | ||
8f0cecbb-6b11-11ed-93a2-806d973f13a9,Task: stockmanagement.reports.mutate,Able to create stock reports |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Uuid,Role name,Description,Inherited roles,Privileges,_order:1000 | ||
7d8d214d-2188-11ed-9dff-507b9dea1806,Stock Management Base Role,This Role is the default Role for stock management with basic functionality with less privileges,,App: stockmanagement.dashboard; App: stockmanagement.stockItems; App: stockmanagement.stockoperations; Get Concepts; Get Locations; Get Users; Get Roles; App: stockmanagement.stockSources;App: stockmanagement.stockOperationType; Task: stockmanagement.party.read, | ||
cca4be4b-2188-11ed-9dff-507b9dea1806,Inventory Manager,This enables managing stock management operations accross the stock management application,Stock Management Base Role,Task: stockmanagement.stockItems.mutate; Task: stockmanagement.stockoperations.mutate; Task: stockmanagement.stockoperations.approve; Task: stockmanagement.stockSources.mutate; Task: stockmanagement.stockoperations.receiveitems, | ||
2083fd40-3391-11ed-a667-507b9dea1806,Inventory Administrator,This Role enables full access to stock management application,Inventory Manager,App: stockmanagement.userRoleScopes; Task: stockmanagement.userRoleScopes.mutate, | ||
d210eb66-2188-11ed-9dff-507b9dea1806,Inventory Clerk,This Role enables access to daily stock operations,Stock Management Base Role,Task: stockmanagement.stockoperations.mutate; Task: stockmanagement.stockSources.mutate; Task: stockmanagement.stockoperations.receiveitems, | ||
8ee2f2ac-467f-11ed-8109-00155dcc3fc0,Inventory Provider Access,This Role enables a provider to view inventory items and access quantities available,,App: stockmanagement.stockItems; Get Concepts; Get Locations; Get Users; App: stockmanagement.stockSources; App: stockmanagement.stockOperationType; Task: stockmanagement.party.read; Task: stockmanagement.stockItems.dispense.qty, | ||
84bdd876-4694-11ed-8109-00155dcc3fc0,Inventory Dispensing,This Role enables a provider to dispence inventory items,Inventory Provider Access,Task: stockmanagement.stockItems.dispense, | ||
a49be648-6b0a-11ed-93a2-806d973f13a9,Inventory Reporting,This Role enables a provider to access reports,Stock Management Base Role,App: stockmanagement.reports; Task: stockmanagement.reports.mutate; Manage Scheduler; Get Patients, |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has version
1.1.0
of the billing module been released?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this was released. We had to do this also when we were adding domains to iniz that depends on the released version of the module
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I failed to find such a release from this repository: https://github.com/openmrs/openmrs-module-billing
Or are you using another repository?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dkayiwa - I think there was a manual release on BambooCI, link
@ODORA0 - The task
Build and Validate Configuration
is failing because some privileges (likely) reference Roles that may not be in the Roles iniz domain. Please checkThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could there be a reason why you set this to
false
? https://github.com/openmrs/openmrs-module-billing/blob/main/pom.xml#L367For I notice that no tag was created on github https://github.com/openmrs/openmrs-module-billing/tags
And the billing module is still having 1.1.0-SNAPSHOT https://github.com/openmrs/openmrs-module-billing/blob/main/pom.xml#L8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We didn't set that to false, it must have been a default value and we didn't catch it. We will fix it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The module versions changed and the push configuration updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could there be a reason why you are not using the latest snapshot version
1.2.0-SNAPSHOT
of this module to take advantage of the latest changes? Just like you have done for the stockmanagement module.