From a7290f748e10d386e2a2f66349983fbf77a5a31a Mon Sep 17 00:00:00 2001 From: Martin Ortbauer Date: Fri, 16 Feb 2024 13:34:37 -0500 Subject: [PATCH] fix financial links * mutltiple views did not work not sure if they did before --- app/controllers/finance/financial_links_controller.rb | 2 +- app/views/finance/bank_transactions/_transactions.html.haml | 2 +- app/views/finance/bank_transactions/show.html.haml | 4 ++-- .../finance/financial_links/_index_bank_transaction.html.haml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/finance/financial_links_controller.rb b/app/controllers/finance/financial_links_controller.rb index c78a79b3e..bc3a2a713 100644 --- a/app/controllers/finance/financial_links_controller.rb +++ b/app/controllers/finance/financial_links_controller.rb @@ -8,7 +8,7 @@ def show type: t('activerecord.models.bank_transaction'), description: bt.text, amount: bt.amount, - link_to: finance_bank_transaction_path(bt), + link_to: finance_bank_account_transaction_path(id:bt.id,bank_account_id:bt.bank_account.id), remove_path: remove_bank_transaction_finance_link_path(@financial_link, bt) } end diff --git a/app/views/finance/bank_transactions/_transactions.html.haml b/app/views/finance/bank_transactions/_transactions.html.haml index c32778933..763be6e18 100644 --- a/app/views/finance/bank_transactions/_transactions.html.haml +++ b/app/views/finance/bank_transactions/_transactions.html.haml @@ -17,7 +17,7 @@ %tbody - @bank_transactions.each do |t| %tr - %td= h link_to format_date(t.date), finance_bank_transaction_path(t) + %td= h link_to format_date(t.date), finance_bank_account_transaction_path(id:t.id) %td= h(t.text).gsub("\n", "
").html_safe %td= h(t.reference).gsub("\n", "
").html_safe %td.numeric{style: 'width:5em'}= format_currency t.amount diff --git a/app/views/finance/bank_transactions/show.html.haml b/app/views/finance/bank_transactions/show.html.haml index b4f3e9353..eae9d074b 100644 --- a/app/views/finance/bank_transactions/show.html.haml +++ b/app/views/finance/bank_transactions/show.html.haml @@ -35,7 +35,7 @@ - unless @bank_transaction.receipt.blank? %pre= preserve @bank_transaction.receipt -- if @bank_transaction.image - %p= image_tag @bank_transaction.image_url +-# - if @bank_transaction.image +-# %p= image_tag @bank_transaction.image_url = link_to t('ui.or_cancel'), finance_bank_account_transactions_path(@bank_transaction.bank_account) diff --git a/app/views/finance/financial_links/_index_bank_transaction.html.haml b/app/views/finance/financial_links/_index_bank_transaction.html.haml index 4d3d35970..dd75b1535 100644 --- a/app/views/finance/financial_links/_index_bank_transaction.html.haml +++ b/app/views/finance/financial_links/_index_bank_transaction.html.haml @@ -12,7 +12,7 @@ %tbody - for t in @bank_transactions %tr - %td= link_to format_time(t.date), add_bank_transaction_finance_link_path(@financial_link, bank_transaction: t.id), method: :put + %td= link_to format_date(t.date), add_bank_transaction_finance_link_path(@financial_link, bank_transaction: t.id), method: :put %td= t.text %td= t.reference %td= number_to_currency t.amount