Compare commits
No commits in common. "bdeee02873dfbc49db2e5a9ffdb831d750702e01" and "219b5f2de8a031b8570d6d8ef7f57aaba35d0839" have entirely different histories.
bdeee02873
...
219b5f2de8
4 changed files with 4 additions and 18 deletions
|
@ -63,7 +63,8 @@ class GroupOrderInvoicePdf < RenderPdf
|
||||||
end
|
end
|
||||||
|
|
||||||
move_down 20
|
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')
|
text I18n.t('documents.group_order_invoice_pdf.table_headline')
|
||||||
move_down 5
|
move_down 5
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ class GroupOrderInvoice < ApplicationRecord
|
||||||
def init
|
def init
|
||||||
self.invoice_date = Time.now unless invoice_date
|
self.invoice_date = Time.now unless invoice_date
|
||||||
self.invoice_number = generate_invoice_number(1) unless self.invoice_number
|
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
|
end
|
||||||
|
|
||||||
def name
|
def name
|
||||||
|
|
|
@ -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
|
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# 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|
|
create_table "action_text_rich_texts", charset: "utf8mb4", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.text "body", size: :long
|
t.text "body", size: :long
|
||||||
|
|
Loading…
Reference in a new issue