Free order_article resource from finance namespace; also unlock for role_orders
This commit is contained in:
parent
9ed906f425
commit
baa5f16cfc
18 changed files with 40 additions and 35 deletions
|
|
@ -10,7 +10,7 @@
|
|||
%th= heading_helper Article, :tax
|
||||
%th= heading_helper Article, :deposit
|
||||
%th{:colspan => "2"}
|
||||
= link_to t('.add_article'), new_finance_order_order_article_path(@order), remote: true,
|
||||
= link_to t('.add_article'), new_order_order_article_path(@order), remote: true,
|
||||
class: 'btn btn-small'
|
||||
%tbody#result_table
|
||||
- for order_article in @articles
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
%td #{order_article.price.tax}%
|
||||
%td= order_article.price.deposit
|
||||
%td
|
||||
= link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,
|
||||
= link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true,
|
||||
class: 'btn btn-mini'
|
||||
%td
|
||||
= link_to t('ui.delete'), finance_order_order_article_path(order_article.order, order_article), method: :delete,
|
||||
= link_to t('ui.delete'), order_order_article_path(order_article.order, order_article), method: :delete,
|
||||
remote: true, confirm: t('.confirm'), class: 'btn btn-danger btn-mini'
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
= simple_form_for [:finance, @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'
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
= simple_form_for [:finance, @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'
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
$('#modalContainer').modal('hide');
|
||||
$('#result_table').prepend('#{j(render('finance/balancing/order_article_result', order_article: @order_article))}');
|
||||
$('#summaryChangedWarning').show();
|
||||
|
|
@ -1 +0,0 @@
|
|||
$('#order_article_#{@order_article.id}, #group_order_articles_#{@order_article.id}').hide();
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
$('#modalContainer').html('#{j(render("edit"))}');
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
$('#modalContainer').html('#{j(render("new"))}');
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
// Publish database changes.
|
||||
// See publish/subscribe design pattern in /doc.
|
||||
$(document).trigger({
|
||||
type: 'OrderArticle#update',
|
||||
order_article_id: <%= @order_article.id %>
|
||||
});
|
||||
|
||||
$('#modalContainer').modal('hide');
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue