Free order_article resource from finance namespace; also unlock for role_orders

This commit is contained in:
Julius 2013-12-31 11:41:14 +01:00 committed by wvengen
parent 9ed906f425
commit baa5f16cfc
18 changed files with 40 additions and 35 deletions

View file

@ -0,0 +1,30 @@
= simple_form_for [@order, @order_article], remote: true do |form|
.modal-header
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
.fold-line
= form.input :units_to_order, label: 'Amount ordered', hint: '', input_html: {class: 'input-nano'}
-#= form.input :units_billed, label: 'invoice', input_html: {class: 'input-nano'}
= form.input :units_received, label: 'received', input_html: {class: 'input-nano'}
%p.help-block= t 'simple_form.hints.order_article.units_to_order'
.foo{style: 'clear:both'}
= simple_fields_for :article, @order_article.article do |f|
= f.input :name
= f.input :order_number
= f.input :unit
- if @order_article.article.is_a?(StockArticle)
%div.alert= t '.stock_alert'
- else
= simple_fields_for :article_price, @order_article.article_price do |f|
= f.input :unit_quantity
= f.input :price
= f.input :tax
= f.input :deposit
= form.input :update_current_price, as: :boolean
.modal-footer
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
= form.submit class: 'btn btn-primary'

View file

@ -0,0 +1,9 @@
= simple_form_for [@order, @order_article], remote: true do |form|
.modal-header
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
= form.input :article_id, as: :select, collection: new_order_articles_collection, :label => Article.model_name.human # Why do we need the label?
.modal-footer
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
= form.submit class: 'btn btn-primary'

View file

@ -0,0 +1,3 @@
$('#modalContainer').modal('hide');
$('#result_table').prepend('#{j(render('finance/balancing/order_article_result', order_article: @order_article))}');
$('#summaryChangedWarning').show();

View file

@ -0,0 +1 @@
$('#order_article_#{@order_article.id}, #group_order_articles_#{@order_article.id}').hide();

View file

@ -0,0 +1,2 @@
$('#modalContainer').html('#{j(render("edit"))}');
$('#modalContainer').modal();

View file

@ -0,0 +1,2 @@
$('#modalContainer').html('#{j(render("new"))}');
$('#modalContainer').modal();

View file

@ -0,0 +1,9 @@
// Publish database changes.
// See publish/subscribe design pattern in /doc.
$(document).trigger({
type: 'OrderArticle#update',
order_article_id: <%= @order_article.id %>
});
$('#modalContainer').modal('hide');