From 16506c44fa8aee0a588c01a253b78b023a8f3a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= Date: Mon, 23 Dec 2024 08:02:58 +0100 Subject: [PATCH] Add spinner --- app/helpers/admin/enterprises_helper.rb | 7 +++++-- .../admin/enterprises/form/_primary_details.html.haml | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/helpers/admin/enterprises_helper.rb b/app/helpers/admin/enterprises_helper.rb index db7d78d5d54..327dd5abcc6 100644 --- a/app/helpers/admin/enterprises_helper.rb +++ b/app/helpers/admin/enterprises_helper.rb @@ -28,6 +28,7 @@ def enterprise_side_menu_items(enterprise) show_connected_apps = can?(:manage_connected_apps, enterprise) && feature?(:connected_apps, spree_current_user, enterprise) && Spree::Config.connected_apps_enabled.present? + show_admin_only = spree_current_user.admin? build_enterprise_side_menu_items( is_shop:, @@ -36,6 +37,7 @@ def enterprise_side_menu_items(enterprise) show_payment_methods:, show_enterprise_fees:, show_connected_apps:, + show_admin_only:, ) end @@ -52,11 +54,12 @@ def build_enterprise_side_menu_items( show_shipping_methods:, show_payment_methods:, show_enterprise_fees:, - show_connected_apps: + show_connected_apps:, + show_admin_only: ) [ { name: 'primary_details', icon_class: "icon-home", show: true, selected: 'selected' }, - { name: 'admin_only', icon_class: "icon-gear", show: spree_current_user.admin? }, + { name: 'admin_only', icon_class: "icon-gear", show: show_admin_only }, { name: 'address', icon_class: "icon-map-marker", show: true }, { name: 'contact', icon_class: "icon-phone", show: true }, { name: 'social', icon_class: "icon-twitter", show: true }, diff --git a/app/views/admin/enterprises/form/_primary_details.html.haml b/app/views/admin/enterprises/form/_primary_details.html.haml index 27965fb421f..7ba7a48eabb 100644 --- a/app/views/admin/enterprises/form/_primary_details.html.haml +++ b/app/views/admin/enterprises/form/_primary_details.html.haml @@ -18,6 +18,8 @@ .five.columns.omega = f.check_box :is_primary_producer, data: { action: "change->primary-details#primaryProducerChanged" } = f.label :is_primary_producer, t('.producer') + %span{ style: "width: 30px; height: 30px;", class: "hidden", data: { "primary-details-target": "spinner" } } + = render partial: "components/admin_spinner" .row .three.columns.alpha %label= t('.visible_in_search')