Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

Change relationship of invoices #390 

This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
This commit is contained in:
Patrick Gansterer 2016-02-25 12:56:34 +01:00 committed by wvengen
parent 9f919c3e54
commit 460cf1e82c
13 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/finance/invoices_controller.rb
View File

@ -1,7 +1,7 @@
class Finance::InvoicesController < ApplicationController
def index
@invoices = Invoice.includes(:supplier, :delivery, :order).order('date DESC').page(params[:page]).per(@per_page)
@invoices = Invoice.includes(:supplier, :deliveries, :orders).order('date DESC').page(params[:page]).per(@per_page)
end
def show
@ -9,9 +9,9 @@ class Finance::InvoicesController < ApplicationController
end
def new
@invoice = Invoice.new :supplier_id => params[:supplier_id],
:delivery_id => params[:delivery_id],
:order_id => params[:order_id]
@invoice = Invoice.new :supplier_id => params[:supplier_id]
@invoice.deliveries << Delivery.find_by_id(params[:delivery_id]) if params[:delivery_id]
@invoice.orders << Order.find_by_id(params[:order_id]) if params[:order_id]
end
def edit
@ -24,9 +24,9 @@ class Finance::InvoicesController < ApplicationController
if @invoice.save
flash[:notice] = I18n.t('finance.create.notice')
if @invoice.order
if @invoice.orders.count == 1
# Redirect to balancing page
redirect_to new_finance_order_url(order_id: @invoice.order.id)
redirect_to new_finance_order_url(order_id: @invoice.orders.first.id)
else
redirect_to [:finance, @invoice]
end

2
app/models/delivery.rb
View File

@ -1,7 +1,7 @@
class Delivery < ActiveRecord::Base
belongs_to :supplier
has_one :invoice
belongs_to :invoice
has_many :stock_changes, -> { includes(:stock_article).order('articles.name ASC') }, :dependent => :destroy
scope :recent, -> { order('created_at DESC').limit(10) }

4
app/models/invoice.rb
View File

@ -1,9 +1,9 @@
class Invoice < ActiveRecord::Base
belongs_to :supplier
belongs_to :delivery
belongs_to :order
belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by_user_id'
has_many :deliveries
has_many :orders
validates_presence_of :supplier_id
validates_numericality_of :amount, :deposit, :deposit_credit

2
app/models/order.rb
View File

@ -9,9 +9,9 @@ class Order < ActiveRecord::Base
has_many :group_orders, :dependent => :destroy
has_many :ordergroups, :through => :group_orders
has_many :users_ordered, :through => :ordergroups, :source => :users
has_one :invoice
has_many :comments, -> { order('created_at') }, :class_name => "OrderComment"
has_many :stock_changes
belongs_to :invoice
belongs_to :supplier
belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by_user_id'
belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by_user_id'

12
app/views/finance/invoices/_form.html.haml
View File

@ -1,11 +1,11 @@
= simple_form_for([:finance, @invoice]) do |f|
= f.hidden_field :delivery_id
= f.hidden_field :order_id
= f.association :deliveries, multiple: true, as: :hidden
= f.association :orders, multiple: true, as: :hidden
- if @invoice.delivery
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
- if @invoice.order
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), new_finance_order_path(order_id: @invoice.order.id))).html_safe
- if @invoice.deliveries.first
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.deliveries.first])).html_safe
- if @invoice.orders.first
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), new_finance_order_path(order_id: @invoice.orders.first.id))).html_safe
- if @invoice.created_at
= f.input :created_at do

14
app/views/finance/invoices/_invoices.html.haml
View File

@ -10,8 +10,8 @@
%th= heading_helper Invoice, :date
%th= heading_helper Invoice, :paid_on
%th= heading_helper Invoice, :amount
%th= heading_helper Invoice, :delivery
%th= heading_helper Invoice, :order
%th= heading_helper Invoice, :deliveries
%th= heading_helper Invoice, :orders
%th= heading_helper Invoice, :note
%th
%th
@ -23,8 +23,14 @@
%td= link_to h(format_date invoice.date), finance_invoice_path(invoice)
%td= format_date invoice.paid_on
%td= number_to_currency invoice.amount
%td= link_to Delivery.model_name.human, [invoice.supplier,invoice.delivery] if invoice.delivery
%td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
%td><
- invoice.deliveries.each_with_index do |delivery, index|
= ', ' if index > 0
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
%td><
- invoice.orders.each_with_index do |order, index|
= ', ' if index > 0
= link_to format_date(order.ends), new_finance_order_path(order_id: order)
%td= truncate(invoice.note)
%td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
%td= link_to t('ui.delete'), finance_invoice_path(invoice), :data => {:confirm => t('.confirm_delete')}, :method => :delete,

18
app/views/finance/invoices/show.html.haml
View File

@ -10,14 +10,20 @@
%b= heading_helper(Invoice, :supplier) + ':'
= @invoice.supplier.name
- if @invoice.delivery
- if @invoice.deliveries.count > 0
%p
%b= heading_helper(Invoice, :delivery) + ':'
= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
- if @invoice.order
%b= heading_helper(Invoice, :deliveries) + ':'
%span><
- @invoice.deliveries.order(:delivered_on).each_with_index do |delivery, index|
= ', ' if index > 0
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
- if @invoice.orders.count > 0
%p
%b= heading_helper(Invoice, :order) + ':'
= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
%b= heading_helper(Invoice, :orders) + ':'
%span><
- @invoice.orders.order(:ends).each_with_index do |order, index|
= ', ' if index > 0
= link_to format_date(order.ends), new_finance_order_path(order_id: order)
%p
%b= heading_helper(Invoice, :number) + ':'

4
config/locales/de.yml
View File

@ -57,12 +57,12 @@ de:
created_at: Erstellt am
created_by: Erstellt von
date: Rechnungsdatum
delivery: Lieferung
deliveries: Lieferung
deposit: Pfand berechnet
deposit_credit: Pfand gutgeschrieben
note: Notiz
number: Nummer
order: Bestellung
orders: Bestellung
paid_on: Bezahlt am
supplier: Lieferant
message:

4
config/locales/en.yml
View File

@ -57,12 +57,12 @@ en:
created_at: Created at
created_by: Created by
date: Billing date
delivery: Delivery
deliveries: Delivery
deposit: Deposit charged
deposit_credit: Deposit returned
note: Note
number: Number
order: Order
orders: Order
paid_on: Paid on
supplier: Supplier
message:

4
config/locales/fr.yml
View File

@ -57,12 +57,12 @@ fr:
created_at: Créé le
created_by: "Établi par"
date: Date de facturation
delivery: Réapprovisionnement
deliveries: Réapprovisionnement
deposit: Consigne facturée
deposit_credit: Consigne remboursée
note: Note
number: Numéro
order: Commande
orders: Commande
paid_on: Payée le
supplier: Fournisseur-e
message:

4
config/locales/nl.yml
View File

@ -57,12 +57,12 @@ nl:
created_at: Gemaakt op
created_by: Gemaakt door
date: Factuurdatum
delivery: Levering
deliveries: Levering
deposit: Statiegeld in rekening gebracht
deposit_credit: Statiegeld teruggekregen
note: Notitie
number: Nummer
order: Bestelling
orders: Bestelling
paid_on: Betaald op
supplier: Leverancier
message:

21
db/migrate/20160217134742_change_invoice_relation.rb Normal file
View File

@ -0,0 +1,21 @@
class ChangeInvoiceRelation < ActiveRecord::Migration
def up
add_column :deliveries, :invoice_id, :integer
execute 'UPDATE deliveries SET invoice_id = (SELECT id FROM invoices WHERE delivery_id = deliveries.id)'
remove_column :invoices, :delivery_id
add_column :orders, :invoice_id, :integer
execute 'UPDATE orders SET invoice_id = (SELECT id FROM invoices WHERE order_id = orders.id)'
remove_column :invoices, :order_id
end
def down
add_column :invoices, :delivery_id
execute 'UPDATE invoices SET delivery_id = (SELECT id FROM deliveries WHERE invoice_id = invoices.id)'
remove_column :deliveries, :invoice_id, :integer
add_column :invoices, :order_id
execute 'UPDATE invoices SET order_id = (SELECT id FROM orders WHERE invoice_id = invoices.id)'
remove_column :orders, :invoice_id, :integer
end
end

7
db/schema.rb
View File

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160217124256) do
ActiveRecord::Schema.define(version: 20160217134742) do
create_table "article_categories", force: :cascade do |t|
t.string "name", limit: 255, default: "", null: false
@ -71,6 +71,7 @@ ActiveRecord::Schema.define(version: 20160217124256) do
t.date "delivered_on"
t.datetime "created_at"
t.text "note", limit: 65535
t.integer "invoice_id"
end
add_index "deliveries", ["supplier_id"], name: "index_deliveries_on_supplier_id", using: :btree
@ -155,8 +156,6 @@ ActiveRecord::Schema.define(version: 20160217124256) do
create_table "invoices", force: :cascade do |t|
t.integer "supplier_id", limit: 4
t.integer "delivery_id", limit: 4
t.integer "order_id", limit: 4
t.string "number", limit: 255
t.date "date"
t.date "paid_on"
@ -169,7 +168,6 @@ ActiveRecord::Schema.define(version: 20160217124256) do
t.integer "created_by_user_id"
end
add_index "invoices", ["delivery_id"], name: "index_invoices_on_delivery_id", using: :btree
add_index "invoices", ["supplier_id"], name: "index_invoices_on_supplier_id", using: :btree
create_table "memberships", force: :cascade do |t|
@ -226,6 +224,7 @@ ActiveRecord::Schema.define(version: 20160217124256) do
t.decimal "foodcoop_result", precision: 8, scale: 2
t.integer "created_by_user_id", limit: 4
t.datetime "boxfill"
t.integer "invoice_id"
end
add_index "orders", ["state"], name: "index_orders_on_state", using: :btree