diff --git a/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface b/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface new file mode 100644 index 0000000000..613ffe010b --- /dev/null +++ b/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface @@ -0,0 +1 @@ +remove "div.clear" \ No newline at end of file diff --git a/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface b/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface new file mode 100644 index 0000000000..05737bcbf6 --- /dev/null +++ b/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface @@ -0,0 +1,46 @@ +/ replace "div[data-hook='admin_payment_method_form_fields']" + +%div.alpha.eleven.columns + .row + .alpha.three.columns + = label_tag nil, t(:name) + .omega.eight.columns + = text_field :payment_method, :name, :class => 'fullwidth' + .row + .alpha.three.columns + = label_tag nil, t(:description) + .omega.eight.columns + = text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} + - if spree_current_user.admin? + .row + .alpha.three.columns + = label_tag nil, t(:environment) + .omega.eight.columns + = collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) + .row + .alpha.three.columns + = label_tag nil, t(:display) + .omega.eight.columns + = select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) + .row + .alpha.three.columns + = label_tag nil, t(:active) + .two.columns + = radio_button :payment_method, :active, true +   + = label_tag nil, t(:say_yes) + .omega.six.columns + = radio_button :payment_method, :active, false +   + = label_tag nil, t(:say_no) + + %fieldset.alpha.eleven.columns.no-border-bottom#gateway_fields + %legend{ align="center"} + = t(:gateway) + #preference-settings.field{"data-hook" => ""} + = f.label :type, t(:provider) + = collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth'}) + - unless @object.new_record? + = preference_fields(@object, f) + - if @object.respond_to?(:preferences) + #gateway-settings-warning.info.warning= t(:provider_settings_warning) \ No newline at end of file diff --git a/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface index 74fc957e71..3d28a1325e 100644 --- a/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface +++ b/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface @@ -1,3 +1,5 @@ / insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" -= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } \ No newline at end of file +.one.column   += render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } +.clear \ No newline at end of file diff --git a/app/overrides/spree/admin/payment_methods/new/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/payment_methods/new/add_hubs_sidebar.html.haml.deface index 74fc957e71..3d28a1325e 100644 --- a/app/overrides/spree/admin/payment_methods/new/add_hubs_sidebar.html.haml.deface +++ b/app/overrides/spree/admin/payment_methods/new/add_hubs_sidebar.html.haml.deface @@ -1,3 +1,5 @@ / insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" -= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } \ No newline at end of file +.one.column   += render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } +.clear \ No newline at end of file diff --git a/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface b/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface index 5d0fce3841..190cff1a17 100644 --- a/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface +++ b/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface @@ -1,6 +1,6 @@ / replace "div[data-hook='admin_shipping_method_form_fields']" -.alpha.twelve.columns{"data-hook" => "admin_shipping_method_form_fields"} +.alpha.eleven.columns{"data-hook" => "admin_shipping_method_form_fields"} .row .alpha.three.columns = f.label :name, t(:name) @@ -41,7 +41,7 @@ = f.radio_button :require_ship_address, true   = f.label :delivery, t(:delivery) - .six.columns + .omega.six.columns = f.radio_button :require_ship_address, false   = f.label :pick_up, t(:pick_up) diff --git a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface index 74fc957e71..df31849114 100644 --- a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface +++ b/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface @@ -1,3 +1,4 @@ / insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" +.one.column   = render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } \ No newline at end of file diff --git a/app/overrides/spree/admin/shipping_methods/new/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/shipping_methods/new/add_hubs_sidebar.html.haml.deface index 74fc957e71..df31849114 100644 --- a/app/overrides/spree/admin/shipping_methods/new/add_hubs_sidebar.html.haml.deface +++ b/app/overrides/spree/admin/shipping_methods/new/add_hubs_sidebar.html.haml.deface @@ -1,3 +1,4 @@ / insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" +.one.column   = render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { :f => f } \ No newline at end of file