From 8a59e06d3663ec14251c162708f6a84644340b3b Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 25 Feb 2019 16:42:22 +0000 Subject: [PATCH 1/5] Remove buttons 'open/close all adjustments' from order adjustments edit page We may re-add this feature in the future, we are not introducing the capacity to open/close adjustments in OFN. See https://github.com/openfoodfoundation/openfoodnetwork/issues/1830 for context --- .../remove_adjustments_actions.html.haml.deface | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/overrides/spree/admin/adjustments/_adjustments_table/remove_adjustments_actions.html.haml.deface 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)" From ebf825e349275a788b3fbf9cf7fe142bfeec2f11 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 25 Feb 2019 17:18:23 +0000 Subject: [PATCH 2/5] De-deface configuration menu Remove stock locations and stock transfers from the menu --- .../add_accounts_and_billing.html.haml.deface | 4 --- ...iness_model_configuration.html.haml.deface | 4 --- .../add_caching.html.haml.deface | 4 --- .../add_content.html.haml.deface | 3 -- .../add_invoice_settings.html.haml.deface | 4 --- .../add_matomo_settings.html.haml.deface | 4 --- ...d_stripe_connect_settings.html.haml.deface | 4 --- .../shared/_configuration_menu.html.haml | 30 +++++++++++++++++++ 8 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_invoice_settings.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_matomo_settings.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_configuration_menu/add_stripe_connect_settings.html.haml.deface create mode 100644 app/views/spree/admin/shared/_configuration_menu.html.haml diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface deleted file mode 100644 index eb6ab7c01b..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -// insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.accounts_and_billing_settings.edit.accounts_and_billing'), main_app.edit_admin_accounts_and_billing_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface deleted file mode 100644 index 32d0edfda1..0000000000 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -// insert_bottom "[data-hook='admin_configurations_sidebar_menu']" - -%li - = link_to t('admin.business_model_configuration.edit.business_model_configuration'), main_app.edit_admin_business_model_configuration_path 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 c320e072c0..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.show.title'), main_app.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/spree/admin/shared/_configuration_menu.html.haml b/app/views/spree/admin/shared/_configuration_menu.html.haml new file mode 100644 index 0000000000..fd1dd888d7 --- /dev/null +++ b/app/views/spree/admin/shared/_configuration_menu.html.haml @@ -0,0 +1,30 @@ +- 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.show.title'), main_app.admin_cache_settings_path + = configurations_sidebar_menu_item t('admin.contents.edit.title'), main_app.edit_admin_content_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 + = configurations_sidebar_menu_item t('admin.accounts_and_billing_settings.edit.accounts_and_billing'), main_app.edit_admin_accounts_and_billing_settings_path + = configurations_sidebar_menu_item t('admin.business_model_configuration.edit.business_model_configuration'), main_app.edit_admin_business_model_configuration_path From 15456577a33cdfa2e4d5d50512ca6b51685e890f Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 25 Feb 2019 22:31:40 +0000 Subject: [PATCH 3/5] Remove the button that enables user to split an order between stock locations There's only one stock location in OFN so this feature is not useful at this point --- .../admin/orders/controllers/order_controller.js.coffee | 4 ++++ spec/features/admin/orders_spec.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee index 822e81eb49..1ba6d96aed 100644 --- a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee @@ -24,3 +24,7 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl for shop in $scope.shops shop.disabled = !$scope.distributorHasOrderCycles(shop) + + # 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 + $('.split-item').hide() 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 From 37685c8107ac1cc59ef9e3f866e70cbbe813c111 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 26 Feb 2019 12:34:07 +0000 Subject: [PATCH 4/5] Move the code that hides the split order button from js to css --- .../admin/orders/controllers/order_controller.js.coffee | 4 ---- app/assets/stylesheets/admin/all.scss | 1 + app/assets/stylesheets/admin/pages/order_edit_form.css.scss | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/admin/pages/order_edit_form.css.scss diff --git a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee index 1ba6d96aed..822e81eb49 100644 --- a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee @@ -24,7 +24,3 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl for shop in $scope.shops shop.disabled = !$scope.distributorHasOrderCycles(shop) - - # 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 - $('.split-item').hide() diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss index 4a16154bf4..3c980bdd1c 100644 --- a/app/assets/stylesheets/admin/all.scss +++ b/app/assets/stylesheets/admin/all.scss @@ -16,4 +16,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; +} From 77655bfffbdf99c11c564010b222c5ab6b83f1bd Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 12 Mar 2019 19:10:49 +0000 Subject: [PATCH 5/5] Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu See the menu is_active code here: https://github.com/openfoodfoundation/spree/blob/f55722b38db7e706a8521c9091a0e00119bb4d20/backend/app/helpers/spree/admin/navigation_helper.rb#L145 --- app/controllers/admin/contents_controller.rb | 2 +- app/views/admin/contents/edit.html.haml | 4 ++-- app/views/spree/admin/shared/_configuration_menu.html.haml | 2 +- config/routes/admin.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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/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 index b7fc2f5cdc..76bc3cdadd 100644 --- a/app/views/spree/admin/shared/_configuration_menu.html.haml +++ b/app/views/spree/admin/shared/_configuration_menu.html.haml @@ -22,7 +22,7 @@ = 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_content_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