From d8ae97f923d19f06b7e6200755a05b9fe17f7ee9 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 20:53:24 +0100 Subject: [PATCH] Move spree/admin/adjustments/_form/add_tax_rate deface to view --- .../_form/add_tax_rate.html.haml.deface | 6 ------ app/views/spree/admin/adjustments/_form.html.haml | 15 ++++----------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 app/overrides/spree/admin/adjustments/_form/add_tax_rate.html.haml.deface diff --git a/app/overrides/spree/admin/adjustments/_form/add_tax_rate.html.haml.deface b/app/overrides/spree/admin/adjustments/_form/add_tax_rate.html.haml.deface deleted file mode 100644 index a37acc1030..0000000000 --- a/app/overrides/spree/admin/adjustments/_form/add_tax_rate.html.haml.deface +++ /dev/null @@ -1,6 +0,0 @@ -/ replace_contents "[data-hook='admin_adjustment_form_fields']" - -- if @adjustment.new_record? - = render 'new_form', f: f -- else - = render 'edit_form', f: f diff --git a/app/views/spree/admin/adjustments/_form.html.haml b/app/views/spree/admin/adjustments/_form.html.haml index 59862ccdb3..6f0e2236b0 100644 --- a/app/views/spree/admin/adjustments/_form.html.haml +++ b/app/views/spree/admin/adjustments/_form.html.haml @@ -1,12 +1,5 @@ .row{"data-hook" => "admin_adjustment_form_fields"} - .alpha.three.columns - = f.field_container :amount do - = f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) - = text_field :adjustment, :amount, :class => 'fullwidth' - = f.error_message_on :amount - - .omega.nine.columns - = f.field_container :label do - = f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) - = text_field :adjustment, :label, :class => 'fullwidth' - = f.error_message_on :label + - if @adjustment.new_record? + = render 'new_form', f: f + - else + = render 'edit_form', f: f