Skip to content
This repository was archived by the owner on Mar 21, 2025. It is now read-only.

2997: Rate Module#3000

Merged
edcable merged 1 commit into
openMF:developfrom
angelboxes:2997
Aug 24, 2020
Merged

2997: Rate Module#3000
edcable merged 1 commit into
openMF:developfrom
angelboxes:2997

Conversation

@angelboxes
Copy link
Copy Markdown
Contributor

@angelboxes angelboxes commented Aug 8, 2018

New pages were added for Rate definition and rates can be added in loan products and accounts

Description

A new rate module was added to create previously defined rates and use them to configure new loan accounts and loan products.

Related issues and discussion

2997

Screenshots, if any

screenshot_2018-08-08 mifos x client 1

screenshot_2018-08-08 mifos x client

screenshot_2018-08-08 mifos x client 2

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.

Comment thread app/scripts/controllers/loanAccount/EditLoanAccAppController.js Outdated
Comment thread app/scripts/controllers/loanAccount/EditLoanAccAppController.js
scope.rateOptions.splice(scope.rateOptions.indexOf(currentRate),1);
scope.currentRate = '';
currentRate = '';
console.log(scope.rateOptions);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove console log

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok.

scope.formData.maxInterestRatePerPeriod = total;
scope.calculatedRatePerPeriod = total;

console.log(scope.formData);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove console log

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok

//
// scope.incomeAccountOptions = data.incomeOrLiabilityAccountOptions.incomeAccountOptions || [];
// scope.liabilityAccountOptions = data.incomeOrLiabilityAccountOptions.liabilityAccountOptions || [];
// scope.incomeAndLiabilityAccountOptions = scope.incomeAccountOptions.concat(scope.liabilityAccountOptions);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove commented code

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok

scope.rateOptions = [{id : "m_loan"}];


scope.rateAppliesToSelected = function (rateAppliesId) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

what is the purpose of this function

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Honestly it doesn't seems to do something important. Someone else worked in the code before me so my best bet is that it was used just for some tests

resourceFactory.rateResource.save(this.formData, function (data) {
location.path('/rates/');
},function(error){
console.log(error);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove console log

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok.

scope.formData.maxInterestRatePerPeriod = total;
scope.calculatedRatePerPeriod = total;

console.log(scope.formData);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove console log

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

also remove extra new lines used in different files

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok

@awasum
Copy link
Copy Markdown
Collaborator

awasum commented May 18, 2020

@vorburger @angelboxes is this PR a complement to https://issues.apache.org/jira/browse/FINERACT-614 and apache/fineract#592 ?

Seems there are merge conflicts, @angelboxes , will u like to adjust them?

@angelboxes
Copy link
Copy Markdown
Contributor Author

@vorburger @angelboxes is this PR a complement to https://issues.apache.org/jira/browse/FINERACT-614 and apache/fineract#592 ?

Seems there are merge conflicts, @angelboxes , will u like to adjust them?

Hi Awasum, sorry for the late response, yes it is related, let me check the merge conflict and make sure that this work with the latest fineract version.

@edcable
Copy link
Copy Markdown
Member

edcable commented Aug 6, 2020

@angelboxes Are you able to check the merge conflicts here? We are FINALLY going to ship this in Fineract 1.4 and Mifos X 20.08

@edcable edcable requested a review from ankit01ojha August 6, 2020 23:33
@edcable edcable linked an issue Aug 6, 2020 that may be closed by this pull request
@angelboxes
Copy link
Copy Markdown
Contributor Author

@angelboxes Are you able to check the merge conflicts here? We are FINALLY going to ship this in Fineract 1.4 and Mifos X 20.08

Sorry Ed, I wasn't able to read any messages I've received from github, I will check the confilcts

@angelboxes angelboxes force-pushed the 2997 branch 3 times, most recently from 0025b2b to 732810c Compare August 17, 2020 14:23
@angelboxes
Copy link
Copy Markdown
Contributor Author

Hi @edcable, I've reabased the branch twice to fix the merge conflicts.

@edcable
Copy link
Copy Markdown
Member

edcable commented Aug 17, 2020

Sorry @angelboxes there's one more merge conflict now. Can you please address?

@edcable
Copy link
Copy Markdown
Member

edcable commented Aug 17, 2020

@bharathcgowda have you had a chance to do functional review of this yet?

@edcable edcable requested a review from bharathcgowda August 17, 2020 17:33
Copy link
Copy Markdown
Collaborator

@bharathcgowda bharathcgowda left a comment

Choose a reason for hiding this comment

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

Functionality is good to have, which enhances the user experience. Functionally I would like to approve this Feature.

New pages were added for Rate definition and rates can be added in loan products and accounts
@awasum
Copy link
Copy Markdown
Collaborator

awasum commented Aug 20, 2020

@angelboxes Thanks for all your work. Just fix this last merge conflict on the tranlation file and I will merge this PR immediately after that. Again, sorry for the delay.

Copy link
Copy Markdown
Collaborator

@awasum awasum left a comment

Choose a reason for hiding this comment

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

LGTM except the small merge conflict with the translation file. I will merge this once that is fixed.

@angelboxes
Copy link
Copy Markdown
Contributor Author

Hi everyone, I've update again my branch with the latest changes from dev.

@edcable edcable merged commit ca5bc63 into openMF:develop Aug 24, 2020
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.

Creation of sub rates

5 participants