migrate to Rails 4.0 (closes foodcoops#214)
Conflicts: Gemfile.lock
This commit is contained in:
parent
12d1221bfc
commit
7841245795
97 changed files with 659 additions and 557 deletions
|
|
@ -24,4 +24,4 @@
|
|||
class: 'btn btn-mini'
|
||||
%td
|
||||
= 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'
|
||||
remote: true, data: {confirm: t('.confirm')}, class: 'btn btn-danger btn-mini'
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@
|
|||
= link_to t('orders.index.action_receive'), '#', class: 'btn btn-mini disabled'
|
||||
= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini btn-primary'
|
||||
= link_to t('.close'), close_direct_finance_order_path(order),
|
||||
:confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
|
||||
:data => {:confirm => t('.confirm')}, :method => :patch, class: 'btn btn-mini'
|
||||
- else
|
||||
%i= t('.no_closed_orders')
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@
|
|||
%td= group_order.ordergroup.name
|
||||
%td.numeric= number_to_currency(group_order.price)
|
||||
.form-actions
|
||||
= link_to t('.clear'), close_finance_order_path(@order), method: :put, class: 'btn btn-primary'
|
||||
= link_to t('.clear'), close_finance_order_path(@order), method: :patch, class: 'btn btn-primary'
|
||||
= link_to t('.or_cancel'), new_finance_order_path(order_id: @order.id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue