Merge branch 'develop' into milestone-payout-flow
This commit is contained in:
commit
e54000a1b2
|
@ -19,6 +19,7 @@ from grant.utils.misc import is_email, make_url, from_zat
|
||||||
from grant.utils.enums import ProposalStatus, ContributionStatus
|
from grant.utils.enums import ProposalStatus, ContributionStatus
|
||||||
from grant.utils import pagination
|
from grant.utils import pagination
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
from .models import (
|
from .models import (
|
||||||
Proposal,
|
Proposal,
|
||||||
|
@ -216,7 +217,7 @@ def update_proposal(milestones, proposal_id, **kwargs):
|
||||||
m = Milestone(
|
m = Milestone(
|
||||||
title=mdata["title"],
|
title=mdata["title"],
|
||||||
content=mdata["content"],
|
content=mdata["content"],
|
||||||
date_estimated=parse(mdata["dateEstimated"]),
|
date_estimated=datetime.fromtimestamp(mdata["dateEstimated"]),
|
||||||
payout_percent=str(mdata["payoutPercent"]),
|
payout_percent=str(mdata["payoutPercent"]),
|
||||||
immediate_payout=mdata["immediatePayout"],
|
immediate_payout=mdata["immediatePayout"],
|
||||||
proposal_id=g.current_proposal.id
|
proposal_id=g.current_proposal.id
|
||||||
|
|
|
@ -31,7 +31,7 @@ milestones = [
|
||||||
{
|
{
|
||||||
"title": "All the money straightaway",
|
"title": "All the money straightaway",
|
||||||
"content": "cool stuff with it",
|
"content": "cool stuff with it",
|
||||||
"dateEstimated": "Fri, 30 Nov 2018 01:42:23 GMT",
|
"dateEstimated": 1549505307,
|
||||||
"payoutPercent": "100",
|
"payoutPercent": "100",
|
||||||
"immediatePayout": False
|
"immediatePayout": False
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue