kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

Add Reimbursement app #198

Merged
bumi merged 21 commits from feature/expenses into master 2021-06-02 12:25:34 +00:00
Conversation 19 Commits 21 Files Changed 33
+3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9df58b7f9a - Show all commits
config/seeds.js
+1 -1
View File
3
 @@ -41,7 +41,7 @@ const contractCalls = [
{ title: 'Server rent', description: 'Dedicated server: andromeda.kosmos.org, April 2020', amount: 61, currency: 'EUR', date: '2020-05-28' }, { title: 'Server rent', description: 'Dedicated server: andromeda.kosmos.org, April 2020', amount: 61, currency: 'EUR', date: '2020-05-28' },
{ title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' } { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' }
]}, { gasLimit: 300000 }]], ]}, { gasLimit: 300000 }]],
['Reimbursement', 'add', [{amount: 166800, contributorId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [ ['Reimbursement', 'add', [{amount: 166800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
{ title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' } { title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' }
]}, { gasLimit: 300000 }]], ]}, { gasLimit: 300000 }]],
]; ];
scripts/list-reimbursements.js
+2 -2
View File
@@ -15,7 +15,7 @@ module.exports = async function(callback) {
console.log(`Using Reimbursement at: ${kredits.Reimbursement.contract.address}`); console.log(`Using Reimbursement at: ${kredits.Reimbursement.contract.address}`);
const table = new Table({ const table = new Table({
head: ['ID', 'Amount', 'Token', 'ContributorId', 'Confirmed?', 'Vetoed?', 'IPFS', 'Expenses'] head: ['ID', 'Amount', 'Token', 'recipientId', 'Confirmed?', 'Vetoed?', 'IPFS', 'Expenses']
}) })
try { try {
@@ -31,7 +31,7 @@ module.exports = async function(callback) {
r.id.toString(), r.id.toString(),
r.amount.toString(), r.amount.toString(),
`${r.token}`, `${r.token}`,
`${r.contributorId}`, `${r.recipientId}`,
`${confirmed}`, `${confirmed}`,
`${r.vetoed}`, `${r.vetoed}`,
`${r.ipfsHash}`, `${r.ipfsHash}`,