Skip to content

Resolving merge conflict #472

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.

Sign up for GitHub

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

Merged
merged 4 commits into from Aug 11, 2021
Merged

Resolving merge conflict #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2583409
#443 & Stripe Connectivity Issues
Aug 11, 2021
e14172b
https://github.com/topcoder-platform/taas-app/issues/443 & Stripe Co…
Aug 11, 2021
8bb7183
Merge branch 'roles-checkout' of https://github.com/arpitchaudhari/ta…
Aug 11, 2021
198493b
Merge branch 'roles-checkout' into dev
Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions docs/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5754,12 +5754,9 @@ components:
numberOfResources:
type: number
description: "No. of resources required."
rates:
rate:
type: number
description: "Weekly rates"
durationWeeks:
type: number
description: "No. of weeks"
CalculateAmountResponse:
properties:
totalAmount:
Expand Down
4 changes: 2 additions & 2 deletions src/services/TeamService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const { getAuditM2Muser } = require('../common/helper')
const { matchedSkills, unMatchedSkills } = require('../../scripts/emsi-mapping/esmi-skills-mapping')
const Role = models.Role
const RoleSearchRequest = models.RoleSearchRequest
const stripe = require("stripe")(config.STRIPE_SECRET_KEY);
const stripe = require("stripe")(config.STRIPE_SECRET_KEY,{maxNetworkRetries: 5});

const emailTemplates = helper.getEmailTemplatesForKey('teamTemplates')

Expand Down Expand Up @@ -1163,7 +1163,7 @@ suggestMembers.schema = Joi.object().keys({
*/
async function calculateAmount(amount) {
let totalAmount = 0;
_.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate * amt.durationWeeks)
_.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate)
return { totalAmount };
}

Expand Down