Skip to content

A local-first personal finance app

add options to post schedule today or the next scheduled date (#5359)

Matt Fiddaman526d7a9baaf6
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png
index 0e1ec6518b..d0c0b2be92 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index f1b69e00c7..8e579e524e 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -1456,7 +1456,7 @@ class AccountInternal extends PureComponent<
};
onScheduleAction = async (
- name: 'skip' | 'post-transaction' | 'complete',
+ name: 'skip' | 'post-transaction' | 'post-transaction-today' | 'complete',
ids: TransactionEntity['id'][],
) => {
const scheduleIds = ids.map(id => id.split('/')[1]);
@@ -1468,6 +1468,12 @@ class AccountInternal extends PureComponent<
}
this.refetchTransactions();
break;
+ case 'post-transaction-today':
+ for (const id of scheduleIds) {
+ await send('schedule/post-transaction', { id, today: true });
+ }
+ this.refetchTransactions();
+ break;
case 'skip':
for (const id of scheduleIds) {
await send('schedule/skip-next-date', { id });
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
index 428fad9dcc..cc8de1dcc5 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
@@ -358,9 +358,12 @@ function TransactionListWithPreviews({
name: 'scheduled-transaction-menu',
options: {
transactionId: transaction.id,
- onPost: async transactionId => {
+ onPost: async (transactionId, today = false) => {
const parts = transactionId.split('/');
- await send('schedule/post-transaction', { id: parts[1] });
+ await send('schedule/post-transaction', {
+ id: parts[1],
+ today,
+ });
dispatch(
collapseModals({
rootModalName: 'scheduled-transaction-menu',
diff --git a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
index 1b69e6cc22..1bd0350bc4 100644
--- a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
@@ -108,7 +108,7 @@ type ScheduledTransactionMenuProps = Omit<
> & {
transactionId: string;
onSkip: (transactionId: string) => void;
- onPost: (transactionId: string) => void;
+ onPost: (transactionId: string, today?: boolean) => void;
onComplete: (transactionId: string) => void;
};
@@ -134,6 +134,9 @@ function ScheduledTransactionMenu({
case 'post':
onPost?.(transactionId);
break;
+ case 'post-today':
+ onPost?.(transactionId, true);
+ break;
case 'skip':
onSkip?.(transactionId);
break;
@@ -145,7 +148,8 @@ function ScheduledTransactionMenu({
}
}}
items={[
- { name: 'post', text: t('Post transaction today') },
+ { name: 'post', text: t('Post transaction') },
+ { name: 'post-today', text: t('Post transaction today') },
...(canBeSkipped
? [{ name: 'skip', text: t('Skip next scheduled date') }]
: []),
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
index 2374c93fa6..d25831aeb3 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
@@ -55,6 +55,7 @@ type SchedulesTableItem = ScheduleEntity | CompletedScheduleItem;
export type ScheduleItemAction =
| 'post-transaction'
+ | 'post-transaction-today'
| 'skip'
| 'complete'
| 'restart'
@@ -76,10 +77,16 @@ function OverflowMenu({
const getMenuItems = () => {
const menuItems: { name: ScheduleItemAction; text: string }[] = [];
- menuItems.push({
- name: 'post-transaction',
- text: t('Post transaction today'),
- });
+ menuItems.push(
+ {
+ name: 'post-transaction',
+ text: t('Post transaction'),
+ },
+ {
+ name: 'post-transaction-today',
+ text: t('Post transaction today'),
+ },
+ );
if (status === 'completed') {
menuItems.push({
diff --git a/packages/desktop-client/src/components/schedules/index.tsx b/packages/desktop-client/src/components/schedules/index.tsx
index b035996b2c..c661a62010 100644
--- a/packages/desktop-client/src/components/schedules/index.tsx
+++ b/packages/desktop-client/src/components/schedules/index.tsx
@@ -50,6 +50,9 @@ export function Schedules() {
case 'post-transaction':
await send('schedule/post-transaction', { id });
break;
+ case 'post-transaction-today':
+ await send('schedule/post-transaction', { id, today: true });
+ break;
case 'skip':
await send('schedule/skip-next-date', { id });
break;
diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
index e81bbdabca..28775f400e 100644
--- a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
+++ b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
@@ -41,7 +41,7 @@ type SelectedTransactionsButtonProps = {
onRunRules: (selectedIds: string[]) => void;
onSetTransfer: (selectedIds: string[]) => void;
onScheduleAction: (
- action: 'post-transaction' | 'skip' | 'complete',
+ action: 'post-transaction' | 'post-transaction-today' | 'skip' | 'complete',
selectedIds: TransactionEntity['id'][],
) => void;
showMakeTransfer: boolean;
@@ -303,6 +303,10 @@ export function SelectedTransactionsButton({
} as const,
{
name: 'post-transaction',
+ text: t('Post transaction'),
+ } as const,
+ {
+ name: 'post-transaction-today',
text: t('Post transaction today'),
} as const,
canBeSkipped &&
@@ -419,6 +423,7 @@ export function SelectedTransactionsButton({
onMergeTransactions(selectedIds);
break;
case 'post-transaction':
+ case 'post-transaction-today':
case 'skip':
case 'complete':
onScheduleAction(name, selectedIds);
diff --git a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx b/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
index 1298f97749..08af50f8af 100644
--- a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
@@ -28,7 +28,7 @@ type BalanceMenuProps = Omit<
onUnlinkSchedule: (ids: string[]) => void;
onCreateRule: (ids: string[]) => void;
onScheduleAction: (
- name: 'skip' | 'post-transaction' | 'complete',
+ name: 'skip' | 'post-transaction' | 'post-transaction-today' | 'complete',
ids: TransactionEntity['id'][],
) => void;
onMakeAsNonSplitTransactions: (ids: string[]) => void;
@@ -169,6 +169,7 @@ export function TransactionMenu({
onMakeAsNonSplitTransactions(selectedIds);
break;
case 'post-transaction':
+ case 'post-transaction-today':
case 'skip':
case 'complete':
onScheduleAction(name, selectedIds);
@@ -196,7 +197,11 @@ export function TransactionMenu({
...(selectedIds.length === 1
? [{ name: 'view-schedule', text: t('View schedule') }]
: []),
- { name: 'post-transaction', text: t('Post transaction today') },
+ { name: 'post-transaction', text: t('Post transaction') },
+ {
+ name: 'post-transaction-today',
+ text: t('Post transaction today'),
+ },
...(canBeSkipped
? [{ name: 'skip', text: t('Skip next scheduled date') }]
: []),
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
index 1d776a5904..0f522a4fde 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
@@ -845,7 +845,7 @@ type TransactionProps = {
onBatchUnlinkSchedule?: (ids: TransactionEntity['id'][]) => void;
onCreateRule?: (ids: TransactionEntity['id'][]) => void;
onScheduleAction?: (
- name: 'skip' | 'post-transaction' | 'complete',
+ name: 'skip' | 'post-transaction' | 'post-transaction-today' | 'complete',
ids: TransactionEntity['id'][],
) => void;
onMakeAsNonSplitTransactions?: (ids: TransactionEntity['id'][]) => void;
@@ -1949,7 +1949,7 @@ type TransactionTableInnerProps = {
ascDesc: 'asc' | 'desc';
onCreateRule: (ids: RuleEntity['id'][]) => void;
onScheduleAction: (
- name: 'skip' | 'post-transaction' | 'complete',
+ name: 'skip' | 'post-transaction' | 'post-transaction-today' | 'complete',
ids: TransactionEntity['id'][],
) => void;
onMakeAsNonSplitTransactions: (ids: TransactionEntity['id'][]) => void;
@@ -2297,7 +2297,7 @@ export type TransactionTableProps = {
onBatchUnlinkSchedule: (ids: TransactionEntity['id'][]) => void;
onCreateRule: (ids: RuleEntity['id'][]) => void;
onScheduleAction: (
- name: 'skip' | 'post-transaction' | 'complete',
+ name: 'skip' | 'post-transaction' | 'post-transaction-today' | 'complete',
ids: TransactionEntity['id'][],
) => void;
onMakeAsNonSplitTransactions: (ids: string[]) => void;
@@ -2729,7 +2729,11 @@ export const TransactionTable = forwardRef(
const onScheduleAction = useCallback(
(
- action: 'skip' | 'post-transaction' | 'complete',
+ action:
+ | 'skip'
+ | 'post-transaction'
+ | 'post-transaction-today'
+ | 'complete',
ids: TransactionEntity['id'][],
) => {
onScheduleActionProp(action, ids);
diff --git a/packages/desktop-client/src/modals/modalsSlice.ts b/packages/desktop-client/src/modals/modalsSlice.ts
index 12e95b5684..5e5d6d3aa0 100644
--- a/packages/desktop-client/src/modals/modalsSlice.ts
+++ b/packages/desktop-client/src/modals/modalsSlice.ts
@@ -438,7 +438,10 @@ export type Modal =
name: 'scheduled-transaction-menu';
options: {
transactionId: TransactionEntity['id'];
- onPost: (transactionId: TransactionEntity['id']) => void;
+ onPost: (
+ transactionId: TransactionEntity['id'],
+ today?: boolean,
+ ) => void;
onSkip: (transactionId: TransactionEntity['id']) => void;
onComplete: (transactionId: TransactionEntity['id']) => void;
};
diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.ts
index 7501a28b13..77b9bceb01 100644
--- a/packages/loot-core/src/server/schedules/app.ts
+++ b/packages/loot-core/src/server/schedules/app.ts
@@ -412,7 +412,13 @@ function onApplySync(oldValues, newValues) {
// This is the service that move schedules forward automatically and
// posts transactions
-async function postTransactionForSchedule({ id }: { id: string }) {
+async function postTransactionForSchedule({
+ id,
+ today,
+}: {
+ id: string;
+ today?: boolean;
+}) {
const { data } = await aqlQuery(q('schedules').filter({ id }).select('*'));
const schedule = data[0];
if (schedule == null || schedule._account == null) {
@@ -423,7 +429,7 @@ async function postTransactionForSchedule({ id }: { id: string }) {
payee: schedule._payee,
account: schedule._account,
amount: getScheduledAmount(schedule._amount),
- date: currentDay(),
+ date: today ? currentDay() : schedule.next_date,
schedule: schedule.id,
cleared: false,
};
diff --git a/upcoming-release-notes/5359.md b/upcoming-release-notes/5359.md
new file mode 100644
index 0000000000..a4ee0c3cb9
--- /dev/null
+++ b/upcoming-release-notes/5359.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [matt-fidd]
+---
+
+Add options to post schedule today or the next scheduled date