diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss index 37b1ca7e92..0e075ccc90 100644 --- a/app/assets/stylesheets/admin/all.scss +++ b/app/assets/stylesheets/admin/all.scss @@ -17,4 +17,5 @@ @import 'variables'; @import 'components/*'; +@import 'pages/*'; @import '*'; diff --git a/app/assets/stylesheets/admin/pages/order_edit_form.css.scss b/app/assets/stylesheets/admin/pages/order_edit_form.css.scss new file mode 100644 index 0000000000..8b2fcd81c3 --- /dev/null +++ b/app/assets/stylesheets/admin/pages/order_edit_form.css.scss @@ -0,0 +1,5 @@ +// Hides the split button introduced by spree in the order form +// We only have one stock location in OFN so it's meaningless to split the order between stock locations +table td.actions [class*='icon-'].split-item { + display: none; +} diff --git a/app/controllers/admin/contents_controller.rb b/app/controllers/admin/contents_controller.rb index 26a6493f95..44569a42e1 100644 --- a/app/controllers/admin/contents_controller.rb +++ b/app/controllers/admin/contents_controller.rb @@ -18,7 +18,7 @@ module Admin flash[:success] = t(:successfully_updated, :resource => I18n.t('admin.contents.edit.your_content')) - redirect_to main_app.edit_admin_content_path + redirect_to main_app.edit_admin_contents_path end private 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 new file mode 100644 index 0000000000..fc8f7e0483 --- /dev/null +++ b/app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface @@ -0,0 +1 @@ +/ remove "tr:nth-child(4)" diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface deleted file mode 100644 index 77c808315b..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.cache_settings.edit.title'), main_app.edit_admin_cache_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface deleted file mode 100644 index 58ba1fc824..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface +++ /dev/null @@ -1,3 +0,0 @@ -/ insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li= link_to t('admin.contents.edit.title'), main_app.edit_admin_content_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_invoice_settings.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_invoice_settings.html.haml.deface deleted file mode 100644 index d814050cea..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_invoice_settings.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -// insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.invoice_settings.edit.title'), main_app.edit_admin_invoice_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_matomo_settings.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_matomo_settings.html.haml.deface deleted file mode 100644 index b8aeabf3ae..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_matomo_settings.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -// insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.matomo_settings.edit.title'), main_app.edit_admin_matomo_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_stripe_connect_settings.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_stripe_connect_settings.html.haml.deface deleted file mode 100644 index 90b76643ee..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_stripe_connect_settings.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -// insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.stripe_connect_settings.edit.title'), main_app.edit_admin_stripe_connect_settings_path diff --git a/app/views/admin/contents/edit.html.haml b/app/views/admin/contents/edit.html.haml index e0bdb0adc0..21ce8f52fd 100644 --- a/app/views/admin/contents/edit.html.haml +++ b/app/views/admin/contents/edit.html.haml @@ -3,7 +3,7 @@ - content_for :page_title do = t('.title') -= form_tag main_app.admin_content_path, method: :put, multipart: true do += form_tag main_app.admin_contents_path, method: :put, multipart: true do #preferences - @preference_sections.each do |preference_section| = render 'fieldset', name: preference_section[:name], preferences: preference_section[:preferences] @@ -11,4 +11,4 @@ .form-buttons.filter-actions.actions{"data-hook" => "buttons"} = button t(:update), 'icon-refresh' %span.or= t(:or) - = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_content_path, class: 'button' + = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_contents_path, class: 'button' diff --git a/app/views/spree/admin/shared/_configuration_menu.html.haml b/app/views/spree/admin/shared/_configuration_menu.html.haml new file mode 100644 index 0000000000..76bc3cdadd --- /dev/null +++ b/app/views/spree/admin/shared/_configuration_menu.html.haml @@ -0,0 +1,28 @@ +- content_for :sidebar_title do + = Spree.t(:configurations) + +- content_for :sidebar do + %nav.menu + %ul.sidebar + = configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path + - if Spree::Config[:override_actionmailer_config] + = configurations_sidebar_menu_item Spree.t(:mail_method_settings), edit_admin_mail_method_path + = configurations_sidebar_menu_item Spree.t(:image_settings), edit_admin_image_settings_path + = configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path + = configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path + = configurations_sidebar_menu_item Spree.t(:tax_settings), edit_admin_tax_settings_path + = configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path + = configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path + - if Spree::Config[:default_country_id] + = configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(Spree::Config[:default_country_id]) + = configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path + = configurations_sidebar_menu_item Spree.t(:taxonomies), admin_taxonomies_path + = configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path + = configurations_sidebar_menu_item Spree.t(:shipping_categories), admin_shipping_categories_path + = configurations_sidebar_menu_item t(:enterprise_fees), main_app.admin_enterprise_fees_path + = configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path + = configurations_sidebar_menu_item t('admin.cache_settings.edit.title'), main_app.edit_admin_cache_settings_path + = configurations_sidebar_menu_item t('admin.contents.edit.title'), main_app.edit_admin_contents_path + = configurations_sidebar_menu_item t('admin.invoice_settings.edit.title'), main_app.edit_admin_invoice_settings_path + = configurations_sidebar_menu_item t('admin.matomo_settings.edit.title'), main_app.edit_admin_matomo_settings_path + = configurations_sidebar_menu_item t('admin.stripe_connect_settings.edit.title'), main_app.edit_admin_stripe_connect_settings_path diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 1bd72d4fdd..130cbe0d76 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -68,7 +68,7 @@ Openfoodnetwork::Application.routes.draw do get :map_by_tag, on: :collection end - resource :content + resource :contents resource :cache_settings diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb index ea501020d7..64d7ba0d86 100644 --- a/spec/features/admin/orders_spec.rb +++ b/spec/features/admin/orders_spec.rb @@ -285,6 +285,11 @@ feature %q{ end end + scenario "cannot split the order in different stock locations" do + # There's only 1 stock location in OFN, so the split functionality that comes with spree should be hidden + expect(page).to_not have_selector '.split-item' + end + scenario "can edit shipping method" do expect(page).to_not have_content different_shipping_method.name