fixing amount for each separate organization

This commit is contained in:
Arjun Patel
2019-03-06 02:34:46 -08:00
parent fad664e04e
commit bc0e2bd0fd
6 changed files with 56 additions and 21 deletions
+17 -7
View File
@@ -6,39 +6,49 @@ const { Grant, Cause, Region, Organization, sequelize } = db;
// Create a grant for certain donor
exports.create = (req, res, next) => {
const donor_id = req.user.id;
const { name, amount, monthly, causes, regions, organizations } = req.body;
const { name, amounts, monthly, causes, regions, organizations } = req.body;
const total_amount = 100;
return sequelize
.transaction(function (t) {
.transaction(function(t) {
return Grant.create(
{
donor_id,
name,
amount,
amount: total_amount,
monthly,
num_causes: causes.length,
num_regions: regions.length
},
{ transaction: t }
{
transaction: t
}
).then(grant => {
return Promise.all([
grant.addCauses(causes, { transaction: t }),
grant.addRegions(regions, { transaction: t }),
grant.addOrganizations(organizations, { transaction: t })
organizations.map(org => {
grant.addOrganization(org.id, {
through: { amount: org.amount },
transaction: t
});
})
]).then(result => grant);
});
})
.then(function (grants) {
.then(function(grants) {
// transaction committed
// res.status(201).json({
// grant,
// message: 'Grant Created'
// });
console.log(grants);
next(grants.dataValues);
return null;
})
.catch(function (error) {
.catch(function(error) {
// transaction rollback
next(error);
});
+18 -10
View File
@@ -22,15 +22,15 @@ exports.grantCharge = async (grant, req, res, next) => {
// check if already a stripe customer
let { stripe_id, subscription_id } = donors[0];
if (!stripe_id) {
const customer = await stripe.customers.create({
source: stripeToken,
email: user.email
});
stripe_id = await customer.id;
// if (!stripe_id) {
// const customer = await stripe.customers.create({
// source: stripeToken,
// email: user.email
// });
// stripe_id = await customer.id;
await Donor.update({ stripe_id }, { where: { id: user.id } });
}
// await Donor.update({ stripe_id }, { where: { id: user.id } });
// }
// TODO: if there is, then update with the given source
var result;
@@ -40,9 +40,17 @@ exports.grantCharge = async (grant, req, res, next) => {
let charge = await stripe.charges.create({
amount,
currency: 'usd',
customer: stripe_id,
source: 'tok_visa',
description: 'One time payment for grant',
statement_descriptor: 'one-time-grant'
statement_descriptor: 'one-time-grant',
transfer_group: 'Grant ' + grant_id
});
let transfers = stripe.transfers.create({
amount: 7000,
currency: 'usd',
destination: '{CONNECTED_STRIPE_ACCOUNT_ID}',
transfer_group: '{ORDER10}'
});
await Charge.create({