1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-08-05 13:35:21 +02:00

Transaction transfers, payments, and matching (#883)

* Add transfer model and clean up family snapshot fixtures

* Ignore transfers in income and expense snapshots

* Add transfer validations

* Implement basic transfer matching UI

* Fix merge conflicts

* Add missing translations

* Tweak selection states for transfer types

* Add missing i18n translation
This commit is contained in:
Zach Gollwitzer 2024-06-19 06:52:08 -04:00 committed by GitHub
parent b462bc8f8c
commit ca39b26070
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
57 changed files with 991 additions and 427 deletions

View file

@ -89,6 +89,8 @@ en:
import: Import
index:
transaction: transaction
mark_transfers:
success: Marked as transfer
merchants:
create:
success: New merchant created successfully
@ -116,6 +118,11 @@ en:
title: New merchant
update:
success: Merchant updated successfully
selection_bar:
mark_transfers: Mark as transfers?
mark_transfers_confirm: Mark as transfers
mark_transfers_message: By marking transactions as transfers, they will no longer
be included in income or spending calculations.
show:
account_label: Account
account_placeholder: Select an account
@ -127,7 +134,6 @@ en:
delete_subtitle: This permanently deletes the transaction, affects your historical
balances, and cannot be undone.
delete_title: Delete transaction
description: Description
exclude_subtitle: This excludes the transaction from any in-app features or
analytics.
exclude_title: Exclude transaction
@ -139,5 +145,11 @@ en:
overview: Overview
settings: Settings
tags_label: Select one or more tags
transaction:
remove_transfer: Remove transfer
remove_transfer_body: This will remove the transfer from this transaction
remove_transfer_confirm: Confirm
unmark_transfers:
success: Transfer removed
update:
success: Transaction updated successfully

View file

@ -0,0 +1,27 @@
---
en:
transfers:
create:
success: Transfer created
destroy:
success: Transfer removed
form:
amount: Amount
date: Date
description: Description
description_placeholder: Transfer from Checking to Savings
expense: Expense
from: From
income: Income
select_account: Select account
submit: Create transfer
to: To
transfer: Transfer
new:
title: New transfer
transfer:
remove_body: This will NOT delete the underlying transactions. It will just
remove the transfer.
remove_confirm: Confirm
remove_title: Remove transfer?
transfer_name: Transfer from %{from_account} to %{to_account}

View file

@ -46,6 +46,8 @@ Rails.application.routes.draw do
post "bulk_delete"
get "bulk_edit"
post "bulk_update"
post "mark_transfers"
post "unmark_transfers"
scope module: :transactions, as: :transaction do
resources :rows, only: %i[ show update ]
@ -63,6 +65,8 @@ Rails.application.routes.draw do
end
end
resources :transfers, only: %i[ new create destroy ]
resources :accounts, shallow: true do
get :summary, on: :collection
get :list, on: :collection