Skip to content
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.

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

Payment Implementation #329

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
16 changes: 12 additions & 4 deletions frontend/simple/js/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import Invite from '../views/Invite.vue'
import Mailbox from '../views/Mailbox.vue'
import Join from '../views/Join.vue'
import Vote from '../views/Vote.vue'
import PayGroup from '../views/PayGroup.vue'
import SetContribution from '../views/SetContribution.vue'
import PayGroupMembers from '../views/PayGroupMembers.vue'
import Home from '../views/Home.vue'
import ProposeMember from '../views/ProposeMember.vue'
import MembersCircle from '../components/MembersCircle.vue'
Expand Down Expand Up @@ -122,10 +123,17 @@ var router = new Router({
}
},
{
path: '/pay-group',
component: PayGroup,
path: '/set-contribution',
component: SetContribution,
meta: {
title: 'Pay Group'
title: 'Set Contribution'
}
},
{
path: '/pay-group-members',
component: PayGroupMembers,
meta: {
title: 'Pay Group Members'
}
},
// NOTE: we no longer support ejs pages
Expand Down
19 changes: 18 additions & 1 deletion frontend/simple/views/GroupDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
<group-support-history :history="[1.2, 1, .85, .95, 1.05, .35]" />

<group-settings :group="currentGroupState" />

<div>
<a class="button" @click.prevent="payGroupMembers">
<i18n>Pay Members</i18n>
</a>
</div>
<div>
<a class="button" @click.prevent="setContribution">
<i18n>Set Contribution</i18n>
</a>
</div>
</div>
</div>
</section>
Expand Down Expand Up @@ -56,6 +65,14 @@
GroupMembers,
GroupSupportHistory,
GroupSettings
},
methods: {
setContribution () {
this.$router.push({path: '/set-contribution'})
},
payGroupMembers () {
this.$router.push({path: '/pay-group-members'})
}
}
}
</script>
8 changes: 0 additions & 8 deletions frontend/simple/views/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@
>
<i18n>Start a Group</i18n>
</router-link>
<router-link
active-class="is-active"
class="nav-item is-tab"
to="pay-group"
v-if="$store.state.loggedIn"
>
<i18n>Pay Group</i18n>
</router-link>
<router-link
active-class ="is-active"
class="nav-item"
Expand Down
73 changes: 73 additions & 0 deletions frontend/simple/views/PayGroupMembers.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<template>
<!-- main containers:
.container http://bulma.io/documentation/layout/container/
.content http://bulma.io/documentation/elements/content/
.section http://bulma.io/documentation/layout/section/
.block base/classes.sass (just adds 20px margin-bottom except for last)
-->
<section class="section">
<div class="columns">
<div class="column is-1"></div>
<div class="column is-10" >

<div class="columns is-multiline">
<div class="column is-half">
<p class="title is-4"><i18n>Needs Payment</i18n></p>
<div class="box">
<ul>
<li v-for="(member, username) in membersToPay">
{{ username }}

</li>
</ul>
</div>
<p class="title is-4"><i18n>Paid</i18n></p>
<div class="box">
<ul>
<li v-for="(member, username) in paidMembers">
{{ username }}
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</section>
</template>
<script>
import {mapGetters} from 'vuex'
const incomeDistribution = require('../js/distribution/mincome-proportional').default
Copy link
Member

Choose a reason for hiding this comment

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

use import

export default {
name: 'PayGroupMembers',
props: {},
data () {
return {}
},
computed: {
...mapGetters(['profilesForGroup']),
membersToPay () {
var members = this.profilesForGroup()
var membersDistribution = []
const usernames = Object.keys(members)
usernames.map(function (username) {
membersDistribution.push({
name: username,
amount: 200 // this should be the contribution which needs to be saved at 'set contribution' page
})
members[username] = {
attrs: members[username]
}
})
console.log('Members Distribution: ', membersDistribution)
var incomes = incomeDistribution(membersDistribution, 500) // should be equal with group income baseline
console.log('Distributed Incomes: ', incomes)
return members
},
paidMembers () {
var members = []
return members
}
}
}
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</template>
<script>
export default {
name: 'PayGroup',
name: 'SetContribution',
props: {
minCome: {type: Number, default: 1000},
amountReceivedThisMonth: {type: Number, default: 852}
Expand Down