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

Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-01-29 21:28:22 +01:00
parent 9eb2125f15
commit 190a777278
53 changed files with 568 additions and 603 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

339
app/controllers/finance/balancing_controller.rb
View file

@ -1,9 +1,10 @@
class Finance::BalancingController < ApplicationController class Finance::BalancingController < ApplicationController
before_filter :authenticate_finance before_filter :authenticate_finance
verify :method => :post, :only => [:close_direct]
def index def index
@financial_transactions = FinancialTransaction.find(:all, :order => "created_on DESC", :limit => 8) @financial_transactions = FinancialTransaction.find(:all, :order => "created_on DESC", :limit => 8)
@orders = Order.find(:all, :conditions => 'finished = 1 AND booked = 0', :order => 'ends DESC') @orders = Order.finished
@unpaid_invoices = Invoice.unpaid @unpaid_invoices = Invoice.unpaid
end end
@ -16,204 +17,180 @@ class Finance::BalancingController < ApplicationController
@comments = @order.comments @comments = @order.comments
case params[:view] case params[:view]
when 'editResults' when 'editResults'
render :partial => 'editResults' render :partial => 'edit_results_by_articles'
when 'groupsOverview' when 'groupsOverview'
render :partial => 'groupsOverview' render :partial => 'shared/articles_by_groups', :locals => {:order => @order}
when 'articlesOverview' when 'articlesOverview'
render :partial => 'articlesOverview' render :partial => 'shared/articles_by_articles', :locals => {:order => @order}
when "editNote"
render :partial => "editNote"
end end
end end
def newArticleResult def edit_note
@order = Order.find(params[:id]) @order = Order.find(params[:id])
@article = @order.order_article_results.build(:tax => 7, :deposit => 0) render :partial => 'edit_note'
render :update do |page|
page["edit_box"].replace_html :partial => "newArticleResult"
page["edit_box"].show
end
end end
def createArticleResult def update_note
render :update do |page|
@article = OrderArticleResult.new(params[:order_article_result])
@article.fc_markup = APP_CONFIG[:price_markup]
@article.make_gross if @article.tax && @article.deposit && @article.price
if @article.valid?
@article.save
@order = @article.order
page["edit_box"].hide
page["order_summary"].replace_html :partial => 'summary'
page.insert_html :bottom, "result_table", :partial => "articleResults"
page["order_article_result_#{@article.id}"].visual_effect :highlight, :duration => 2
page["group_order_article_results_#{@article.id}"].show
else
page["edit_box"].replace_html :partial => "newArticleResult"
end
end
end
def editArticleResult
@article = OrderArticleResult.find(params[:id])
render :update do |page|
page["edit_box"].replace_html :partial => 'editArticleResult'
page["edit_box"].show
end
end
def updateArticleResult
@article = OrderArticleResult.find(params[:id])
@article.attributes=(params[:order_article_result]) # update attributes but doesn't save
@article.make_gross
@order = @article.order
@ordered_articles = @order.order_article_results
@group_orders = @order.group_order_results
render :update do |page|
if @article.save
page["edit_box"].hide
page["order_summary"].replace_html :partial => 'summary'
page["order_summary"].visual_effect :highlight, :duration => 2
page["order_article_result_#{@article.id}"].replace_html :partial => 'articleResult'
page['order_article_result_'+@article.id.to_s].visual_effect :highlight, :delay => 0.5, :duration => 2
page["group_order_article_results_#{@article.id}"].replace_html :partial => "groupOrderArticleResults"
else
page['edit_box'].replace_html :partial => 'editArticleResult'
end
end
end
def destroyArticleResult
if @article = OrderArticleResult.find(params[:id]).destroy
@order = @article.order
render :update do |page|
page["order_article_result_#{@article.id}"].remove
page["group_order_article_results_#{@article.id}"].remove
page["order_summary"].replace_html :partial => 'summary'
page["order_summary"].visual_effect :highlight, :duration => 2
end
end
end
def newGroupResult
@result = OrderArticleResult.find(params[:id]).group_order_article_results.build
render :update do |page|
page["edit_box"].replace_html :partial => "newGroupResult"
page["edit_box"].show
end
end
# Creates a new GroupOrderArticleResult
# If the the chosen Ordergroup hasn't ordered yet, a GroupOrderResult will created
def createGroupResult
@result = GroupOrderArticleResult.new(params[:group_order_article_result])
order = @result.order_article_result.order
orderGroup = Ordergroup.find(params[:group_order_article_result][:group_order_result_id])
# creates a new GroupOrderResult if necessary
unless @result.group_order_result = GroupOrderResult.find(:first,
:conditions => ["group_order_results.group_name = ? AND group_order_results.order_id = ?", orderGroup.name, order.id ])
@result.group_order_result = GroupOrderResult.create(:order => order, :group_name => orderGroup.name)
end
render :update do |page|
if @result.valid? && @result.save
@result.group_order_result.updatePrice #updates the price attribute
article = @result.order_article_result
page["edit_box"].hide
page.insert_html :after, "groups_results_#{article.id}", :partial => "groupResults"
page["group_order_article_result_#{@result.id}"].visual_effect :highlight, :duration => 2
page["groups_amount"].replace_html number_to_currency(article.order.sum('groups'))
page["profit"].replace_html number_to_currency(article.order.profit)
page["profit"].visual_effect :highlight, :duration => 2
# get the new sums for quantity and price and replace it
total = article.total
page["totalArticleQuantity_#{article.id}"].replace_html total[:quantity]
page["totalArticlePrice_#{article.id}"].replace_html number_to_currency(total[:price])
else
page["edit_box"].replace_html :partial => "newGroupResult"
end
end
end
def updateGroupResult
@result = GroupOrderArticleResult.find(params[:id])
render :update do |page|
if params[:group_order_article_result]
if @result.update_attribute(:quantity, params[:group_order_article_result][:quantity])
order = @result.group_order_result.order
groups_amount = order.sum(:groups)
article = @result.order_article_result
total = article.total
page["edit_box"].hide
page["groups_amount"].replace_html number_to_currency(groups_amount)
page["profit"].replace_html number_to_currency(order.profit)
page["groups_amount"].visual_effect :highlight, :duration => 2
page["profit"].visual_effect :highlight, :duration => 2
page["group_order_article_result_#{@result.id}"].replace_html :partial => "groupResult"
page["group_order_article_result_#{@result.id}"].visual_effect :highlight, :duration => 2
page["totalArticleQuantity_#{article.id}"].replace_html total[:quantity]
page["totalArticlePrice_#{article.id}"].replace_html total[:price]
page["sum_of_article_#{article.id}"].visual_effect :highlight, :duration => 2
end
else
page["edit_box"].replace_html :partial => 'editGroupResult'
page["edit_box"].show
end
end
end
def destroyGroupResult
@result = GroupOrderArticleResult.find(params[:id])
if @result.destroy
render :update do |page|
article = @result.order_article_result
page["group_order_article_result_#{@result.id}"].remove
page["groups_amount"].replace_html number_to_currency(article.order.sum('groups'))
page["profit"].replace_html number_to_currency(article.order.profit)
page["profit"].visual_effect :highlight, :duration => 2
total = article.total # get total quantity and price for the ArticleResult
page["totalArticleQuantity_#{article.id}"].replace_html total[:quantity]
page["totalArticleQuantity_#{article.id}"].visual_effect :highlight, :duration => 2
page["totalArticlePrice_#{article.id}"].replace_html number_to_currency(total[:price])
page["totalArticlePrice_#{article.id}"].visual_effect :highlight, :duration => 2
end
end
end
def editOrderSummary
@order = Order.find(params[:id])
render :update do |page|
page["edit_box"].replace_html :partial => 'editSummary'
page["edit_box"].show
end
end
def updateOrderSummary
@order = Order.find(params[:id]) @order = Order.find(params[:id])
render :update do |page| render :update do |page|
if @order.update_attributes(params[:order]) if @order.update_attributes(params[:order])
page["note"].replace_html simple_format(@order.note)
page["edit_box"].hide page["edit_box"].hide
page["order_summary"].replace_html :partial => "summary"
page["clear_invoice"].visual_effect :highlight, :duration => 2
else else
page["edit_box"].replace_html :partial => 'editSummary' page["results"].replace_html :partial => "edit_note"
end end
end end
end end
def updateOrderNote #TODO: Implement create/update of articles/article_prices...
@order = Order.find(params[:id]) # def new_order_article
# @order = Order.find(params[:id])
# order_article = @order.order_articles.build(:tax => 7, :deposit => 0)
# render :update do |page|
# page["edit_box"].replace_html :partial => "new_order_article", :locals => {:order_article => order_article}
# page["edit_box"].show
# end
# end
#
# def create_order_article
# @order = Order.find(params[:order_article][:order_id])
# order_article = OrderArticle.new(params[:order_article])
#
# render :update do |page|
# if order_article.save
# page["edit_box"].hide
# page["summary"].replace_html :partial => 'summary'
# page.insert_html :bottom, "result_table", :partial => "order_article_result", :locals => {:order_article => order_article}
# page["order_article_#{order_article.id}"].visual_effect :highlight, :duration => 2
# page["group_order_articles_#{order_article.id}"].show
# else
# page["edit_box"].replace_html :partial => "new_order_article", :locals => {:order_article => order_article}
# end
# end
# end
#
# def editArticleResult
# @article = OrderArticleResult.find(params[:id])
# render :update do |page|
# page["edit_box"].replace_html :partial => 'editArticleResult'
# page["edit_box"].show
# end
# end
#
# def updateArticleResult
# @article = OrderArticleResult.find(params[:id])
# @article.attributes=(params[:order_article_result]) # update attributes but doesn't save
# @article.make_gross
# @order = @article.order
# @ordered_articles = @order.order_article_results
# @group_orders = @order.group_order_results
# render :update do |page|
# if @article.save
# page["edit_box"].hide
# page["summary"].replace_html :partial => 'summary'
# page["summary"].visual_effect :highlight, :duration => 2
# page["order_article_result_#{@article.id}"].replace_html :partial => 'articleResult'
# page['order_article_result_'+@article.id.to_s].visual_effect :highlight, :delay => 0.5, :duration => 2
# page["group_order_article_results_#{@article.id}"].replace_html :partial => "groupOrderArticleResults"
# else
# page['edit_box'].replace_html :partial => 'editArticleResult'
# end
# end
# end
def destroy_order_article
order_article = OrderArticle.find(params[:id])
order_article.destroy
@order = order_article.order
render :update do |page| render :update do |page|
if @order.update_attribute(:note, params[:order][:note]) page["order_article_#{order_article.id}"].remove
page["note"].replace_html simple_format(@order.note) page["group_order_articles_#{order_article.id}"].remove
page["results"].replace_html :partial => "groupsOverview" page["summary"].replace_html :partial => 'summary', :locals => {:order => @order}
page["summary"].visual_effect :highlight, :duration => 2
end
end
def new_group_order_article
group_order_article = OrderArticle.find(params[:id]).group_order_articles.build
render :update do |page|
page["edit_box"].replace_html :partial => "new_group_order_article",
:locals => {:group_order_article => group_order_article}
page["edit_box"].show
end
end
# Creates a new GroupOrderArticle
# If the the chosen Ordergroup hasn't ordered yet, a GroupOrder will also be created
def create_group_order_article
goa = GroupOrderArticle.new(params[:group_order_article])
order_article = goa.order_article
order = order_article.order
# creates a new GroupOrder if necessary
group_order = GroupOrder.first :conditions => {:order_id => order.id, :ordergroup_id => goa.ordergroup_id}
unless group_order
goa.create_group_order(:order_id => order.id, :ordergroup_id => goa.ordergroup_id)
else
goa.group_order = group_order
end
render :update do |page|
if goa.save
goa.group_order.update_price! # Updates the price attribute of new GroupOrder
page["edit_box"].hide
page["group_order_articles_#{order_article.id}"].replace_html :partial => 'group_order_articles',
:locals => {:order_article => order_article}
page["group_order_article_#{goa.id}"].visual_effect :highlight, :duration => 2
page["summary"].replace_html :partial => 'summary', :locals => {:order => order}
page["order_profit"].visual_effect :highlight, :duration => 2
else else
page["results"].replace_html :partial => "editNote" page["edit_box"].replace_html :partial => "new_group_order_article",
:locals => {:group_order_article => goa}
end end
end end
end end
def edit_group_order_article
group_order_article = GroupOrderArticle.find(params[:id])
render :partial => 'edit_group_order_article',
:locals => {:group_order_article => group_order_article}
end
def update_group_order_article
goa = GroupOrderArticle.find(params[:id])
render :update do |page|
if goa.update_attributes(params[:group_order_article])
goa.group_order.update_price! # Updates the price attribute of new GroupOrder
page["edit_box"].hide
page["group_order_articles_#{goa.order_article.id}"].replace_html :partial => 'group_order_articles',
:locals => {:order_article => goa.order_article}
page["summary"].replace_html :partial => 'summary', :locals => {:order => goa.order_article.order}
page["order_profit"].visual_effect :highlight, :duration => 2
else
page["edit_box"].replace_html :partial => 'edit_group_order_article'
end
end
end
def destroy_group_order_article
goa = GroupOrderArticle.find(params[:id])
goa.destroy
goa.group_order.update_price! # Updates the price attribute of new GroupOrder
render :update do |page|
page["edit_box"].hide
page["group_order_articles_#{goa.order_article.id}"].replace_html :partial => 'group_order_articles',
:locals => {:order_article => goa.order_article}
page["group_order_article_#{goa.id}"].visual_effect :highlight, :duration => 2
page["summary"].replace_html :partial => 'summary', :locals => {:order => goa.order_article.order}
page["order_profit"].visual_effect :highlight, :duration => 2
end
end
# before the order will booked, a view lists all Ordergroups and its order_prices # before the order will booked, a view lists all Ordergroups and its order_prices
def confirm def confirm
@order = Order.find(params[:id]) @order = Order.find(params[:id])
@ -232,13 +209,11 @@ class Finance::BalancingController < ApplicationController
end end
end end
# Set all GroupOrders that belong to this finished order to status 'booked'. # Close the order directly, without automaticly updating ordergroups account balances
def setAllBooked def close_direct
@order = Order.find(params[:id]) @order = Order.find(params[:id])
if (@order.finished?) if @order.finished?
@order.booked = true @order.update_attributes(:state => 'closed', :updated_by => @current_user)
@order.updated_by = @current_user
@order.save!
flash[:notice] = 'Die Bestellung wurde auf "gebucht" gesetzt.' flash[:notice] = 'Die Bestellung wurde auf "gebucht" gesetzt.'
redirect_to :action => 'listOrders', :id => @order redirect_to :action => 'listOrders', :id => @order
else else

18
app/controllers/finance/invoices_controller.rb
View file

@ -19,7 +19,8 @@ class Finance::InvoicesController < ApplicationController
end end
def new def new
@invoice = Invoice.new(:supplier_id => params[:supplier_id], :delivery_id => params[:delivery_id]) @invoice = Invoice.new :supplier_id => params[:supplier_id],
:delivery_id => params[:delivery_id], :order_id => params[:order_id]
respond_to do |format| respond_to do |format|
format.html # new.html.erb format.html # new.html.erb
@ -36,15 +37,16 @@ class Finance::InvoicesController < ApplicationController
def create def create
@invoice = Invoice.new(params[:invoice]) @invoice = Invoice.new(params[:invoice])
respond_to do |format| if @invoice.save
if @invoice.save flash[:notice] = "Rechnung wurde erstellt."
flash[:notice] = 'Invoice was successfully created.' if @invoice.order
format.html { redirect_to([:finance, @invoice]) } # Redirect to balancing page
format.xml { render :xml => @invoice, :status => :created, :location => @invoice } redirect_to :controller => 'balancing', :action => 'new', :id => @invoice.order
else else
format.html { render :action => "new" } redirect_to [:finance, @invoice]
format.xml { render :xml => @invoice.errors, :status => :unprocessable_entity }
end end
else
render :action => "new"
end end
end end

4
app/controllers/orders_controller.rb
View file

@ -44,8 +44,8 @@ class OrdersController < ApplicationController
if params[:view] # Articles-list will be replaced if params[:view] # Articles-list will be replaced
partial = case params[:view] partial = case params[:view]
when 'normal' then "articles" when 'normal' then "articles"
when 'groups'then 'articles_by_groups' when 'groups'then 'shared/articles_by_groups'
when 'articles'then 'articles_by_articles' when 'articles'then 'shared/articles_by_articles'
end end
render :partial => partial, :locals => {:order => @order} if partial render :partial => partial, :locals => {:order => @order} if partial
end end

6
app/helpers/application_helper.rb
View file

@ -111,4 +111,10 @@ module ApplicationHelper
image_tag icons[name][:file], options image_tag icons[name][:file], options
end end
# Remote links with default 'loader'.gif during request
def remote_link_to(text, options={})
remote_options = {:before => "Element.show('loader')", :success => "Element.hide('loader')"}
link_to_remote(text, remote_options.merge(options))
end
end end

3
app/models/group.rb
View file

@ -1,5 +1,5 @@
# == Schema Information # == Schema Information
# Schema version: 20090102171850 # Schema version: 20090120184410
# #
# Table name: groups # Table name: groups
# #
@ -21,6 +21,7 @@
# task_name :string(255) # task_name :string(255)
# task_description :string(255) # task_description :string(255)
# task_required_users :integer(4) default(1) # task_required_users :integer(4) default(1)
# deleted_at :datetime
# #
# Groups organize the User. # Groups organize the User.

5
app/models/group_order.rb
View file

@ -1,5 +1,5 @@
# == Schema Information # == Schema Information
# Schema version: 20090114101610 # Schema version: 20090120184410
# #
# Table name: group_orders # Table name: group_orders
# #
@ -9,7 +9,7 @@
# price :decimal(8, 2) default(0.0), not null # price :decimal(8, 2) default(0.0), not null
# lock_version :integer(4) default(0), not null # lock_version :integer(4) default(0), not null
# updated_on :datetime not null # updated_on :datetime not null
# updated_by_user_id :integer(4) default(0), not null # updated_by_user_id :integer(4)
# #
# A GroupOrder represents an Order placed by an Ordergroup. # A GroupOrder represents an Order placed by an Ordergroup.
@ -23,7 +23,6 @@ class GroupOrder < ActiveRecord::Base
validates_presence_of :order_id validates_presence_of :order_id
validates_presence_of :ordergroup_id validates_presence_of :ordergroup_id
validates_presence_of :updated_by
validates_numericality_of :price validates_numericality_of :price
validates_uniqueness_of :ordergroup_id, :scope => :order_id # order groups can only order once per order validates_uniqueness_of :ordergroup_id, :scope => :order_id # order groups can only order once per order

5
app/models/group_order_article.rb
View file

@ -20,12 +20,13 @@ class GroupOrderArticle < ActiveRecord::Base
belongs_to :order_article belongs_to :order_article
has_many :group_order_article_quantities, :dependent => :destroy has_many :group_order_article_quantities, :dependent => :destroy
validates_presence_of :group_order_id validates_presence_of :group_order_id, :order_article_id
validates_presence_of :order_article_id
validates_inclusion_of :quantity, :in => 0..99 validates_inclusion_of :quantity, :in => 0..99
validates_inclusion_of :tolerance, :in => 0..99 validates_inclusion_of :tolerance, :in => 0..99
validates_uniqueness_of :order_article_id, :scope => :group_order_id # just once an article per group order validates_uniqueness_of :order_article_id, :scope => :group_order_id # just once an article per group order
attr_accessor :ordergroup_id # To create an new GroupOrder if neccessary
# Updates the quantity/tolerance for this GroupOrderArticle by updating both GroupOrderArticle properties # Updates the quantity/tolerance for this GroupOrderArticle by updating both GroupOrderArticle properties
# and the associated GroupOrderArticleQuantities chronologically. # and the associated GroupOrderArticleQuantities chronologically.
# #

5
app/models/invoice.rb
View file

@ -43,4 +43,9 @@ class Invoice < ActiveRecord::Base
def deposit_credit=(deposit) def deposit_credit=(deposit)
self[:deposit_credit] = String.delocalized_decimal(deposit) self[:deposit_credit] = String.delocalized_decimal(deposit)
end end
# Amount without deposit
def net_amount
amount - deposit + deposit_credit
end
end end

10
app/models/order.rb
View file

@ -82,9 +82,13 @@ class Order < ActiveRecord::Base
memoize :get_articles memoize :get_articles
# Returns the defecit/benefit for the foodcoop # Returns the defecit/benefit for the foodcoop
def profit(with_markup = true) # Requires a valid invoice, belonging to this order
groups_sum = with_markup ? sum(:groups) : sum(:groups_without_markup) def profit(options = {})
groups_sum - invoice_amount + deposit - deposit_credit markup = options[:with_markup] || true
if invoice
groups_sum = markup ? sum(:groups) : sum(:groups_without_markup)
groups_sum - invoice.net_amount
end
end end
# Returns the all round price of a finished order # Returns the all round price of a finished order

26
app/models/order_article.rb
View file

@ -24,19 +24,39 @@ class OrderArticle < ActiveRecord::Base
validates_presence_of :order_id validates_presence_of :order_id
validates_presence_of :article_id validates_presence_of :article_id
validates_uniqueness_of :article_id, :scope => :order_id # an article can only have one record per order validates_uniqueness_of :article_id, :scope => :order_id # an article can only have one record per order
validate :article_and_price_exist
named_scope :ordered, :conditions => "units_to_order >= 1" named_scope :ordered, :conditions => "units_to_order >= 1"
# TODO: How to create/update articles/article_prices during balancing
# # Accessors for easy create of new order_articles in balancing process
# attr_accessor :name, :order_number, :units_to_order, :unit_quantity, :unit, :net_price, :tax, :deposit
#
# before_validation_on_create :create_new_article
# This method returns either the Article or the ArticlePrice # This method returns either the Article or the ArticlePrice
# The latter will be set, when the the order is finished # The latter will be set, when the the order is finished
def price def price
article_price || article article_price || article
end end
# Count quantities of belonging group_orders.
# In balancing this can differ from ordered (by supplier) quantity for this article.
def group_orders_sum
quantity = group_order_articles.collect(&:quantity).sum
{:quantity => quantity, :price => quantity * price.fc_price}
end
private private
def validate def article_and_price_exist
errors.add(:article, "muss angegeben sein und einen aktuellen Preis haben") if !(article = Article.find(article_id)) || article.fc_price.nil? errors.add(:article, "muss angegeben sein und einen aktuellen Preis haben") if !(article = Article.find(article_id)) || article.fc_price.nil?
end end
# def create_new_article
# old_article = order.articles.find_by_name(name) # Check if there is already an Article with this name
# unless old_article
# self.article.build
# end
# end
end end

3
app/models/ordergroup.rb
View file

@ -1,5 +1,5 @@
# == Schema Information # == Schema Information
# Schema version: 20090102171850 # Schema version: 20090120184410
# #
# Table name: groups # Table name: groups
# #
@ -21,6 +21,7 @@
# task_name :string(255) # task_name :string(255)
# task_description :string(255) # task_description :string(255)
# task_required_users :integer(4) default(1) # task_required_users :integer(4) default(1)
# deleted_at :datetime
# #
# Ordergroups can order, they are "children" of the class Group # Ordergroups can order, they are "children" of the class Group

5
app/models/user.rb
View file

@ -152,6 +152,11 @@ class User < ActiveRecord::Base
ordergroups.first ordergroups.first
end end
def ordergroup_name
ordergroup = find_ordergroup
ordergroup ? ordergroup.name : "keine Bestellgruppe"
end
# Find all tasks, for which the current user should be responsible # Find all tasks, for which the current user should be responsible
# but which aren't accepted yet # but which aren't accepted yet
def unaccepted_tasks def unaccepted_tasks

3
app/models/workgroup.rb
View file

@ -1,5 +1,5 @@
# == Schema Information # == Schema Information
# Schema version: 20090113111624 # Schema version: 20090120184410
# #
# Table name: groups # Table name: groups
# #
@ -21,6 +21,7 @@
# task_name :string(255) # task_name :string(255)
# task_description :string(255) # task_description :string(255)
# task_required_users :integer(4) default(1) # task_required_users :integer(4) default(1)
# deleted_at :datetime
# #
class Workgroup < Group class Workgroup < Group

21
app/views/finance/balancing/_articleResult.haml
View file

@ -1,21 +0,0 @@
%td= @article.name
%td= link_to_function image_tag("arrow_down_red.png", :size => "16x16", :border => 0), "Element.toggle('group_order_article_results_#{@article.id}')"
%td= @article.order_number
%td= @article.units_to_order
%td= @article.unit_quantity.to_s + ' * ' + @article.unit.to_s
%td= number_to_currency(@article.price)
%td= number_to_currency(@article.fc_price)
%td= @article.tax
%td= @article.deposit
%td
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Artikel ändern'), |
:url => {:action => 'editArticleResult', :id => @article}, |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td
= link_to_remote image_tag('b_drop.png', :size => "16x16", :border => 0, :alt => 'Artikel löschen'), |
:url => {:action => 'destroyArticleResult', :id => @article}, |
:confirm => 'Bist du sicher?', |
:method => 'post', |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |

29
app/views/finance/balancing/_articleResultForm.haml
View file

@ -1,29 +0,0 @@
= error_messages_for 'article'
%p
%b Notiz:
= @form.text_field 'note', :size => 30
%table
%tr
%th Name
%th Nr.
%th
%abbr{:title=>"Anzahl gelieferter Gebinde"} Menge
%th GebGr
%th Einheit
%th netto
%th MwSt.
%th Pfand
%tr
%td= @form.text_field 'name', :size => 20
%td= @form.text_field 'order_number', :size => 3
%td= @form.text_field 'units_to_order', :size => 5
%td= @form.text_field 'unit_quantity', :size => 3
%td= @form.text_field 'unit', :size => 5
%td= @form.text_field 'price', :size => 3
%td= @form.text_field 'tax', :size => 3
%td= @form.text_field 'deposit', :size => 3
= @form.hidden_field "order_id"
%br/
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

5
app/views/finance/balancing/_articleResults.haml
View file

@ -1,5 +0,0 @@
%tr{:class => cycle('even', 'odd', :name => 'articles')}[@article]
= render :partial => 'articleResult'
%tr{:id => "group_order_article_results_#{@article.id}", :class => "results", :style => "display:none"}
= render :partial => 'groupOrderArticleResults'

17
app/views/finance/balancing/_articlesOverview.haml
View file

@ -1,17 +0,0 @@
%p
%b
Gelieferte Artikel:
= @order.order_article_results.size
- for article in @order.order_article_results
%table{:style=> "margin-bottom:1em; width:40em;"}[article]
%thead
%tr
%th{:colspan => "3"}= article.name + " (" + article.unit + " | " + article.unit_quantity.to_s + " | " + article.fc_price.to_s + ")"
%tbody
- for result in article.group_order_article_results
%tr{ :class => cycle('even', 'odd', :name => 'group')}
%td{:style=>"width:70%"}= result.group_order_result.group_name
%td= result.quantity
%td= article.fc_price * result.quantity
- reset_cycle("group")

20
app/views/finance/balancing/_editGroupResult.haml
View file

@ -1,20 +0,0 @@
%h2 Mengenänderung
%p
= @result.group_order_result.group_name
hat von
= @result.order_article_result.name
bekommen:
- remote_form_for 'group_order_article_result', @result, :url => {:action => 'updateGroupResult', :id => @result }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= error_messages_for 'group_order_article_result'
%p
%b Menge:
(Einheit:
= @result.order_article_result.unit
)
= form.text_field "quantity", :size => "6"
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

10
app/views/finance/balancing/_editNote.haml
View file

@ -1,10 +0,0 @@
%h2 Notiz bearbeiten
- remote_form_for 'order', @order, :url => {:action => 'updateOrderNote', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
%br/
= form.text_area "note", :size => "60x20"
%p
= submit_tag "Speichern"
|
= link_to_remote 'Abbrechen', :update => 'results', :url => { :action => 'edit', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"

27
app/views/finance/balancing/_editSummary.haml
View file

@ -1,27 +0,0 @@
%h2 Bestelldaten ändern
- remote_form_for 'order', @order, :url => {:action => 'updateOrderSummary', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= error_messages_for 'order'
%table{:style => "width:10em"}
%tr
%td Rechnungsnummer:
%td= form.text_field "invoice_number", :size => 10
%tr
%td Rechnungsdatum:
%td= form.text_field "invoice_date", :size => 10
%tr
%td
%abbr{:title => "(incl. Pfand/Gutschriften)"} Rechnungsbeitrag
%td= form.text_field 'invoice_amount', :size => 10
%tr
%td
%abbr{:title => "z.B Kistepfand"} extra Pfand
%td= form.text_field 'deposit', :size => 10
%tr
%td Pfandgutschrift
%td= form.text_field 'deposit_credit', :size => 10
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

21
app/views/finance/balancing/_edit_group_order_article.html.haml Normal file
View file

@ -0,0 +1,21 @@
%h2 Mengenänderung
%p
= group_order_article.group_order.ordergroup.name
hat von
= group_order_article.order_article.article.name
bekommen:
- remote_form_for group_order_article, |
:url => {:action => 'update_group_order_article', :id => group_order_article }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
%p
%b Menge:
(Einheit:
= group_order_article.order_article.article.unit
)
= form.text_field :quantity, :size => "6"
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

9
app/views/finance/balancing/_edit_note.html.haml Normal file
View file

@ -0,0 +1,9 @@
%h2 Notiz bearbeiten
- remote_form_for 'order', @order, :url => {:action => 'update_note', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
= form.text_area "note", :size => "60x20"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

8
app/views/finance/balancing/_editResults.haml → app/views/finance/balancing/_edit_results_by_articles.html.haml
View file

@ -1,12 +1,12 @@
%p{:style => "float:left"} %p{:style => "float:left"}
%b Lieferung bearbeiten %b Lieferung bearbeiten
%p{:style => "float:right"} %p{:style => "float:right"}
= link_to_remote "Artikel hinzufügen", :url => {:action => "newArticleResult", :id => @order} //= remote_link_to "Artikel hinzufügen", :url => {:action => "newArticleResult", :id => @order}
%table{:class => "ordered_articles", :style => "clear:both"} %table{:class => "ordered_articles", :style => "clear:both"}
%thead %thead
%tr %tr
%th{:colspan => "2"} Artikel %th{:colspan => "1"} Artikel
%th Nr. %th Nr.
%th Menge %th Menge
%th GebGr * Einheit %th GebGr * Einheit
@ -16,5 +16,5 @@
%th Pfand %th Pfand
%th{:colspan => "2"} %th{:colspan => "2"}
%tbody#result_table %tbody#result_table
- for @article in @order.order_article_results - for order_article in @order.order_articles.all(:include => [:article, :article_price])
= render :partial => "articleResults" = render :partial => "order_article_result", :locals => {:order_article => order_article}

25
app/views/finance/balancing/_groupOrderArticleResults.haml
View file

@ -1,25 +0,0 @@
%td{:colspan => "7"}
%p
Notiz:
= @article.note
%table
%thead
%tr
%td
%td{:style => "width:8em"} Gruppe
%td Einheiten
%td Gesamtpreis
%td{:colspan => "3",:style => "width:14em"}
= link_to_remote '[Gruppe hinzufügen]', :url => {:action => "newGroupResult", :id => @article}, :before => "Element.show('loader')", :success => "Element.hide('loader')"
%tbody{:id => "groups_results_#{@article.id}"}
- for @result in @article.group_order_article_results
= render :partial => "groupResults"
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'results'), :id => "sum_of_article_#{@article.id}"}
%td
%td{:style => "width:8em"} Summe
%td{:id => "totalArticleQuantity_#{@article.id}"}= @article.total[:quantity]
%td{:id => "totalArticlePrice_#{@article.id}", :class => "currency"}
= number_to_currency(@article.total[:price])
%td{:colspan => "3"}
- reset_cycle('results')

17
app/views/finance/balancing/_groupResult.haml
View file

@ -1,17 +0,0 @@
%td
%td{:style=>"width:50%"}= @result.group_order_result.group_name
%td{:id => "group_order_article_result_#{@result.id}_quantity"}= @result.quantity
%td{:class => "currency"}= number_to_currency(@result.order_article_result.fc_price * @result.quantity)
%td{:style=>"width:1em", :class => "actions"}
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Menge ändern'), |
:url => {:action => 'updateGroupResult', :id => @result}, |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td{:style=>"width:1em", :class => "actions"}
= link_to_remote image_tag('b_drop.png', :size => "16x16", :border => 0, :alt => 'Gruppenergebnis löschen'), |
:url => {:action => 'destroyGroupResult', :id => @result}, |
:confirm => 'Bist du sicher?', |
:method => 'post', |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td

2
app/views/finance/balancing/_groupResults.haml
View file

@ -1,2 +0,0 @@
%tr{:class => cycle('even', 'odd', :name => 'results')}[@result]
= render :partial => "groupResult"

39
app/views/finance/balancing/_group_order_articles.html.haml Normal file
View file

@ -0,0 +1,39 @@
%td{:colspan => "7"}
%table
%thead
%tr
%td
%td{:style => "width:8em"} Gruppe
%td Einheiten
%td Gesamtpreis
%td{:colspan => "3",:style => "width:14em"}
= remote_link_to '[Gruppe hinzufügen]', :url => {:action => "new_group_order_article", :id => order_article}
%tbody
- for group_order_article in order_article.group_order_articles.all(:include => [:group_order])
%tr{:class => cycle('even', 'odd', :name => 'results')}[group_order_article]
%td
%td{:style=>"width:50%"}
= group_order_article.group_order.ordergroup.name
%td{:id => "group_order_article_#{group_order_article.id}_quantity"}
= group_order_article.quantity
%td.currency
= number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.quantity, :unit => "")
%td.actions{:style=>"width:1em"}
= remote_link_to icon(:edit), :update => 'edit_box', |
:url => {:action => 'edit_group_order_article', :id => group_order_article}, |
:success => "Element.hide('loader'); Element.show('edit_box')" |
%td.actions{:style=>"width:1em"}
= remote_link_to icon(:delete), |
:url => {:action => 'destroy_group_order_article', :id => group_order_article}, |
:confirm => 'Bist du sicher?', :method => 'post' |
%td
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'results')}
%td
%td{:style => "width:8em"} Summe
%td{:id => "group_orders_sum_quantity_#{order_article.id}"}
= order_article.group_orders_sum[:quantity]
%td{:id => "group_orders_sum_price_#{order_article.id}", :class => "currency"}
= number_to_currency(order_article.group_orders_sum[:price], :unit => "")
%td{:colspan => "3"}
- reset_cycle('results')

30
app/views/finance/balancing/_groupsOverview.haml
View file

@ -1,30 +0,0 @@
%p
%b
Gruppenbestellungen:
= @order.group_order_results.size
- for groupOrderResult in @order.group_order_results
%p
%table{:style => "width:40em"}[groupOrderResult]
%thead
%tr
%th{:colspan => "6"}= groupOrderResult.group_name
%tbody
- total = 0
- for result in groupOrderResult.group_order_article_results
- price = result.order_article_result.fc_price
- quantity = result.quantity
- subTotal = price * quantity
- total += subTotal
%tr{:class => cycle('even', 'odd', :name => 'article')}
%td= result.order_article_result.name
%td= quantity
%td{:class => "currency"}= number_to_currency(price)
%td= result.order_article_result.unit_quantity
%td= result.order_article_result.unit
%td= number_to_currency(subTotal)
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'article')}
%td{:colspan => "5"} Summe
%td
%b= number_to_currency(total)
- reset_cycle("article")

24
app/views/finance/balancing/_invoice.html.haml Normal file
View file

@ -0,0 +1,24 @@
- if invoice
%table
%tr
%td Rechnungsnummer:
%td= invoice.number
%tr
%td Rechnungsdatum:
%td= invoice.date
%tr
%td Rechnungsbetrag:
%td.curreny= number_to_currency invoice.amount
%tr
%td - Pfand berechnet:
%td.curreny= number_to_currency invoice.deposit
%tr
%td + Pfand gutgeschrieben:
%td.curreny= number_to_currency invoice.deposit_credit
%tr
%td pfandbereinigter Betrag:
%td.curreny= number_to_currency invoice.net_amount
- else
Eine Rechnung für diese Bestellung anlegen:
= link_to "Neue Rechnung erstellen", new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier)

7
app/views/finance/balancing/_newArticleResult.haml
View file

@ -1,7 +0,0 @@
%h2
Neuer gelieferter Artikel die Bestellung
- remote_form_for 'order_article_result', @article, :url => {:action => 'createArticleResult' }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |@form| |
= render :partial => "articleResultForm"

17
app/views/finance/balancing/_newGroupResult.haml
View file

@ -1,17 +0,0 @@
%h2
Neue Gruppenmenge für
= @result.order_article_result.name
- remote_form_for 'group_order_article_result', @result, :url => {:action => 'createGroupResult'}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |@form| |
= error_messages_for 'result'
%p
Gruppe:
= @form.select "group_order_result_id", Ordergroup.find(:all, :order => "name").collect {|og| [og.name, og.id] }
%p
Menge:
= @form.text_field "quantity", :size => 5
= @form.hidden_field "order_article_result_id"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

17
app/views/finance/balancing/_new_group_order_article.html.haml Normal file
View file

@ -0,0 +1,17 @@
%h2
Neue Gruppenmenge für
= group_order_article.order_article.article.name
- remote_form_for group_order_article, :url => {:action => 'create_group_order_article'}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
%p
Gruppe:
= form.select :ordergroup_id, Ordergroup.all(:order => "name").collect {|og| [og.name, og.id] }
%p
Menge:
= form.text_field "quantity", :size => 5
= form.hidden_field "order_article_id"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

7
app/views/finance/balancing/_new_order_article.html.haml Normal file
View file

@ -0,0 +1,7 @@
%h2
Neuer gelieferter Artikel die Bestellung
- remote_form_for order_article, :url => {:action => 'create_order_article' }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= render :partial => 'order_article_form', :locals => {:form => form}

18
app/views/finance/balancing/_order_article.html.haml Normal file
View file

@ -0,0 +1,18 @@
%td.closed
= link_to_function order_article.article.name, |
"Element.toggle('group_order_articles_#{order_article.id}'); |
Element.toggleClassName(this.up('td'), 'open')" |
%td= order_article.article.order_number
%td= order_article.units_to_order
%td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s
%td= number_to_currency(order_article.price.price, :unit => "")
%td= number_to_currency(order_article.price.fc_price, :unit => "")
%td= order_article.price.tax
%td= order_article.price.deposit
%td
//= remote_link_to icon(:edit), |
//:url => {:action => 'edit_order_article', :id => order_article} |
%td
= remote_link_to icon(:delete), :confirm => 'Bist du sicher?', |
:url => {:action => 'destroy_order_article', :id => order_article}, |
:method => :post |

26
app/views/finance/balancing/_order_article_form.html.haml Normal file
View file

@ -0,0 +1,26 @@
= form.error_messages
%table
%tr
%th Name
%th Nr.
%th
%abbr{:title=>"Anzahl gelieferter Gebinde"} Menge
%th GebGr
%th Einheit
%th netto
%th MwSt.
%th Pfand
%tr
%td= form.text_field 'name', :size => 20
%td= form.text_field 'order_number', :size => 3
%td= form.text_field 'units_to_order', :size => 5
%td= form.text_field 'unit_quantity', :size => 3
%td= form.text_field 'unit', :size => 5
%td= form.text_field 'net_price', :size => 3
%td= form.text_field 'tax', :size => 3
%td= form.text_field 'deposit', :size => 3
= form.hidden_field "order_id"
%br/
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

5
app/views/finance/balancing/_order_article_result.html.haml Normal file
View file

@ -0,0 +1,5 @@
%tr{:class => cycle('even', 'odd', :name => 'articles')}[order_article]
= render :partial => 'order_article', :locals => {:order_article => order_article}
%tr{:id => "group_order_articles_#{order_article.id}", :class => "results", :style => "display:none"}
= render :partial => 'group_order_articles', :locals => {:order_article => order_article}

81
app/views/finance/balancing/_summary.haml
View file

@ -1,60 +1,23 @@
%b=h order.supplier.name
%br/
= "von #{format_date(order.starts)} bis #{format_date(order.ends)}"
%p %p
%b=h @order.supplier ? @order.supplier.name : _('nonexistent') %table
| Rechnungsnummer: %tr
= @order.invoice_number %td Nettobetrag:
| Rechnungsdatum: %td= number_to_currency(order.sum(:clear))
= @order.invoice_date %tr
| %td Bruttobetrag:
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Rechnungsbetrag ändern'), | %td= number_to_currency(order.sum(:gross))
:url => {:action => "editOrderSummary", :id => @order}, | %tr
:before => "Element.show('loader')", | %td FC-Betrag:
:success => "Element.hide('loader')" | %td= number_to_currency(order.sum(:fc))
%table %tr
%tr %td Summe der Gruppenbeträge:
%td{:colspan => "2"} %td= number_to_currency(order.sum(:groups))
%b Foodcoop %tr
%td{:colspan => "2"} %td FC Gewinn ohne Aufschlag:
%b Lieferant %td= number_to_currency(order.profit(:with_markup => false))
%tr %tr
%td %td FC Gewinn mit Aufschlag:
%abbr{:title => "gelieferten Artikel x Nettopreis"} Nettobetrag: %td#order_profit= number_to_currency(order.profit)
%td= number_to_currency(@order.sum(:clear))
%td
Rechnungsbetrag
%small (incl. Pfand/Gutschriften)
%td#invoice_amount= number_to_currency(@order.invoice_amount)
%tr
%td
%abbr{:title => "Nettobetrag mit Pfand und MwSt."} Bruttobetrag:
%td= number_to_currency(@order.sum(:gross))
%td
%span - extra Pfand
%small (Kistenpfand etc.)
%td#deposit= number_to_currency(@order.deposit)
%tr
%td
%abbr{:title => "Bruttobetrag mit Foodcoop Aufschlag"} FC Summe:
%td= number_to_currency(@order.sum(:fc))
%td{:style => "border-bottom: 1px solid grey"}
+ Pfandgutschriften
%td{:style => "border-bottom: 1px solid grey"}
#deposit_credit= number_to_currency(@order.deposit_credit)
%tr
%td
%abbr{:title => "Zugeteilte Mengen x Bruttopreise (inkl. Aufschlag)"} Gruppenbeträge:
%td#groups_amount= number_to_currency(@order.sum(:groups))
%td
Summe
%small (Rechungsbetrag ohne Pfand)
%td#clear_invoice= number_to_currency(@order.invoice_amount - @order.deposit + @order.deposit_credit)
%tr
%td{:colspan => "4"}
%abbr{:title => "Gruppenbeträge ohne Aufschlag minus Rechnung ohne Pfand. |
Im Idealfall sollte hier 0.00 stehen."} Differenz ohne Aufschlag: |
%span#profit= number_to_currency(@order.profit(false))
%tr
%td{:colspan => "4"}
%b
%abbr{:title => "= Gruppenbeträge - Rechnung ohne Pfand"} Differenz mit Aufschlag
= "(#{number_to_percentage(APP_CONFIG[:price_markup])}):"
%span#profit= number_to_currency(@order.profit)

12
app/views/finance/balancing/confirm.html.haml
View file

@ -1,16 +1,16 @@
%h1 Bestellung abschließen -title "Bestellung abschließen"
.single_column#confirm{:style => "width:35em"} %div{:style => "width: 40em"}
%p %p
Wenn die Bestellung abgeschlossen wird, werden ebenfalls alle Gruppenkonten aktualisiert. Wenn die Bestellung abgeschlossen wird, werden ebenfalls alle Gruppenkonten aktualisiert.
%br/ %br/
Die Konten werden wie folgt belastet: Die Konten werden wie folgt belastet:
%table.list{:style => "width:35em"} %table.list{:style => "width:35em"}
- for groupResult in @order.group_order_results - for group_order in @order.group_orders
%tr{:class => cycle('even', 'odd')} %tr{:class => cycle('even', 'odd')}
%td= groupResult.group_name %td= group_order.ordergroup.name
%td= number_to_currency(groupResult.price) %td= number_to_currency(group_order.price)
%p %p
%div{:style => "float:left"} %div{:style => "float:left"}
= button_to "Abschließen", :action => "close", :id => @order = button_to "Abschließen", :action => "close", :id => @order
%div{:style => "float:right"} %div{:style => "float:right"}
= link_to 'Zurück zur Abrechnung', :action => "new", :id => @order = link_to 'Zurück zur Abrechnung', :action => 'new', :id => @order

4
app/views/finance/balancing/index.haml
View file

@ -48,7 +48,7 @@
%table.list %table.list
%thead %thead
%tr %tr
%th Name %th Lieferant
%th Ende %th Ende
%th Betrag(FC) %th Betrag(FC)
%th %th
@ -58,6 +58,6 @@
%td= order.supplier.name %td= order.supplier.name
%td= format_date(order.ends) %td= format_date(order.ends)
%td{:class => "currency"}= number_to_currency(order.sum(:fc)) %td{:class => "currency"}= number_to_currency(order.sum(:fc))
%td= link_to "abrechnen", :action => "editOrder", :id => order %td= link_to "abrechnen", :action => "new", :id => order
- else - else
Super, alles schon abgerechnet... Super, alles schon abgerechnet...

13
app/views/finance/balancing/list.html.haml
View file

@ -1,11 +1,7 @@
%h1 beendete Bestellungen - title "beendete Bestellungen"
%p %p{:style => "width:30em"}
%i %i
Aktuell gibt es die Möglichkeit eine Bestellung mittels dem "abrechnen"-link zu verbuchen, d.h. Beschreibungstext für die Abrechnunsmodi ....
nach Bearbeitung der Liefermengen die Gruppenbeträge automatisiert zu verbuchen,
%br/
oder die Bestellung manuell abzurechnen (Kontostände selbst zu aktualisieren) und mittels "auf gebucht setzen"
die Bestellung als abgeschlossen zu deklarieren.
.left_column{:style => "width:70em"} .left_column{:style => "width:70em"}
.box_title .box_title
.column_content .column_content
@ -32,6 +28,7 @@
- unless order.closed? - unless order.closed?
= link_to "abrechnen", :action => "new", :id => order = link_to "abrechnen", :action => "new", :id => order
| |
= link_to 'auf "gebucht" setzen', {:action => 'setAllBooked', :id => order}, :confirm => 'Wirklich alle Gruppenbestellungen für diese Bestellung auf "gebucht" setzen?', :method => "post" = link_to 'direkt schließen', {:action => 'close_direct', :id => order}, |
:confirm => 'Wirklich die Bestellung schließen setzen?', :method => "post" |
- else - else
%i derzeit gibt es keine beendeten Bestellungen %i derzeit gibt es keine beendeten Bestellungen

39
app/views/finance/balancing/new.html.haml
View file

@ -1,37 +1,44 @@
%h1 Bestellung abrechnen - title "#{@order.supplier.name} abrechnen"
- if @order.closed? - if @order.closed?
%p %p
%b Achtung, Bestellung wurde schon abgerechnet! %b Achtung, Bestellung wurde schon abgerechnet!
.left_column{:style => 'width: 50em'} .left_column{:style => 'width: 24em'}
.box_title .box_title
%h2 %h2 Zusammenfassung
= @order.supplier.name + " | " + format_date(@order.starts) + ' --> ' + format_date(@order.ends)
.column_content#summary .column_content#summary
#order_summary = render :partial => "summary", :locals => {:order => @order}
= render :partial => "summary" .left_column{:style => 'width: 24em'}
.box_title
%h2 Rechnung
.column_content#invoice
= render :partial => "invoice", :locals => {:invoice => @order.invoice}
.right_column{:style => 'width: 20em'} .right_column{:style => 'width: 20em'}
.box_title .box_title
%h2 Aktionen %h2 Aktionen
.column_content .column_content
%ul %ul
- unless @order.invoice
%li= link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order)
- unless @order.closed? - unless @order.closed?
%li= link_to "Bestellung abschließen", :action => "confirm", :id => @order %li= link_to "Bestellung abschließen", :action => "confirm", :id => @order
.right_column{:style => 'clear:both;width: 28%'} .right_column{:style => 'clear:both;width: 28%'}
.box_title .box_title
%h2 Protokoll %h2 Notizen/Protokoll
.column_content .column_content
#note #note
- unless @order.note.empty? - unless @order.note.empty?
= simple_format @order.note = simple_format @order.note
- else - else
%p Hier kannst Du deine Abrechnung kommentieren %p Hier kannst Du deine Abrechnung kommentieren
%small Protokoll bearbeiten: = remote_link_to "Notiz bearbeiten", |
= link_to_remote image_tag("b_edit.png", :size => "16x16", :border => "0"), | :update => 'edit_box', :url => {:action => 'edit_note', :id => @order}, |
:update => 'results', :url => { :action => 'new', :id => @order, :view => 'editNote' }, | :success => "Element.hide('loader'); Element.show('edit_box')" |
:before => "Element.show('loader')", :success => "Element.hide('loader')" | .box_title
%hr/ %h2 Kommentare
.column_content
#comments #comments
= render :partial => 'shared/comments' = render :partial => 'shared/comments'
@ -39,11 +46,11 @@
.box_title .box_title
#editOrderNav #editOrderNav
%ul %ul
%li= link_to_remote 'Gruppenübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')" %li= remote_link_to 'Gruppenübersicht', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'groupsOverview'}
%li= link_to_remote 'Artikelübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'articlesOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')" %li= remote_link_to 'Artikelübersicht', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'articlesOverview'}
%li= link_to_remote 'Bestellung bearbeiten', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'editResults' }, :before => "Element.show('loader')", :success => "Element.hide('loader')" %li= remote_link_to 'Bestellung bearbeiten', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'editResults'}
.column_content .column_content
#results #results
= render :partial => 'groupsOverview' = render :partial => 'edit_results_by_articles'
%p= link_to_top %p= link_to_top
#edit_box{:style => 'display:none'} #edit_box{:style => 'display:none'}

11
app/views/finance/invoices/_form.html.haml
View file

@ -1,9 +1,12 @@
- form_for([:finance, @invoice]) do |f| - form_for([:finance, @invoice]) do |f|
= f.error_messages = f.error_messages
= f.hidden_field :delivery_id = f.hidden_field :delivery_id
= f.hidden_field :order_id
- if @invoice.delivery - if @invoice.delivery
%p= "Diese Rechnung ist mit einer #{link_to "Lieferung", [@invoice.supplier,@invoice.delivery]} verknüpft." %p= "Diese Rechnung ist mit einer #{link_to "Lieferung", [@invoice.supplier,@invoice.delivery]} verknüpft."
- if @invoice.order
%p= "Diese Rechnung ist mit einer #{link_to "Bestellung", @invoice.order} verknüpft."
%p %p
= f.label :supplier_id = f.label :supplier_id
%br/ %br/
@ -24,6 +27,14 @@
= f.label :amount = f.label :amount
%br/ %br/
= f.text_field :amount = f.text_field :amount
%p
= f.label :deposit
%br/
= f.text_field :deposit
%p
= f.label :deposit_credit
%br/
= f.text_field :deposit_credit
%p %p
= f.label :note = f.label :note
%br/ %br/

0
app/views/orders/_articles_by_articles.html.haml → app/views/shared/_articles_by_articles.html.haml
View file

0
app/views/orders/_articles_by_groups.html.haml → app/views/shared/_articles_by_groups.html.haml
View file

10
app/views/shared/_comments.haml
View file

@ -1,13 +1,9 @@
- unless comments.empty? - unless comments.empty?
- comments.each do |comment| - comments.each do |comment|
.comment[comment] .comment[comment]
%h3
= "#{comment.user.find_ordergroup.name} :" if comment.user.find_ordergroup
= simple_format(comment.text)
.timestamp .timestamp
Erstellt am %b=h "#{comment.user.ordergroup_name}"
= format_time(comment.created_at) = "(#{comment.user.nick} am #{format_time(comment.created_at)}):"
von = simple_format(comment.text)
=h comment.user.nick
- else - else
es gibt derzeit keine Kommentare. es gibt derzeit keine Kommentare.

4
db/migrate/20090119155930_acts_as_paranoid.rb
View file

@ -5,7 +5,7 @@ class ActsAsParanoid < ActiveRecord::Migration
end end
def self.down def self.down
remove_column :suppliers, :deleted_at, :datetime remove_column :suppliers, :deleted_at
remove_column :articles, :deleted_at, :datetime remove_column :articles, :deleted_at
end end
end end

117
db/migrate/20090120184410_refactor_order_logic.rb
View file

@ -3,64 +3,67 @@ class RefactorOrderLogic < ActiveRecord::Migration
# TODO: Combine migrations since foodsoft3-development into one file # TODO: Combine migrations since foodsoft3-development into one file
# and try to build a migration path from old data. # and try to build a migration path from old data.
# articles # # articles
rename_column :articles, :net_price, :price # rename_column :articles, :net_price, :price
remove_column :articles, :gross_price # remove_column :articles, :gross_price
#
# # orders
# drop_table :orders
# drop_table :group_order_results
# drop_table :order_article_results
# drop_table :group_order_article_results
# GroupOrder.delete_all; OrderArticle.delete_all; GroupOrderArticle.delete_all; GroupOrderArticleQuantity.delete_all
#
# create_table :orders do |t|
# t.references :supplier
# t.text :note
# t.datetime :starts
# t.datetime :ends
# t.string :state, :default => "open" # Statemachine ... open -> finished -> closed
# t.integer :lock_version, :default => 0, :null => false
# t.integer :updated_by_user_id
# end
#
# # invoices
# add_column :invoices, :order_id, :integer
# add_column :invoices, :deposit, :decimal, :precision => 8, :scale => 2, :default => 0.0, :null => false
# add_column :invoices, :deposit_credit, :decimal, :precision => 8, :scale => 2, :default => 0.0, :null => false
#
# # comments
# drop_table :comments
# create_table :order_comments do |t|
# t.references :order
# t.references :user
# t.text :text
# t.datetime :created_at
# end
#
# # article_prices
# create_table :article_prices do |t|
# t.references :article
# t.decimal :price, :precision => 8, :scale => 2, :default => 0.0, :null => false
# t.decimal :tax, :precision => 8, :scale => 2, :default => 0.0, :null => false
# t.decimal :deposit, :precision => 8, :scale => 2, :default => 0.0, :null => false
# t.integer :unit_quantity
# t.datetime :created_at
# end
# # Create price history for every Article
# Article.all.each do |a|
# a.article_prices.create :price => a.price, :tax => a.tax,
# :deposit => a.deposit, :unit_quantity => a.unit_quantity
# end
# # Every Article has now a Category. Fix it if neccessary.
# Article.all(:conditions => { :article_category_id => nil }).each do |article|
# article.update_attribute(:article_category, ArticleCategory.first)
# end
# # order-articles
# add_column :order_articles, :article_price_id, :integer
#
# # ordergroups
# add_column :groups, :deleted_at, :datetime
# orders # GroupOrders
drop_table :orders change_column :group_orders, :updated_by_user_id, :integer, :default => nil, :null => true
drop_table :group_order_results
drop_table :order_article_results
drop_table :group_order_article_results
GroupOrder.delete_all; OrderArticle.delete_all; GroupOrderArticle.delete_all; GroupOrderArticleQuantity.delete_all
create_table :orders do |t|
t.references :supplier
t.text :note
t.datetime :starts
t.datetime :ends
t.string :state, :default => "open" # Statemachine ... open -> finished -> closed
t.integer :lock_version, :default => 0, :null => false
t.integer :updated_by_user_id
end
# invoices
add_column :invoices, :order_id, :integer
add_column :invoices, :deposit, :decimal, :precision => 8, :scale => 2, :default => 0.0, :null => false
add_column :invoices, :deposit_credit, :decimal, :precision => 8, :scale => 2, :default => 0.0, :null => false
# comments
drop_table :comments
create_table :order_comments do |t|
t.references :order
t.references :user
t.text :text
t.datetime :created_at
end
# article_prices
create_table :article_prices do |t|
t.references :article
t.decimal :price, :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal :tax, :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal :deposit, :precision => 8, :scale => 2, :default => 0.0, :null => false
t.integer :unit_quantity
t.datetime :created_at
end
# Create price history for every Article
Article.all.each do |a|
a.article_prices.create :price => a.price, :tax => a.tax,
:deposit => a.deposit, :unit_quantity => a.unit_quantity
end
# Every Article has now a Category. Fix it if neccessary.
Article.all(:conditions => { :article_category_id => nil }).each do |article|
article.update_attribute(:article_category, ArticleCategory.first)
end
# order-articles
add_column :order_articles, :article_price_id, :integer
# ordergroups
add_column :groups, :deleted_at, :datetime
end end
def self.down def self.down

4
db/schema.rb
View file

@ -9,7 +9,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20090120184410) do ActiveRecord::Schema.define(:version => 20090119155930) do
create_table "article_categories", :force => true do |t| create_table "article_categories", :force => true do |t|
t.string "name", :default => "", :null => false t.string "name", :default => "", :null => false
@ -107,7 +107,7 @@ ActiveRecord::Schema.define(:version => 20090120184410) do
t.decimal "price", :precision => 8, :scale => 2, :default => 0.0, :null => false t.decimal "price", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.integer "lock_version", :default => 0, :null => false t.integer "lock_version", :default => 0, :null => false
t.datetime "updated_on", :null => false t.datetime "updated_on", :null => false
t.integer "updated_by_user_id", :default => 0, :null => false t.integer "updated_by_user_id"
end end
add_index "group_orders", ["ordergroup_id", "order_id"], :name => "index_group_orders_on_ordergroup_id_and_order_id", :unique => true add_index "group_orders", ["ordergroup_id", "order_id"], :name => "index_group_orders_on_ordergroup_id_and_order_id", :unique => true

BIN
public/images/arrow_right_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 356 B

12
public/stylesheets/main.css
View file

@ -243,6 +243,16 @@ td.currency, td.actions {
text-align: right; text-align: right;
padding-right: 0.5em; } padding-right: 0.5em; }
td.closed {
background: url(/images/arrow_right_red.png) no-repeat center left; }
td.closed a {
display: block;
text-decoration: none;
padding-left: 20px; }
td.open {
background: url(/images/arrow_down_red.png) no-repeat center left; }
div.edit_form { div.edit_form {
border: 2px solid #e3e3e3; border: 2px solid #e3e3e3;
background: #f5f5f5; background: #f5f5f5;
@ -252,7 +262,7 @@ div.edit_form {
#edit_article, #edit_box { #edit_article, #edit_box {
position: fixed; position: fixed;
top: 23%; top: 5em;
left: 10em; left: 10em;
width: 55em; width: 55em;
background: #FBFBFB; background: #FBFBFB;

12
public/stylesheets/print.css
View file

@ -243,6 +243,16 @@ td.currency, td.actions {
text-align: right; text-align: right;
padding-right: 0.5em; } padding-right: 0.5em; }
td.closed {
background: url(/images/arrow_right_red.png) no-repeat center left; }
td.closed a {
display: block;
text-decoration: none;
padding-left: 20px; }
td.open {
background: url(/images/arrow_down_red.png) no-repeat center left; }
div.edit_form { div.edit_form {
border: 2px solid #e3e3e3; border: 2px solid #e3e3e3;
background: #f5f5f5; background: #f5f5f5;
@ -252,7 +262,7 @@ div.edit_form {
#edit_article, #edit_box { #edit_article, #edit_box {
position: fixed; position: fixed;
top: 23%; top: 5em;
left: 10em; left: 10em;
width: 55em; width: 55em;
background: #FBFBFB; background: #FBFBFB;

10
public/stylesheets/sass/main.sass
View file

@ -270,6 +270,14 @@ table.ordered_articles
td.currency, td.actions td.currency, td.actions
:text-align right :text-align right
:padding-right 0.5em :padding-right 0.5em
td.closed
background: url(/images/arrow_right_red.png) no-repeat center left
a
display: block
text-decoration: none
padding-left: 20px
td.open
background: url(/images/arrow_down_red.png) no-repeat center left
// ************************************* for edit formulars */ // ************************************* for edit formulars */
div.edit_form div.edit_form
@ -281,7 +289,7 @@ div.edit_form
#edit_article, #edit_box #edit_article, #edit_box
:position fixed :position fixed
:top 23% :top 5em
:left 10em :left 10em
:width 55em :width 55em
:background #FBFBFB :background #FBFBFB

3
test/fixtures/groups.yml vendored
View file

@ -1,5 +1,5 @@
# == Schema Information # == Schema Information
# Schema version: 20090102171850 # Schema version: 20090120184410
# #
# Table name: groups # Table name: groups
# #
@ -21,6 +21,7 @@
# task_name :string(255) # task_name :string(255)
# task_description :string(255) # task_description :string(255)
# task_required_users :integer(4) default(1) # task_required_users :integer(4) default(1)
# deleted_at :datetime
# #
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html