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,4 +1,4 @@
|
|||
= simple_form_for [:finance, @order, @order_article], remote: true do |form|
|
||||
= 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'
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
= simple_form_for [:finance, @order, @order_article], remote: true do |form|
|
||||
= 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'
|
||||
|
|
@ -25,4 +25,4 @@
|
|||
%td.article_price_price= number_to_currency order_article.article_price.price
|
||||
%td.units_delta
|
||||
%td
|
||||
= link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-mini'
|
||||
= link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-mini'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue