changes to flow of payments for different fees shown

app/controllers/grant.controller.js

@@ -48,19 +48,6 @@ exports.createGrant = async (req, res, next) => {
 			}
 		);
 
-		const grantsOrgs = organizations.map(org => {
-			return {
-				grant_id: grant.id,
-				organization_id: org.id,
-				amount: org.amount
-			};
-		});
-
-		// mapping between bundle and orgs
-		await GrantOrganization.bulkCreate(grantsOrgs, {
-			transaction
-		});
-
 		// one time charge
 		const charge = await stripe.grantCharge({
 			grant,
@@ -72,6 +59,19 @@ exports.createGrant = async (req, res, next) => {
 			user
 		});
 
+		const grantsOrgs = organizations.map(org => {
+			return {
+				grant_id: grant.id,
+				organization_id: org.id,
+				amount: org.finalAmountToOrg
+			};
+		});
+
+		// mapping between bundle and orgs
+		await GrantOrganization.bulkCreate(grantsOrgs, {
+			transaction
+		});
+
 		await Charge.create(
 			{
 				id: charge.id,

app/controllers/sendgrid.controller.js

@@ -22,9 +22,9 @@ exports.paymentReceipt = async ({
 			<td align="left" width="75%" style="padding: 6px 12px;font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 24px;">${
 				charity.name
 			}</td>
-			<td align="left" width="25%" style="padding: 6px 12px;font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 24px;">$${
+			<td align="left" width="25%" style="padding: 6px 12px;font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 24px;">$${charity.amountWithStripeFees.toFixed(
-				charity.amount
+				2
-			}</td>
+			)}</td>
 		</tr>`;
 		});
 
@@ -41,7 +41,7 @@ exports.paymentReceipt = async ({
 				bundle_id: grant.id,
 				charities_list: charitiesHtml,
 				total_amount,
-				transaction_fees,
+				transaction_fees: transaction_fees.toFixed(2),
 				date: currDate,
 				subject: 'Your Charify Bundle Payment - Charify'
 			}

app/controllers/stripe.controller.js

@@ -15,9 +15,7 @@ exports.grantCharge = async ({
 	amount,
 	user
 }) => {
-	return new Promise(async (resolve, reject) => {
+	return await new Promise(async (resolve, reject) => {
-		const grant_id = await grant.id;
-
 		try {
 			const donors = await Donor.findAll({ where: { id: user.id } });
 
@@ -33,18 +31,18 @@ exports.grantCharge = async ({
 				receipt_email: donors[0].email
 			});
 
-			let transfers = await organizations.map(async (org, index) => {
+			let updatedOrgs = await Promise.all(
+				organizations.map(async (org, index) => {
 					const selectedOrgAmount = org.amount;
-				// this determines how much Charify takes from each donation
+					// this determines how much payment processing is covered
 					const stripeFee =
 						Math.round((selectedOrgAmount * 0.029 + 0.3) * 1e2) / 1e2;
-				org.amount = org.amount - stripeFee;
+					// this determines how much Charify takes from each donation
-
 					const applicationFee =
 						Math.round(selectedOrgAmount * 0.025 * 1e2) / 1e2;
 
 					const applicationAndStripeFee = applicationFee + stripeFee;
-				console.log(applicationAndStripeFee);
+
 					let finalAmountToOrg = 0;
 
 					let currOrg = await sequelize.query(
@@ -88,6 +86,10 @@ exports.grantCharge = async ({
 						);
 					} else finalAmountToOrg = selectedOrgAmount - applicationAndStripeFee;
 
+					// for record in grant org table
+					org.finalAmountToOrg = finalAmountToOrg;
+					org.amountWithStripeFees = selectedOrgAmount - stripeFee;
+
 					// now scale to match stripe standards
 					let t = await stripe.transfers.create({
 						amount: finalAmountToOrg * 100,
@@ -96,11 +98,14 @@ exports.grantCharge = async ({
 						destination: currOrg[0].stripe_account_id
 					});
 
-				return t;
+					return org;
-			});
+				})
+			);
 
 			// to show the transaction fees in email to giver
 			charge.transaction_fees = Math.round((amount * 0.029 + 0.3) * 1e2) / 1e2;
+			// orgs with updated amounts after fees
+			charge.updatedOrgs = updatedOrgs;
 
 			resolve(charge);
 		} catch (error) {

models/Charge.js

@@ -7,7 +7,7 @@ module.exports = (sequelize, DataTypes) => {
 		{
 			id: { type: DataTypes.UUID, primaryKey: true, allowNull: false },
 			description: DataTypes.STRING,
-			amount: DataTypes.INTEGER,
+			amount: DataTypes.DOUBLE,
 
 			payment_status: {
 				type: DataTypes.STRING,

models/Grant.js

@@ -14,7 +14,7 @@ module.exports = (sequelize, DataTypes) => {
 				allowNull: false
 			},
 			amount: {
-				type: DataTypes.INTEGER,
+				type: DataTypes.DOUBLE,
 				allowNull: false
 			},
 			monthly: {

models/Grant_Organization.js

@@ -27,7 +27,7 @@ module.exports = (sequelize, DataTypes) => {
 				}
 			},
 			amount: {
-				type: DataTypes.INTEGER,
+				type: DataTypes.DOUBLE,
 				allowNull: false
 			}
 		},