diff --git a/app/documents/group_order_invoice_pdf.rb b/app/documents/group_order_invoice_pdf.rb index b2b149a5..35cceee6 100644 --- a/app/documents/group_order_invoice_pdf.rb +++ b/app/documents/group_order_invoice_pdf.rb @@ -63,7 +63,8 @@ class GroupOrderInvoicePdf < RenderPdf end move_down 20 - text I18n.t('documents.group_order_invoice_pdf.payment_method', payment_method: @options[:payment_method]) + text I18n.t('documents.group_order_invoice_pdf.payment_method', payment_method: FinancialTransactionType.find(@options[:payment_method]).name) + text I18n.t('documents.group_order_invoice_pdf.table_headline') move_down 5 diff --git a/app/models/group_order_invoice.rb b/app/models/group_order_invoice.rb index dab7bc98..acfc10e3 100644 --- a/app/models/group_order_invoice.rb +++ b/app/models/group_order_invoice.rb @@ -41,7 +41,7 @@ class GroupOrderInvoice < ApplicationRecord def init self.invoice_date = Time.now unless invoice_date self.invoice_number = generate_invoice_number(1) unless self.invoice_number - self.payment_method = group_order&.financial_transaction&.financial_transaction_type&.name || FoodsoftConfig[:group_order_invoices]&.[](:payment_method) || I18n.t('activerecord.attributes.group_order_invoice.payment_method') unless self.payment_method + self.payment_method = FoodsoftConfig[:group_order_invoices]&.[](:payment_method) || I18n.t('activerecord.attributes.group_order_invoice.payment_method') unless self.payment_method end def name diff --git a/db/migrate/20231211121430_change_group_order_invoice_payment_method.rb b/db/migrate/20231211121430_change_group_order_invoice_payment_method.rb deleted file mode 100644 index 32ad37b7..00000000 --- a/db/migrate/20231211121430_change_group_order_invoice_payment_method.rb +++ /dev/null @@ -1,15 +0,0 @@ -class ChangeGroupOrderInvoicePaymentMethod < ActiveRecord::Migration[7.0] - def change - GroupOrderInvoice.all.each do |group_order_invoice| - case group_order_invoice.payment_method - when 'Guthaben' - group_order_invoice.payment_method = 'Guthaben' - when /\A\d+\z/ - group_order_invoice.payment_method = FinancialTransactionType.find_by(id: group_order_invoice.payment_method)&.name || 'Guthaben' - else - group_order_invoice.payment_method = group_order_invoice.payment_method || 'Guthaben' - end - group_order_invoice.save! - end - end -end diff --git a/db/schema.rb b/db/schema.rb index 749f79bd..d9840d1b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_12_11_121430) do +ActiveRecord::Schema[7.0].define(version: 2023_11_28_133642) do create_table "action_text_rich_texts", charset: "utf8mb4", force: :cascade do |t| t.string "name", null: false t.text "body", size: :long