Implement creating new transactions
This commit is contained in:
parent
dcf40b1ce8
commit
d3d7366b4a
GPG Key ID:
7234E476BF21C61A
247
src/components/TransactionEditor.vue
Normal file
247
src/components/TransactionEditor.vue
Normal file
@ -0,0 +1,247 @@
|
|||||||
|
<!--
|
||||||
|
DrCr: Web-based double-entry bookkeeping framework
|
||||||
|
Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo)
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<table class="min-w-full">
|
||||||
|
<thead>
|
||||||
|
<tr class="border-b border-gray-300">
|
||||||
|
<th class="pt-0.5 pb-1 pr-1 text-gray-900 font-semibold text-start">Date</th>
|
||||||
|
<th class="pt-0.5 pb-1 px-1 text-gray-900 font-semibold text-start" colspan="2">Description</th>
|
||||||
|
<th class="pt-0.5 pb-1 px-1 text-gray-900 font-semibold text-start">Dr</th>
|
||||||
|
<th class="pt-0.5 pb-1 pl-1 text-gray-900 font-semibold text-start">Cr</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="pt-2 pb-1 pr-1">
|
||||||
|
<input type="date" class="bordered-field" v-model="transaction.dt">
|
||||||
|
</td>
|
||||||
|
<td class="pt-2 pb-1 px-1" colspan="2">
|
||||||
|
<input type="text" class="bordered-field" v-model="transaction.description">
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
|
<tr v-for="posting in transaction.postings">
|
||||||
|
<td></td>
|
||||||
|
<!-- TODO: Posting description -->
|
||||||
|
<td class="py-1 px-1" colspan="2">
|
||||||
|
<div class="relative flex">
|
||||||
|
<div class="relative flex flex-grow items-stretch shadow-sm">
|
||||||
|
<div class="absolute inset-y-0 left-0 flex items-center z-10">
|
||||||
|
<select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-emerald-600" v-model="posting.sign">
|
||||||
|
<option value="dr">Dr</option>
|
||||||
|
<option value="cr">Cr</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="relative combobox w-full">
|
||||||
|
<input type="text" class="bordered-field pl-16 peer" v-model="posting.account">
|
||||||
|
<!-- TODO: Accounts combobox -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="relative -ml-px px-2 py-2 text-gray-500 hover:text-gray-700" @click="addPosting(posting)">
|
||||||
|
<PlusIcon class="w-4 h-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<template v-if="posting.sign == 'dr'">
|
||||||
|
<td class="amount-dr has-amount py-1 px-1">
|
||||||
|
<div class="relative shadow-sm">
|
||||||
|
<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
|
||||||
|
<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
|
||||||
|
</div>
|
||||||
|
<input type="text" class="bordered-field pl-7" v-model="posting.amount_abs">
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="amount-cr py-1 pl-1"></td>
|
||||||
|
</template>
|
||||||
|
<template v-if="posting.sign == 'cr'">
|
||||||
|
<td class="amount-dr py-1 px-1"></td>
|
||||||
|
<td class="amount-cr has-amount py-1 pl-1">
|
||||||
|
<div class="relative shadow-sm">
|
||||||
|
<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
|
||||||
|
<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
|
||||||
|
</div>
|
||||||
|
<input type="text" class="bordered-field pl-7" v-model="posting.amount_abs">
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</template>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<div class="flex justify-end mt-4 space-x-2">
|
||||||
|
<!--<button type="submit" name="action" value="delete" class="btn-secondary text-red-600 ring-red-500" onclick="return confirm('Are you sure you want to delete this transaction? This operation is irreversible.');">Delete</button>-->
|
||||||
|
<button class="btn-primary" @click="saveTransaction">Save</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="rounded-md bg-red-50 mt-4 p-4 col-span-2" v-if="error !== null">
|
||||||
|
<div class="flex">
|
||||||
|
<div class="flex-shrink-0">
|
||||||
|
<XCircleIcon class="h-5 w-5 text-red-400" />
|
||||||
|
</div>
|
||||||
|
<div class="ml-3 flex-1">
|
||||||
|
<p class="text-sm text-red-700">{{ error }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
import { PlusIcon, XCircleIcon } from '@heroicons/vue/24/solid';
|
||||||
|
|
||||||
|
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||||
|
|
||||||
|
import { ref } from 'vue';
|
||||||
|
|
||||||
|
import { Transaction, db, deserialiseAmount } from '../db.ts';
|
||||||
|
|
||||||
|
interface EditingPosting {
|
||||||
|
id: number | null,
|
||||||
|
description: string | null,
|
||||||
|
account: string,
|
||||||
|
sign: string, // Keep track of Dr/Cr status so this can be independently changed in the UI
|
||||||
|
amount_abs: string,
|
||||||
|
}
|
||||||
|
export interface EditingTransaction {
|
||||||
|
id: number | null,
|
||||||
|
dt: string,
|
||||||
|
description: string,
|
||||||
|
postings: EditingPosting[]
|
||||||
|
}
|
||||||
|
|
||||||
|
const { transaction } = defineProps<{ transaction: EditingTransaction }>();
|
||||||
|
|
||||||
|
const error = ref(null as string | null);
|
||||||
|
|
||||||
|
function addPosting(posting: EditingPosting) {
|
||||||
|
const index = transaction.postings.indexOf(posting);
|
||||||
|
transaction.postings.splice(index + 1, 0, {
|
||||||
|
id: null,
|
||||||
|
description: null,
|
||||||
|
account: '',
|
||||||
|
sign: posting.sign, // Create the new posting with the same sign as the entry clicked on
|
||||||
|
amount_abs: ''
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveTransaction() {
|
||||||
|
error.value = null;
|
||||||
|
|
||||||
|
// Prepare transaction for save
|
||||||
|
const newTransaction = new Transaction(
|
||||||
|
transaction.id,
|
||||||
|
dayjs(transaction.dt).format('YYYY-MM-DD HH:mm:ss.SSS000'),
|
||||||
|
transaction.description,
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const posting of transaction.postings) {
|
||||||
|
const amount_abs = deserialiseAmount(posting.amount_abs);
|
||||||
|
|
||||||
|
newTransaction.postings.push({
|
||||||
|
id: posting.id,
|
||||||
|
description: posting.description,
|
||||||
|
account: posting.account,
|
||||||
|
quantity: posting.sign === 'dr' ? amount_abs.quantity : -amount_abs.quantity,
|
||||||
|
commodity: amount_abs.commodity
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!newTransaction.doesBalance()) {
|
||||||
|
error.value = 'Debits and credits do not balance.';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save changes to database
|
||||||
|
// FIXME: Use transactions
|
||||||
|
|
||||||
|
const session = await db.load();
|
||||||
|
|
||||||
|
if (newTransaction.id === null) {
|
||||||
|
// Insert new transaction
|
||||||
|
const result = await session.execute(
|
||||||
|
`INSERT INTO transactions (dt, description)
|
||||||
|
VALUES ($1, $2)`,
|
||||||
|
[newTransaction.dt, newTransaction.description]
|
||||||
|
);
|
||||||
|
newTransaction.id = result.lastInsertId;
|
||||||
|
} else {
|
||||||
|
// Update existing transaction
|
||||||
|
await session.execute(
|
||||||
|
`UPDATE transactions
|
||||||
|
SET dt = $1, description = $2
|
||||||
|
WHERE id = $3`,
|
||||||
|
[newTransaction.dt, newTransaction.description, newTransaction.id]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let insertPostings = false;
|
||||||
|
|
||||||
|
for (const posting of newTransaction.postings) {
|
||||||
|
if (posting.id === null) {
|
||||||
|
// When we encounter a new posting, delete and re-insert all subsequent postings to preserve the order
|
||||||
|
insertPostings = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (insertPostings) {
|
||||||
|
// Delete existing posting if required
|
||||||
|
if (posting.id !== null) {
|
||||||
|
await session.execute(
|
||||||
|
`DELETE FROM postings
|
||||||
|
WHERE id = $1`,
|
||||||
|
[posting.id]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert new posting
|
||||||
|
await session.execute(
|
||||||
|
`INSERT INTO postings (transaction_id, description, account, quantity, commodity, running_balance)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, NULL)`,
|
||||||
|
[newTransaction.id, posting.description, posting.account, posting.quantity, posting.commodity]
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Update existing posting
|
||||||
|
await session.execute(
|
||||||
|
`UPDATE postings
|
||||||
|
SET description = $1, account = $2, quantity = $3, commodity = $4
|
||||||
|
WHERE id = $5`,
|
||||||
|
[posting.description, posting.account, posting.quantity, posting.commodity, posting.id]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invalidate running balances
|
||||||
|
await session.execute(
|
||||||
|
`UPDATE postings
|
||||||
|
SET running_balance = NULL
|
||||||
|
FROM (
|
||||||
|
SELECT postings.id
|
||||||
|
FROM transactions
|
||||||
|
JOIN postings ON transactions.id = postings.transaction_id
|
||||||
|
WHERE DATE(dt) >= DATE($1) AND account = $2
|
||||||
|
) p
|
||||||
|
WHERE postings.id = p.id`,
|
||||||
|
[newTransaction.dt, posting.account]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await getCurrentWindow().close();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@ -202,9 +202,9 @@ export function deserialiseAmount(amount: string): { quantity: number, commodity
|
|||||||
|
|
||||||
export class Transaction {
|
export class Transaction {
|
||||||
constructor(
|
constructor(
|
||||||
public id: number = null!,
|
public id: number | null = null,
|
||||||
public dt: string = null!,
|
public dt: string = '',
|
||||||
public description: string = null!,
|
public description: string = '',
|
||||||
public postings: Posting[] = [],
|
public postings: Posting[] = [],
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -219,7 +219,7 @@ export class Transaction {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface Posting {
|
export interface Posting {
|
||||||
id: number,
|
id: number | null,
|
||||||
description: string | null,
|
description: string | null,
|
||||||
account: string,
|
account: string,
|
||||||
quantity: number,
|
quantity: number,
|
||||||
|
|||||||
@ -33,6 +33,7 @@ async function initApp() {
|
|||||||
{ path: '/general-ledger', name: 'general-ledger', component: () => import('./pages/GeneralLedgerView.vue') },
|
{ path: '/general-ledger', name: 'general-ledger', component: () => import('./pages/GeneralLedgerView.vue') },
|
||||||
{ path: '/journal', name: 'journal', component: () => import('./pages/JournalView.vue') },
|
{ path: '/journal', name: 'journal', component: () => import('./pages/JournalView.vue') },
|
||||||
{ path: '/journal/edit-transaction/:id', name: 'journal-edit-transaction', component: () => import('./pages/EditTransactionView.vue') },
|
{ path: '/journal/edit-transaction/:id', name: 'journal-edit-transaction', component: () => import('./pages/EditTransactionView.vue') },
|
||||||
|
{ path: '/journal/new-transaction', name: 'journal-new-transaction', component: () => import('./pages/NewTransactionView.vue') },
|
||||||
{ path: '/transactions/:account', name: 'transactions', component: () => import('./pages/TransactionsView.vue') },
|
{ path: '/transactions/:account', name: 'transactions', component: () => import('./pages/TransactionsView.vue') },
|
||||||
{ path: '/trial-balance', name: 'trial-balance', component: () => import('./pages/TrialBalanceView.vue') },
|
{ path: '/trial-balance', name: 'trial-balance', component: () => import('./pages/TrialBalanceView.vue') },
|
||||||
];
|
];
|
||||||
|
|||||||
@ -21,128 +21,27 @@
|
|||||||
Edit transaction
|
Edit transaction
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<table class="min-w-full">
|
<TransactionEditor :transaction="transaction" />
|
||||||
<thead>
|
|
||||||
<tr class="border-b border-gray-300">
|
|
||||||
<th class="pt-0.5 pb-1 pr-1 text-gray-900 font-semibold text-start">Date</th>
|
|
||||||
<th class="pt-0.5 pb-1 px-1 text-gray-900 font-semibold text-start" colspan="2">Description</th>
|
|
||||||
<th class="pt-0.5 pb-1 px-1 text-gray-900 font-semibold text-start">Dr</th>
|
|
||||||
<th class="pt-0.5 pb-1 pl-1 text-gray-900 font-semibold text-start">Cr</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td class="pt-2 pb-1 pr-1">
|
|
||||||
<input type="date" class="bordered-field" v-model="transaction.dt">
|
|
||||||
</td>
|
|
||||||
<td class="pt-2 pb-1 px-1" colspan="2">
|
|
||||||
<input type="text" class="bordered-field" v-model="transaction.description">
|
|
||||||
</td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr v-for="posting in transaction.postings">
|
|
||||||
<td></td>
|
|
||||||
<!-- TODO: Posting description -->
|
|
||||||
<td class="py-1 px-1" colspan="2">
|
|
||||||
<div class="relative flex">
|
|
||||||
<div class="relative flex flex-grow items-stretch shadow-sm">
|
|
||||||
<div class="absolute inset-y-0 left-0 flex items-center z-10">
|
|
||||||
<select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-emerald-600" v-model="posting.sign">
|
|
||||||
<option value="dr">Dr</option>
|
|
||||||
<option value="cr">Cr</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="relative combobox w-full">
|
|
||||||
<input type="text" class="bordered-field pl-16 peer" v-model="posting.account">
|
|
||||||
<!-- TODO: Accounts combobox -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button class="relative -ml-px px-2 py-2 text-gray-500 hover:text-gray-700" @click="addPosting(posting)">
|
|
||||||
<PlusIcon class="w-4 h-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<template v-if="posting.sign == 'dr'">
|
|
||||||
<td class="amount-dr has-amount py-1 px-1">
|
|
||||||
<div class="relative shadow-sm">
|
|
||||||
<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
|
|
||||||
<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="bordered-field pl-7" v-model="posting.amount_abs">
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<td class="amount-cr py-1 pl-1"></td>
|
|
||||||
</template>
|
|
||||||
<template v-if="posting.sign == 'cr'">
|
|
||||||
<td class="amount-dr py-1 px-1"></td>
|
|
||||||
<td class="amount-cr has-amount py-1 pl-1">
|
|
||||||
<div class="relative shadow-sm">
|
|
||||||
<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
|
|
||||||
<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="bordered-field pl-7" v-model="posting.amount_abs">
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</template>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<div class="flex justify-end mt-4 space-x-2">
|
|
||||||
<!--<button type="submit" name="action" value="delete" class="btn-secondary text-red-600 ring-red-500" onclick="return confirm('Are you sure you want to delete this transaction? This operation is irreversible.');">Delete</button>-->
|
|
||||||
<button class="btn-primary" @click="saveTransaction">Save</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-md bg-red-50 mt-4 p-4 col-span-2" v-if="error !== null">
|
|
||||||
<div class="flex">
|
|
||||||
<div class="flex-shrink-0">
|
|
||||||
<XCircleIcon class="h-5 w-5 text-red-400" />
|
|
||||||
</div>
|
|
||||||
<div class="ml-3 flex-1">
|
|
||||||
<p class="text-sm text-red-700">{{ error }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { PlusIcon, XCircleIcon } from '@heroicons/vue/24/solid';
|
|
||||||
|
|
||||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
|
||||||
|
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
import { JoinedTransactionPosting, Posting, Transaction, db, deserialiseAmount, joinedToTransactions, serialiseAmount } from '../db.ts';
|
import { JoinedTransactionPosting, Posting, db, joinedToTransactions, serialiseAmount } from '../db.ts';
|
||||||
|
import TransactionEditor, { EditingTransaction } from '../components/TransactionEditor.vue';
|
||||||
interface EditingPosting {
|
|
||||||
id: number | null,
|
|
||||||
description: string | null,
|
|
||||||
account: string,
|
|
||||||
sign: string, // Keep track of Dr/Cr status so this can be independently changed in the UI
|
|
||||||
amount_abs: string,
|
|
||||||
}
|
|
||||||
interface EditingTransaction {
|
|
||||||
id: number | null,
|
|
||||||
dt: string,
|
|
||||||
description: string,
|
|
||||||
postings: EditingPosting[]
|
|
||||||
}
|
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
||||||
const transaction = ref({
|
const transaction = ref({
|
||||||
id: null!,
|
id: null,
|
||||||
dt: null!,
|
dt: null!,
|
||||||
description: null!,
|
description: null!,
|
||||||
postings: []
|
postings: []
|
||||||
} as EditingTransaction);
|
} as EditingTransaction);
|
||||||
|
|
||||||
const error = ref(null as string | null);
|
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
const session = await db.load();
|
const session = await db.load();
|
||||||
|
|
||||||
@ -169,120 +68,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
load();
|
load();
|
||||||
|
|
||||||
function addPosting(posting: EditingPosting) {
|
|
||||||
const index = transaction.value.postings.indexOf(posting);
|
|
||||||
transaction.value.postings.splice(index + 1, 0, {
|
|
||||||
id: null,
|
|
||||||
description: null,
|
|
||||||
account: '',
|
|
||||||
sign: posting.sign, // Create the new posting with the same sign as the entry clicked on
|
|
||||||
amount_abs: ''
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveTransaction() {
|
|
||||||
error.value = null;
|
|
||||||
|
|
||||||
if (transaction.value.id === null) {
|
|
||||||
error.value = 'Creating new transactions is not yet implemented.';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare transaction for save
|
|
||||||
const newTransaction = new Transaction(
|
|
||||||
transaction.value.id,
|
|
||||||
dayjs(transaction.value.dt).format('YYYY-MM-DD HH:mm:ss.SSS000'),
|
|
||||||
transaction.value.description,
|
|
||||||
[]
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const posting of transaction.value.postings) {
|
|
||||||
const amount_abs = deserialiseAmount(posting.amount_abs);
|
|
||||||
|
|
||||||
newTransaction.postings.push({
|
|
||||||
id: posting.id,
|
|
||||||
description: posting.description,
|
|
||||||
account: posting.account,
|
|
||||||
quantity: posting.sign === 'dr' ? amount_abs.quantity : -amount_abs.quantity,
|
|
||||||
commodity: amount_abs.commodity
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!newTransaction.doesBalance()) {
|
|
||||||
error.value = 'Debits and credits do not balance.';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save changes to database
|
|
||||||
// TODO: Use transactions
|
|
||||||
|
|
||||||
const session = await db.load();
|
|
||||||
|
|
||||||
await session.execute(
|
|
||||||
`UPDATE transactions
|
|
||||||
SET dt = $1, description = $2
|
|
||||||
WHERE id = $3`,
|
|
||||||
[newTransaction.dt, newTransaction.description, newTransaction.id]
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const posting of newTransaction.postings) {
|
|
||||||
await session.execute(
|
|
||||||
`UPDATE postings
|
|
||||||
SET description = $1, account = $2, quantity = $3, commodity = $4
|
|
||||||
WHERE id = $5`,
|
|
||||||
[posting.description, posting.account, posting.quantity, posting.commodity, posting.id]
|
|
||||||
);
|
|
||||||
|
|
||||||
let insertPostings = false;
|
|
||||||
|
|
||||||
for (const posting of newTransaction.postings) {
|
|
||||||
if (posting.id === null) {
|
|
||||||
// When we encounter a new posting, delete and re-insert all subsequent postings to preserve the order
|
|
||||||
insertPostings = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (insertPostings) {
|
|
||||||
// Delete existing posting if required
|
|
||||||
if (posting.id !== null) {
|
|
||||||
await session.execute(
|
|
||||||
`DELETE FROM postings
|
|
||||||
WHERE id = $1`,
|
|
||||||
[posting.id]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert new posting
|
|
||||||
await session.execute(
|
|
||||||
`INSERT INTO postings (transaction_id, description, account, quantity, commodity, running_balance)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, NULL)`,
|
|
||||||
[newTransaction.id, posting.description, posting.account, posting.quantity, posting.commodity]
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// Update existing posting
|
|
||||||
await session.execute(
|
|
||||||
`UPDATE postings
|
|
||||||
SET description = $1, account = $2, quantity = $3, commodity = $4
|
|
||||||
WHERE id = $5`,
|
|
||||||
[posting.description, posting.account, posting.quantity, posting.commodity, posting.id]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invalidate running balances
|
|
||||||
await session.execute(
|
|
||||||
`UPDATE postings
|
|
||||||
SET running_balance = NULL
|
|
||||||
FROM (
|
|
||||||
SELECT postings.id
|
|
||||||
FROM transactions
|
|
||||||
JOIN postings ON transactions.id = postings.transaction_id
|
|
||||||
WHERE DATE(dt) >= DATE($1) AND account = $2
|
|
||||||
) p
|
|
||||||
WHERE postings.id = p.id`,
|
|
||||||
[newTransaction.dt, posting.account]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
await getCurrentWindow().close();
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -22,12 +22,11 @@
|
|||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<div class="my-4 flex gap-x-2">
|
<div class="my-4 flex gap-x-2">
|
||||||
<!--<a href="{{ url_for('journal_new_transaction') }}" class="btn-primary pl-2">
|
<!-- Use a rather than RouterLink because RouterLink adds its own event handler -->
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
<a href="/journal/new-transaction" class="btn-primary pl-2" onclick="return openLinkInNewWindow(this);">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
|
<PlusIcon class="w-4 h-4" />
|
||||||
</svg>
|
|
||||||
New transaction
|
New transaction
|
||||||
</a>-->
|
</a>
|
||||||
<button v-if="commodityDetail" class="btn-secondary" @click="commodityDetail = false">Hide commodity detail</button>
|
<button v-if="commodityDetail" class="btn-secondary" @click="commodityDetail = false">Hide commodity detail</button>
|
||||||
<button v-if="!commodityDetail" class="btn-secondary" @click="commodityDetail = true">Show commodity detail</button>
|
<button v-if="!commodityDetail" class="btn-secondary" @click="commodityDetail = true">Show commodity detail</button>
|
||||||
</div>
|
</div>
|
||||||
@ -62,7 +61,7 @@
|
|||||||
|
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { PencilIcon } from '@heroicons/vue/24/outline';
|
import { PencilIcon, PlusIcon } from '@heroicons/vue/24/outline';
|
||||||
|
|
||||||
import { onUnmounted, ref, watch } from 'vue';
|
import { onUnmounted, ref, watch } from 'vue';
|
||||||
|
|
||||||
|
|||||||
57
src/pages/NewTransactionView.vue
Normal file
57
src/pages/NewTransactionView.vue
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
<!--
|
||||||
|
DrCr: Web-based double-entry bookkeeping framework
|
||||||
|
Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo)
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<h1 class="page-heading mb-4">
|
||||||
|
New transaction
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<TransactionEditor :transaction="transaction" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
import { ref } from 'vue';
|
||||||
|
|
||||||
|
import TransactionEditor, { EditingTransaction } from '../components/TransactionEditor.vue';
|
||||||
|
|
||||||
|
// Initialise blank transaction
|
||||||
|
const transaction = ref({
|
||||||
|
id: null,
|
||||||
|
dt: dayjs().format('YYYY-MM-DD'),
|
||||||
|
description: '',
|
||||||
|
postings: [
|
||||||
|
// One blank Dr and one blank Cr posting
|
||||||
|
{
|
||||||
|
id: null,
|
||||||
|
description: null,
|
||||||
|
account: '',
|
||||||
|
sign: 'dr',
|
||||||
|
amount_abs: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: null,
|
||||||
|
description: null,
|
||||||
|
account: '',
|
||||||
|
sign: 'cr',
|
||||||
|
amount_abs: '',
|
||||||
|
}
|
||||||
|
]
|
||||||
|
} as EditingTransaction);
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user