diff --git a/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_body.html.haml.deface b/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_body.html.haml.deface deleted file mode 100644 index 398d99eaf6..0000000000 --- a/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_body.html.haml.deface +++ /dev/null @@ -1,9 +0,0 @@ -/ replace_contents "[data-hook='adjustment_row']" - -%td.align-center.created_at= pretty_time(adjustment.created_at) -%td.align-center.label= adjustment.label -%td.align-center.amount= adjustment.display_amount.to_html -%td.align-center.included-tax= adjustment.display_included_tax.to_html -%td.actions - = link_to_edit adjustment, no_text: true - = link_to_delete adjustment, no_text: true \ No newline at end of file diff --git a/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_head.html.haml.deface b/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_head.html.haml.deface deleted file mode 100644 index 6da264865a..0000000000 --- a/app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_head.html.haml.deface +++ /dev/null @@ -1,8 +0,0 @@ -/ replace_contents "[data-hook='adjustmment_head']" - -%tr - %th= "#{t('spree.date')}/#{t('spree.time')}" - %th= t(:description) - %th= t(:amount) - %th= t(:included_tax) - %th.actions diff --git a/app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface b/app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface deleted file mode 100644 index fc8f7e0483..0000000000 --- a/app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface +++ /dev/null @@ -1 +0,0 @@ -/ remove "tr:nth-child(4)" diff --git a/app/views/spree/admin/adjustments/_adjustments_table.html.haml b/app/views/spree/admin/adjustments/_adjustments_table.html.haml index 1cfe28b46e..7b916f5aee 100644 --- a/app/views/spree/admin/adjustments/_adjustments_table.html.haml +++ b/app/views/spree/admin/adjustments/_adjustments_table.html.haml @@ -1,27 +1,22 @@ %table.index{"data-hook" => "adjustments"} %thead{"data-hook" => "adjustmment_head"} %tr - %th= "#{Spree.t('date')}/#{Spree.t('time')}" - %th= Spree.t(:description) - %th= Spree.t(:amount) - %th= Spree.t(:state) - %th.actionss + %th= "#{t('spree.date')}/#{t('spree.time')}" + %th= t(:description) + %th= t(:amount) + %th= t(:included_tax) + %th.actions %tbody - @collection.each do |adjustment| - @edit_url = edit_admin_order_adjustment_path(@order, adjustment) - @delete_url = admin_order_adjustment_path(@order, adjustment) - %tr{:class => "#{cycle('odd', 'even')}", "data-hook" => "adjustment_row", :id => "#{spree_dom_id(adjustment)}"} - %td.align-center= pretty_time(adjustment.created_at) - %td.align-center= adjustment.label - %td.align-center= adjustment.display_amount.to_html - %td.align-center= adjustment_state(adjustment) - %td.actions - = link_to_edit adjustment, :no_text => true - = link_to_delete adjustment, :no_text => true - = link_to_toggle_adjustment_state @order, adjustment, :no_text => true - %tr - %td.align-center{:colspan => "4"} - = button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), :method => :get -   - \#{button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), :method => :get} - %td.actions   + - tr_class = cycle('odd', 'even') + - tr_id = spree_dom_id(adjustment) + %tr{:class => tr_class, "data-hook" => "adjustment_row", :id => tr_id} + %td.align-center.created_at= pretty_time(adjustment.created_at) + %td.align-center.label= adjustment.label + %td.align-center.amount= adjustment.display_amount.to_html + %td.align-center.included-tax= adjustment.display_included_tax.to_html + %td.actions + = link_to_edit adjustment, no_text: true + = link_to_delete adjustment, no_text: true