raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view

Browse Source
This commit is contained in:
luisramos0
2019-07-16 21:01:08 +01:00
parent d8ae97f923
commit f9861fee79
4 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_body.html.haml.deface
View File

@@ -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

8
app/overrides/spree/admin/adjustments/_adjustments_table/add_tax_to_head.html.haml.deface
View File

@@ -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

1
app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface
View File

@@ -1 +0,0 @@
/ remove "tr:nth-child(4)"

35
app/views/spree/admin/adjustments/_adjustments_table.html.haml
View File

@@ -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