The personal finance app for everyone
Auto naming of Transfer Transaction (#1393)
Harshit Chaudhary47288a16293a
diff --git a/app/controllers/account/transfers_controller.rb b/app/controllers/account/transfers_controller.rbindex c8fd4877..bdd611f9 100644--- a/app/controllers/account/transfers_controller.rb+++ b/app/controllers/account/transfers_controller.rb@@ -14,8 +14,7 @@ class Account::TransfersController < ApplicationController@transfer = Account::Transfer.build_from_accounts from_account, to_account, \date: transfer_params[:date],amount: transfer_params[:amount].to_d,- currency: transfer_params[:currency],- name: transfer_params[:name]+ currency: transfer_params[:currency]if @transfer.save@transfer.entries.each(&:sync_account_later)diff --git a/app/models/account/transfer.rb b/app/models/account/transfer.rbindex 370d53a2..9cd78ac1 100644--- a/app/models/account/transfer.rb+++ b/app/models/account/transfer.rb@@ -43,12 +43,12 @@ class Account::Transfer < ApplicationRecordendclass << self- def build_from_accounts(from_account, to_account, date:, amount:, currency:, name:)+ def build_from_accounts(from_account, to_account, date:, amount:, currency:)outflow = from_account.entries.build \amount: amount.abs,currency: from_account.currency,date: date,- name: name,+ name: "Transfer to #{to_account.name}",marked_as_transfer: true,entryable: Account::Transaction.new@@ -56,7 +56,7 @@ class Account::Transfer < ApplicationRecordamount: amount.abs * -1,currency: from_account.currency,date: date,- name: name,+ name: "Transfer from #{from_account.name}",marked_as_transfer: true,entryable: Account::Transaction.newdiff --git a/app/views/account/transfers/_form.html.erb b/app/views/account/transfers/_form.html.erbindex 61fb9350..2d35cef0 100644--- a/app/views/account/transfers/_form.html.erb+++ b/app/views/account/transfers/_form.html.erb@@ -26,7 +26,6 @@</section><section class="space-y-2">- <%= f.text_field :name, value: transfer.name, label: t(".description"), placeholder: t(".description_placeholder"), required: true %><%= f.collection_select :from_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".from") }, required: true %><%= f.collection_select :to_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".to") }, required: true %><%= f.money_field :amount, label: t(".amount"), required: true, hide_currency: true %>diff --git a/config/locales/views/account/transfers/en.yml b/config/locales/views/account/transfers/en.ymlindex 515d28e6..8939c446 100644--- a/config/locales/views/account/transfers/en.yml+++ b/config/locales/views/account/transfers/en.yml@@ -9,8 +9,6 @@ en:form:amount: Amountdate: Date- description: Description- description_placeholder: Transfer from Checking to Savingsexpense: Expensefrom: Fromincome: Incomediff --git a/test/system/transfers_test.rb b/test/system/transfers_test.rbindex 228c3ab2..1fc72fa5 100644--- a/test/system/transfers_test.rb+++ b/test/system/transfers_test.rb@@ -17,7 +17,6 @@ class TransfersTest < ApplicationSystemTestCaseclick_on "Transfer"assert_text "New transfer"- fill_in "Description", with: "Transfer txn name"select checking_name, from: "From"select savings_name, from: "To"fill_in "account_transfer[amount]", with: 500