Compare commits

..

No commits in common. "30b3fe818a7662caf0b07d307bfbf8cdffb2230c" and "1edd126a43dc4fb1e2767c9175e553b98374da70" have entirely different histories.

2 changed files with 3 additions and 14 deletions

View file

@ -1642,9 +1642,6 @@ window.app = Vue.createApp({
formatSats(amount) { formatSats(amount) {
return new Intl.NumberFormat().format(amount) return new Intl.NumberFormat().format(amount)
}, },
isIncomeEntry(entry) {
return Array.isArray(entry.tags) && entry.tags.includes('income-entry')
},
formatFiat(amount, currency) { formatFiat(amount, currency) {
return new Intl.NumberFormat('en-US', { return new Intl.NumberFormat('en-US', {
style: 'currency', style: 'currency',

View file

@ -69,10 +69,10 @@
</template> </template>
</q-banner> </q-banner>
<!-- Pending Entries (Super User Only) --> <!-- Pending Expense Entries (Super User Only) -->
<q-card v-if="isSuperUser && pendingExpenses.length > 0"> <q-card v-if="isSuperUser && pendingExpenses.length > 0">
<q-card-section> <q-card-section>
<h6 class="q-my-none q-mb-md">Pending Approvals</h6> <h6 class="q-my-none q-mb-md">Pending Expense Approvals</h6>
<q-list separator> <q-list separator>
<q-item v-for="entry in pendingExpenses" :key="entry.id"> <q-item v-for="entry in pendingExpenses" :key="entry.id">
<q-item-section avatar> <q-item-section avatar>
@ -81,15 +81,7 @@
</q-icon> </q-icon>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label> <q-item-label>{% raw %}{{ entry.description }}{% endraw %}</q-item-label>
<q-badge
:color="isIncomeEntry(entry) ? 'green' : 'red'"
class="q-mr-sm"
>
{% raw %}{{ isIncomeEntry(entry) ? 'INCOME' : 'EXPENSE' }}{% endraw %}
</q-badge>
{% raw %}{{ entry.description }}{% endraw %}
</q-item-label>
<q-item-label caption> <q-item-label caption>
{% raw %}{{ formatDate(entry.entry_date) }}{% endraw %} {% raw %}{{ formatDate(entry.entry_date) }}{% endraw %}
</q-item-label> </q-item-label>