Skip to content
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

FINERACT-802-restrict-client-to-have-single-self-service-user #3152

Merged
merged 1 commit into from Aug 17, 2020

Conversation

aimanoj
Copy link
Contributor

@aimanoj aimanoj commented Dec 4, 2019

Description

Error message added for the above fineract issue

Related issues and discussion

#{Issue Number}

Screenshots, if any

Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

  • Validate the JS and HTML files with grunt validate to detect errors and potential problems in JavaScript code.

  • Run the tests by opening test/SpecRunner.html in the browser to make sure you didn't break anything.

  • If you have multiple commits please combine them into one commit by squashing them.

  • Read and understood the contribution guidelines at community-app/Contributing.md.

@aimanoj aimanoj closed this Dec 4, 2019
@aimanoj aimanoj reopened this Dec 4, 2019
@santoshconflux santoshconflux added this to PR Changes Requested/Ready For PR Review in Fineract 1.4/Mifos 19.12 Fixes via automation Dec 5, 2019
@edcable edcable added this to the 20.08 Release milestone Aug 6, 2020
@edcable
Copy link
Member

edcable commented Aug 6, 2020

@fynmanoj Can you address the merge conflict so we can merge this for upcoming release?

@fynmanoj
Copy link
Contributor

fynmanoj commented Aug 7, 2020

merge conflict resolved
@edcable

Copy link
Collaborator

@luckyman20 luckyman20 left a comment

Choose a reason for hiding this comment

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

@fynmanoj There's still a merge conflict. Can you please resolve it so we can merge your Pull Request?

"label.input.maturity.instruction" : "Maturity Instruction",
"label.input.apply.maturity.instructions" :"Add Maturity Instructions",
"label.input.transfer.to.account" : "Transfer To Savings Account",
"validation.msg.fixeddepositaccount.transferToSavingsId.cannot.be.blank" : "Savings account for transfer cannot be blank.",

"error.msg.user.self.service.user.already.exist" : "Self Service User Id is already created. Go to Admin->Users to edit or delete the self-service user.",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
"error.msg.user.self.service.user.already.exist" : "Self Service User Id is already created. Go to Admin->Users to edit or delete the self-service user.",
"error.msg.user.self.service.user.already.exist" : "Self Service User ID is already created. Go to Admin -> Users to edit or delete the self-service user.",

Copy link
Contributor

Choose a reason for hiding this comment

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

done!

Copy link
Collaborator

@luckyman20 luckyman20 left a comment

Choose a reason for hiding this comment

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

Looks good, thanks @aimanoj!

@luckyman20
Copy link
Collaborator

@aimanoj @fynmanoj It still has a conflict. Can you please quickly fix it so that we can merge this?

@fynmanoj
Copy link
Contributor

@aimanoj @fynmanoj It still has a conflict. Can you please quickly fix it so that we can merge this?

done!

@luckyman20 luckyman20 merged commit fa55cd9 into openMF:develop Aug 17, 2020
Fineract 1.4/Mifos 19.12 Fixes automation moved this from PR Changes Requested/Ready For PR Review to Done Aug 17, 2020
@luckyman20
Copy link
Collaborator

@fynmanoj Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

5 participants