Merge pull request 'Show voided transactions in user-entries endpoint' (#34) from feat/show-voided-user-entries into main
Reviewed-on: #34
This commit is contained in:
commit
9c88993c13
3 changed files with 8 additions and 8 deletions
|
|
@ -1707,6 +1707,10 @@ window.app = Vue.createApp({
|
|||
if (entry.tags && entry.tags.includes('equity-contribution')) return true
|
||||
if (entry.account && entry.account.includes('Equity')) return true
|
||||
return false
|
||||
},
|
||||
isVoided(entry) {
|
||||
// Voided entries keep '!' flag and carry a 'voided' tag (libra convention).
|
||||
return Array.isArray(entry.tags) && entry.tags.includes('voided')
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
|
|
|
|||
|
|
@ -497,7 +497,10 @@
|
|||
<!-- Status Flag Column -->
|
||||
<template v-slot:body-cell-flag="props">
|
||||
<q-td :props="props">
|
||||
<q-icon v-if="props.row.flag === '*'" name="check_circle" color="positive" size="sm">
|
||||
<q-icon v-if="isVoided(props.row)" name="cancel" color="grey" size="sm">
|
||||
<q-tooltip>Voided</q-tooltip>
|
||||
</q-icon>
|
||||
<q-icon v-else-if="props.row.flag === '*'" name="check_circle" color="positive" size="sm">
|
||||
<q-tooltip>Cleared</q-tooltip>
|
||||
</q-icon>
|
||||
<q-icon v-else-if="props.row.flag === '!'" name="pending" color="orange" size="sm">
|
||||
|
|
@ -506,9 +509,6 @@
|
|||
<q-icon v-else-if="props.row.flag === '#'" name="flag" color="red" size="sm">
|
||||
<q-tooltip>Flagged</q-tooltip>
|
||||
</q-icon>
|
||||
<q-icon v-else-if="props.row.flag === 'x'" name="cancel" color="grey" size="sm">
|
||||
<q-tooltip>Voided</q-tooltip>
|
||||
</q-icon>
|
||||
</q-td>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -487,10 +487,6 @@ async def api_get_user_entries(
|
|||
if e.get("flag") in _SYNTHETIC_FLAGS:
|
||||
continue
|
||||
|
||||
# Skip voided transactions
|
||||
if "voided" in e.get("tags", []):
|
||||
continue
|
||||
|
||||
# Extract user ID from metadata or account names
|
||||
user_id_match = None
|
||||
entry_meta = e.get("meta", {})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue