Merge pull request #13964 from mkllnk/flaky-spec

Stabilise actions_spec

.github/ISSUE_TEMPLATE/release.md

@@ -27,7 +27,12 @@ assignees: ''
 - [ ] Move this issue to Test Ready.
 - [ ] Notify `@testers` in [#testing].
 - [ ] Test build: [Deploy to Staging] with release tag.
-- [ ] Notify a deployer to deploy it
+    - [ ] Map is displayed correctly. Address changes are reflected in the map.
+    - [ ] Stripe with no authentication card: `4242424242424242` as shopper and as Admin. Order confirmation displays order as "Paid".
+    - [ ] Stripe with Authentication required card: `4000002760003184` as shopper and as Admin. As admin, check authorization through customer account `/account#/transactions` and email.
+    - [ ] Pay with Paypal.
+    - [ ] Order on mobile.
+- [ ] Notify a deployer to deploy it.
 
 ## 3. Deployment at beginning of week
 
@@ -57,4 +62,4 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 [Create issue]: https://github.com/openfoodfoundation/openfoodnetwork/issues/new?assignees=&labels=&projects=&template=release.md&title=Release
 [#delivery-circle]: https://openfoodnetwork.slack.com/archives/C01T75H6G0Z
 [Transifex Client]: https://developers.transifex.com/docs/cli
-[minor or major breaking changes]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?q=label%3A%22breaking+change%22%2C%22major+breaking+change%22
+[minor or major breaking changes]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?q=label%3A%22breaking+change%22%2C%22major+breaking+change%22

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
+        uses: supercharge/redis-github-action@1.8.1
         with:
           redis-version: 6
 
@@ -124,7 +124,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
+        uses: supercharge/redis-github-action@1.8.1
         with:
           redis-version: 6
 
@@ -211,7 +211,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
+        uses: supercharge/redis-github-action@1.8.1
         with:
           redis-version: 6
 
@@ -290,7 +290,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
+        uses: supercharge/redis-github-action@1.8.1
         with:
           redis-version: 6
 

Gemfile.lock

@@ -112,7 +112,7 @@ GEM
       rails-html-sanitizer (~> 1.6)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (3.0.2)
+    active_storage_validations (3.0.3)
       activejob (>= 6.1.4)
       activemodel (>= 6.1.4)
       activestorage (>= 6.1.4)
@@ -170,7 +170,7 @@ GEM
     addressable (2.8.8)
       public_suffix (>= 2.0.2, < 8.0)
     aes_key_wrap (1.1.0)
-    afm (0.2.2)
+    afm (1.0.0)
     angular-rails-templates (1.4.0)
       railties (>= 5.0, < 8.2)
       sprockets (>= 3.0, < 5)
@@ -210,12 +210,12 @@ GEM
     bigdecimal (3.3.1)
     bindata (2.5.1)
     bindex (0.8.1)
-    bootsnap (1.19.0)
+    bootsnap (1.22.0)
       msgpack (~> 1.2)
     bugsnag (6.28.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (8.0.8)
+    bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     cable_ready (5.0.6)
@@ -242,7 +242,7 @@ GEM
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
-    cgi (0.5.0)
+    cgi (0.5.1)
     childprocess (5.0.0)
     choice (0.2.0)
     chronic (0.10.2)
@@ -257,7 +257,7 @@ GEM
     combine_pdf (1.0.31)
       matrix
       ruby-rc4 (>= 0.1.5)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
     cookiejar (0.3.4)
     crack (1.0.1)
@@ -267,9 +267,9 @@ GEM
     css_parser (1.21.1)
       addressable
     csv (3.3.5)
-    cuprite (0.15)
+    cuprite (0.17)
       capybara (~> 3.0)
-      ferrum (~> 0.14.0)
+      ferrum (~> 0.17.0)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.2)
@@ -278,7 +278,7 @@ GEM
     database_cleaner-core (2.0.1)
     datafoodconsortium-connector (1.2.0)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
-    date (3.5.0)
+    date (3.5.1)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -315,7 +315,7 @@ GEM
       activemodel
     erb (6.0.1)
     erubi (1.13.1)
-    et-orbi (1.3.0)
+    et-orbi (1.4.0)
       tzinfo
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
@@ -326,19 +326,22 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.9.0)
+    faraday (2.14.1)
-      faraday-net_http (>= 2.0, < 3.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-follow_redirects (0.4.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.1.1)
+    faraday-net_http (3.4.2)
-      net-http
+      net-http (~> 0.5)
-    ferrum (0.14)
+    ferrum (0.17.1)
       addressable (~> 2.5)
+      base64 (~> 0.2)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
-      websocket-driver (>= 0.6, < 0.8)
+      websocket-driver (~> 0.7)
     ffaker (2.25.0)
-    ffi (1.17.2)
+    ffi (1.17.3)
     flipper (1.3.6)
       concurrent-ruby (< 2)
     flipper-active_record (1.3.6)
@@ -369,8 +372,8 @@ GEM
     foreman (0.90.0)
       thor (~> 1.4)
     formatador (0.2.5)
-    fugit (1.11.1)
+    fugit (1.12.1)
-      et-orbi (~> 1, >= 1.2.11)
+      et-orbi (~> 1.4)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
@@ -396,12 +399,13 @@ GEM
       sysexits (~> 1.1)
     hashdiff (1.2.1)
     hashery (2.1.2)
-    hashie (5.0.0)
+    hashie (5.1.0)
+      logger
     highline (3.1.2)
       reline
     htmlentities (4.4.2)
     http_parser.rb (0.8.0)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -425,10 +429,11 @@ GEM
       activerecord (>= 3.0)
     invisible_captcha (2.3.0)
       rails (>= 5.2)
-    io-console (0.8.1)
+    io-console (0.8.2)
     ipaddress (0.8.3)
-    irb (1.15.3)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -438,7 +443,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (2.15.2)
+    json (2.18.1)
     json-canonicalization (1.0.0)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
@@ -464,7 +469,7 @@ GEM
       activesupport (>= 4.2)
     jwt (2.10.2)
       base64
-    knapsack_pro (8.4.0)
+    knapsack_pro (9.2.2)
       rake
     language_server-protocol (3.17.0.5)
     launchy (3.0.0)
@@ -474,11 +479,12 @@ GEM
       launchy (>= 2.2, < 4)
     link_header (0.0.8)
     lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -501,7 +507,8 @@ GEM
       logger
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.26.2)
+    minitest (6.0.1)
+      prism (~> 1.5)
     monetize (1.13.0)
       money (~> 6.12)
     money (6.16.0)
@@ -510,8 +517,8 @@ GEM
     multi_json (1.17.0)
     multi_xml (0.6.0)
     mutex_m (0.3.0)
-    net-http (0.7.0)
+    net-http (0.9.1)
-      uri
+      uri (>= 0.11.1)
     net-imap (0.5.12)
       date
       net-protocol
@@ -523,7 +530,8 @@ GEM
       net-protocol
     newrelic_rpm (9.24.0)
     nio4r (2.7.5)
-    nokogiri (1.18.10)
+    nokogiri (1.19.1)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri-html5-inference (0.3.0)
       nokogiri (~> 1.14)
@@ -539,7 +547,7 @@ GEM
       logger
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.2)
+    omniauth-rails_csrf_protection (2.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth_openid_connect (0.8.0)
@@ -568,7 +576,7 @@ GEM
     parallel (1.27.0)
     paranoia (2.6.4)
       activerecord (>= 5.1, < 7.2)
-    parser (3.3.10.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -576,7 +584,7 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.15.0)
+    pdf-reader (2.15.1)
       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (>= 0.2.1, < 2)
       hashery (~> 2.0)
@@ -586,15 +594,16 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.7.0)
+    prism (1.9.0)
     private_address_check (0.5.0)
-    pry (0.15.2)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.0)
+    public_suffix (7.0.2)
     puffing-billy (4.0.2)
       addressable (~> 2.5)
       em-http-request (~> 1.1, >= 1.1.0)
@@ -610,7 +619,7 @@ GEM
       railties (>= 4.2)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.22)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-oauth2 (2.3.0)
@@ -684,7 +693,7 @@ GEM
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rdf (3.3.4)
       bcp47_spec (~> 0.2)
@@ -693,7 +702,7 @@ GEM
       logger (~> 1.5)
       ostruct (~> 0.6)
       readline (~> 0.0)
-    rdoc (7.0.1)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -702,16 +711,16 @@ GEM
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.26.1)
+    redis-client (0.26.4)
       connection_pool
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.2.0)
-      actionpack (>= 5.2)
+      actionpack (>= 7.0)
-      railties (>= 5.2)
+      railties (>= 7.0)
     rexml (3.4.4)
     roadie (5.2.1)
       css_parser (~> 1.4)
@@ -766,7 +775,7 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.81.7)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -774,25 +783,25 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)
@@ -807,8 +816,8 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
-    rufus-scheduler (3.8.2)
+    rufus-scheduler (3.9.2)
-      fugit (~> 1.1, >= 1.1.6)
+      fugit (~> 1.1, >= 1.11.1)
     rugged (1.9.0)
     sanitize (7.0.0)
       crass (~> 1.0.2)
@@ -830,10 +839,9 @@ GEM
       logger
       rack (>= 2.2.4, < 3.3)
       redis-client (>= 0.23.0, < 1)
-    sidekiq-scheduler (5.0.3)
+    sidekiq-scheduler (6.0.1)
       rufus-scheduler (~> 3.2)
-      sidekiq (>= 6, < 8)
+      sidekiq (>= 7.3, < 9)
-      tilt (>= 1.4.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -844,7 +852,7 @@ GEM
       caxlsx (<= 4.0)
       csv
       rodf
-    spring (4.4.0)
+    spring (4.4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-rubocop (0.4.0)
@@ -885,14 +893,14 @@ GEM
       faraday (~> 2.0)
       faraday-follow_redirects
     sysexits (1.2.0)
-    taler (0.1.0)
+    taler (0.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.4.0)
+    thor (1.5.0)
     thread-local (1.1.0)
-    tilt (2.6.1)
+    tilt (2.7.0)
-    timeout (0.4.4)
+    timeout (0.6.0)
     tsort (0.2.0)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
@@ -914,7 +922,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
-    uniform_notifier (1.17.0)
+    uniform_notifier (1.18.0)
     uri (1.1.1)
     valid_email2 (5.2.3)
       activemodel (>= 3.2)
@@ -952,7 +960,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.2)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

app/assets/javascripts/darkswarm/controllers/home_controller.js.coffee

@@ -1,5 +0,0 @@
-angular.module('Darkswarm').controller "HomeCtrl", ($scope) ->
-  $scope.brandStoryExpanded = false
-
-  $scope.toggleBrandStory = ->
-    $scope.brandStoryExpanded = !$scope.brandStoryExpanded

app/components/searchable_dropdown_component.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 class SearchableDropdownComponent < ViewComponent::Base
-  REMOVED_SEARCH_PLUGIN = { 'tom-select-options-value': '{ "plugins": [] }' }.freeze
   MINIMUM_OPTIONS_FOR_SEARCH_FIELD = 11 # at least 11 options are required for the search field
 
   def initialize(
-    form:,
     name:,
     options:,
     selected_option:,
-    placeholder_value:,
+    form: nil,
+    placeholder_value: '',
     include_blank: false,
     aria_label: '',
+    multiple: false,
+    remote_url: nil,
     other_attrs: {}
   )
     @f = form
@@ -21,13 +22,15 @@ class SearchableDropdownComponent < ViewComponent::Base
     @placeholder_value = placeholder_value
     @include_blank = include_blank
     @aria_label = aria_label
+    @multiple = multiple
+    @remote_url = remote_url
     @other_attrs = other_attrs
   end
 
   private
 
   attr_reader :f, :name, :options, :selected_option, :placeholder_value, :include_blank,
-              :aria_label, :other_attrs
+              :aria_label, :multiple, :remote_url, :other_attrs
 
   def classes
     "fullwidth #{'no-input' if remove_search_plugin?}"
@@ -36,11 +39,33 @@ class SearchableDropdownComponent < ViewComponent::Base
   def data
     {
       controller: "tom-select",
-      'tom-select-placeholder-value': placeholder_value
+      'tom-select-placeholder-value': placeholder_value,
-    }.merge(remove_search_plugin? ? REMOVED_SEARCH_PLUGIN : {})
+      'tom-select-options-value': tom_select_options_value,
+      'tom-select-remote-url-value': remote_url,
+    }
+  end
+
+  def tom_select_options_value
+    plugins = []
+    plugins << 'virtual_scroll' if @remote_url.present?
+    plugins << 'dropdown_input' unless remove_search_plugin?
+    plugins << 'remove_button' if multiple
+
+    {
+      plugins:,
+      maxItems: multiple ? nil : 1,
+    }
+  end
+
+  def uses_form_builder?
+    f.present?
   end
 
   def remove_search_plugin?
-    @remove_search_plugin ||= options.count < MINIMUM_OPTIONS_FOR_SEARCH_FIELD
+    # Remove the search plugin when:
+    # - the select is multiple (it already includes a search field), or
+    # - there is no remote URL and the options are below the search threshold
+    @remove_search_plugin ||= multiple ||
+                              (@remote_url.nil? && options.count < MINIMUM_OPTIONS_FOR_SEARCH_FIELD)
   end
 end

app/components/searchable_dropdown_component/searchable_dropdown_component.html.haml

@@ -1 +1,4 @@
-= f.select name, options_for_select(options, selected_option), { include_blank: }, class: classes, data:, 'aria-label': aria_label, **other_attrs
+- if uses_form_builder?
+  = f.select name, options, { selected: selected_option, include_blank:, multiple: }, class: classes, data:, 'aria-label': aria_label, **other_attrs
+- else
+  = select_tag name, options_for_select(options, selected_option), include_blank:, multiple:, class: classes, data:, 'aria-label': aria_label, **other_attrs

app/controllers/admin/products_v3_controller.rb

@@ -28,7 +28,7 @@ module Admin
         flash[:success] = I18n.t('admin.products_v3.bulk_update.success')
         redirect_to [:index,
                      { page: @page, per_page: @per_page, search_term: @search_term,
-                       producer_id: @producer_id, category_id: @category_id }]
+                       producer_id: @producer_id, category_id: @category_id, tags_name_in: @tags }]
       elsif product_set.errors.present?
         @error_counts = { saved: product_set.saved_count, invalid: product_set.invalid.count }
 
@@ -120,7 +120,7 @@ module Admin
       @search_term = params[:search_term] || params[:_search_term]
       @producer_id = params[:producer_id] || params[:_producer_id]
       @category_id = params[:category_id] || params[:_category_id]
-      @tags = params[:tags_name_in] || params[:_tags_name_in]
+      @tags = params[:tags_name_in] || []
     end
 
     def init_pagination_params

app/controllers/admin/reports_controller.rb

@@ -4,6 +4,7 @@ module Admin
   class ReportsController < Spree::Admin::BaseController
     include ActiveStorage::SetCurrent
     include ReportsActions
+    include Reports::AjaxSearch
 
     helper ReportsHelper
 

app/controllers/concerns/reports/ajax_search.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module Reports
+  module AjaxSearch
+    extend ActiveSupport::Concern
+
+    def search_enterprise_fees
+      report = report_class.new(spree_current_user, params, render: false)
+      fee_ids = enterprise_fee_ids(report.search.result)
+      query = EnterpriseFee.where(id: fee_ids)
+
+      render json: build_search_response(query)
+    end
+
+    def search_enterprise_fee_owners
+      report = report_class.new(spree_current_user, params, render: false)
+      owner_ids = enterprise_fee_owner_ids(report.search.result)
+      query = Enterprise.where(id: owner_ids)
+
+      render json: build_search_response(query)
+    end
+
+    def search_distributors
+      query = frontend_data.distributors
+
+      render json: build_search_response(query)
+    end
+
+    def search_order_cycles
+      query = frontend_data.order_cycles
+
+      render json: build_search_response(query)
+    end
+
+    def search_order_customers
+      query = frontend_data.order_customers
+
+      render json: build_search_response(query)
+    end
+
+    def search_suppliers
+      query = frontend_data.orders_suppliers
+
+      render json: build_search_response(query)
+    end
+
+    private
+
+    def build_search_response(query)
+      page = (params[:page] || 1).to_i
+      per_page = 30
+
+      filtered_query = apply_search_filter(query)
+      total_count = filtered_query.size
+      items = paginated_items(filtered_query, page, per_page)
+      results = format_results(items)
+
+      { results: results, pagination: { more: (page * per_page) < total_count } }
+    end
+
+    def apply_search_filter(query)
+      search_term = params[:q]
+      return query if search_term.blank?
+
+      escaped_search_term = ActiveRecord::Base.sanitize_sql_like(search_term)
+      pattern = "%#{escaped_search_term}%"
+
+      # Handle different model types
+      if query.model == OrderCycle
+        query.where("order_cycles.name ILIKE ?", pattern)
+      elsif query.model == Customer
+        query.where("customers.email ILIKE ?", pattern)
+      else
+        query.where("name ILIKE ?", pattern)
+      end
+    end
+
+    def paginated_items(query, page, per_page)
+      if query.model == Customer
+        query.order(:email).offset((page - 1) * per_page).limit(per_page).pluck(:email, :id)
+      elsif query.model == OrderCycle
+        query.order('order_cycles.orders_close_at DESC')
+          .offset((page - 1) * per_page)
+          .limit(per_page).pluck(
+            :name, :id
+          )
+      else
+        query.order(:name).offset((page - 1) * per_page).limit(per_page).pluck(:name, :id)
+      end
+    end
+
+    def format_results(items)
+      items.map { |label, value| { value:, label: } }
+    end
+
+    def frontend_data
+      @frontend_data ||= Reporting::FrontendData.new(spree_current_user)
+    end
+
+    def enterprise_fee_owner_ids(orders)
+      EnterpriseFee.where(id: enterprise_fee_ids(orders)).select(:enterprise_id)
+    end
+
+    def enterprise_fee_ids(orders)
+      Spree::Adjustment.enterprise_fee.where(order_id: orders.select(:id)).select(:originator_id)
+    end
+  end
+end

app/controllers/spree/admin/payment_methods_controller.rb

@@ -138,7 +138,7 @@ module Spree
 
         providers.delete("Spree::Gateway::StripeSCA") unless show_stripe?
 
-        providers.map(&:constantize)
+        providers
       end
 
       # Show Stripe as an option if enabled, or if the

app/controllers/spree/admin/payments_controller.rb

@@ -95,8 +95,7 @@ module Spree
       private
 
       def load_payment_source
-        if @payment.payment_method.is_a?(Spree::Gateway) &&
+        if @payment.payment_method.is_a?(Gateway::StripeSCA) &&
-           @payment.payment_method.payment_profiles_supported? &&
            params[:card].present? &&
            (params[:card] != 'new')
           @payment.source = CreditCard.find_by(id: params[:card])

app/helpers/checkout_helper.rb

@@ -139,7 +139,7 @@ module CheckoutHelper
   def stripe_card_options(cards)
     cards.map do |cc|
       [
-        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:" \
+        "#{cc.cc_type} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:" \
         "#{cc.month.to_s.rjust(2, '0')}/#{cc.year}", cc.id
       ]
     end

app/helpers/reports_helper.rb

@@ -34,29 +34,8 @@ module ReportsHelper
     end
   end
 
-  def fee_name_options(orders)
-    EnterpriseFee.where(id: enterprise_fee_ids(orders))
-      .pluck(:name, :id)
-  end
-
-  def fee_owner_options(orders)
-    Enterprise.where(id: enterprise_fee_owner_ids(orders))
-      .pluck(:name, :id)
-  end
-
   delegate :currency_symbol, to: :'Spree::Money'
 
-  def enterprise_fee_owner_ids(orders)
-    EnterpriseFee.where(id: enterprise_fee_ids(orders))
-      .pluck(:enterprise_id)
-  end
-
-  def enterprise_fee_ids(orders)
-    Spree::Adjustment.enterprise_fee
-      .where(order_id: orders.map(&:id))
-      .pluck(:originator_id)
-  end
-
   def datepicker_time(datetime)
     datetime = Time.zone.parse(datetime) if datetime.is_a? String
     datetime.strftime('%Y-%m-%d %H:%M')

app/helpers/spree/admin/payment_methods_helper.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module PaymentMethodsHelper
+      def payment_method_type_name(class_name)
+        scope = "spree.admin.payment_methods.providers"
+        key = class_name.demodulize.downcase
+
+        I18n.t(key, scope:)
+      end
+
+      def payment_method_type_options(providers)
+        providers.map { |p| [payment_method_type_name(p), p] }
+      end
+    end
+  end
+end

app/mailers/payment_mailer.rb

@@ -6,11 +6,10 @@ class PaymentMailer < ApplicationMailer
   def authorize_payment(payment)
     @payment = payment
     @order = @payment.order
-    subject = I18n.t('spree.payment_mailer.authorize_payment.subject',
+    @hide_ofn_navigation = @payment.order.distributor.hide_ofn_navigation
-                     distributor: @order.distributor.name)
     I18n.with_locale valid_locale(@order.user) do
       mail(to: @order.email,
-           subject:,
+           subject: default_i18n_subject(distributor: @order.distributor.name),
            reply_to: @order.distributor.contact.email)
     end
   end
@@ -18,11 +17,20 @@ class PaymentMailer < ApplicationMailer
   def authorization_required(payment)
     @order = payment.order
     shop_owner = @order.distributor.owner
-    subject = I18n.t('spree.payment_mailer.authorization_required.subject',
-                     order: @order)
     I18n.with_locale valid_locale(shop_owner) do
-      mail(to: shop_owner.email,
+      mail(to: shop_owner.email, reply_to: @order.email)
-           subject:,
+    end
+  end
+
+  def refund_available(payment, taler_order_status_url)
+    @order = payment.order
+    @shop = @order.distributor.name
+    @amount = payment.display_amount
+    @taler_order_status_url = taler_order_status_url
+
+    I18n.with_locale valid_locale(@order.user) do
+      mail(to: @order.email,
+           subject: default_i18n_subject(shop: @shop),
            reply_to: @order.email)
     end
   end

app/mailers/spree/order_mailer.rb

@@ -11,6 +11,7 @@ module Spree
 
     def cancel_email(order_or_order_id, resend = false)
       @order = find_order(order_or_order_id)
+      @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
       I18n.with_locale valid_locale(@order.user) do
         mail(to: @order.email,
              subject: mail_subject(t('spree.order_mailer.cancel_email.subject'), resend),
@@ -51,6 +52,7 @@ module Spree
 
     def invoice_email(order_or_order_id, options = {})
       @order = find_order(order_or_order_id)
+      @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
       current_user = if options[:current_user_id].present?
                        find_user(options[:current_user_id])
                      end

app/mailers/spree/shipment_mailer.rb

@@ -4,6 +4,7 @@ module Spree
   class ShipmentMailer < ApplicationMailer
     def shipped_email(shipment, delivery:)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
+      @hide_ofn_navigation = @shipment.order.distributor.hide_ofn_navigation
       @delivery = delivery
       @order = @shipment.order
       subject = base_subject

app/mailers/subscription_mailer.rb

@@ -19,6 +19,7 @@ class SubscriptionMailer < ApplicationMailer
     @type = 'empty'
     @changes = changes
     @order = order
+    @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
     send_mail(order)
   end
 
@@ -26,11 +27,13 @@ class SubscriptionMailer < ApplicationMailer
     @type = 'placement'
     @changes = changes
     @order = order
+    @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
     send_mail(order)
   end
 
   def failed_payment_email(order)
     @order = order
+    @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
     send_mail(order)
   end
 

app/models/invoice.rb

@@ -4,7 +4,7 @@ class Invoice < ApplicationRecord
   self.belongs_to_required_by_default = false
 
   belongs_to :order, class_name: 'Spree::Order'
-  serialize :data, Hash, coder: YAML
+  serialize :data, type: Hash, coder: YAML
   before_validation :serialize_order
   after_create :cancel_previous_invoices
   default_scope { order(created_at: :desc) }

app/models/proxy_order.rb

@@ -76,6 +76,7 @@ class ProxyOrder < ApplicationRecord
 
   def cart?
     order&.state == 'complete' &&
+      order_cycle.orders_close_at.present? &&
       order_cycle.orders_close_at > Time.zone.now
   end
 

app/models/report_rendering_options.rb

@@ -4,5 +4,5 @@ class ReportRenderingOptions < ApplicationRecord
   self.belongs_to_required_by_default = false
 
   belongs_to :user, class_name: "Spree::User"
-  serialize :options, Hash, coder: YAML
+  serialize :options, type: Hash, coder: YAML
 end

app/models/spree/ability.rb

@@ -6,6 +6,11 @@ module Spree
   class Ability
     include CanCan::Ability
 
+    REPORTS_SEARCH_ACTIONS = [
+      :search_enterprise_fees, :search_enterprise_fee_owners, :search_distributors,
+      :search_suppliers, :search_order_cycles, :search_order_customers
+    ].freeze
+
     def initialize(user)
       clear_aliased_actions
 
@@ -260,7 +265,8 @@ module Spree
       can [:admin, :index, :import], ::Admin::DfcProductImportsController
 
       # Reports page
-      can [:admin, :index, :show, :create], ::Admin::ReportsController
+      can [:admin, :index, :show, :create, *REPORTS_SEARCH_ACTIONS],
+          ::Admin::ReportsController
       can [:admin, :show, :create, :customers, :orders_and_distributors, :group_buys, :payments,
            :orders_and_fulfillment, :products_and_inventory, :order_cycle_management,
            :packing, :enterprise_fee_summary, :bulk_coop, :suppliers], :report
@@ -392,7 +398,7 @@ module Spree
       end
 
       # Reports page
-      can [:admin, :index, :show, :create], ::Admin::ReportsController
+      can [:admin, :index, :show, :create, *REPORTS_SEARCH_ACTIONS], ::Admin::ReportsController
       can [:admin, :customers, :group_buys, :sales_tax, :payments,
            :orders_and_distributors, :orders_and_fulfillment, :products_and_inventory,
            :order_cycle_management, :xero_invoices, :enterprise_fee_summary, :bulk_coop], :report

app/models/spree/credit_card.rb

@@ -25,9 +25,6 @@ module Spree
 
     scope :with_payment_profile, -> { where.not(gateway_customer_profile_id: nil) }
 
-    # needed for some of the ActiveMerchant gateways (eg. SagePay)
-    alias_attribute :brand, :cc_type
-
     def expiry=(expiry)
       self[:month], self[:year] = expiry.split(" / ")
       self[:year] = "20#{self[:year]}"

app/models/spree/gateway.rb

@@ -5,7 +5,7 @@ module Spree
     acts_as_taggable
     include PaymentMethodDistributors
 
-    delegate :authorize, :purchase, :capture, :void, :credit, to: :provider
+    delegate :authorize, :purchase, :capture, :void, :credit, :refund, to: :provider
 
     validates :name, :type, presence: true
 
@@ -35,6 +35,10 @@ module Spree
     end
 
     def method_missing(method, *)
+      message = "Deprecated delegation of Gateway##{method}"
+      Alert.raise(message)
+      raise message if Rails.env.local?
+
       if @provider.nil? || !@provider.respond_to?(method)
         super
       else
@@ -42,19 +46,15 @@ module Spree
       end
     end
 
-    def payment_profiles_supported?
-      false
-    end
-
     def method_type
       'gateway'
     end
 
     def supports?(source)
       return true unless provider_class.respond_to? :supports?
-      return false unless source.brand
+      return false unless source.cc_type
 
-      provider_class.supports?(source.brand)
+      provider_class.supports?(source.cc_type)
     end
   end
 end

app/models/spree/gateway/stripe_sca.rb

@@ -35,10 +35,6 @@ module Spree
         ActiveMerchant::Billing::StripePaymentIntentsGateway
       end
 
-      def payment_profiles_supported?
-        true
-      end
-
       def stripe_account_id
         StripeAccount.find_by(enterprise_id: preferred_enterprise_id)&.stripe_user_id
       end
@@ -84,7 +80,7 @@ module Spree
       end
 
       # NOTE: this method is required by Spree::Payment::Processing
-      def void(payment_intent_id, _creditcard, gateway_options)
+      def void(payment_intent_id, gateway_options)
         payment_intent_response = Stripe::PaymentIntent.retrieve(
           payment_intent_id, stripe_account: stripe_account_id
         )
@@ -101,7 +97,13 @@ module Spree
       end
 
       # NOTE: this method is required by Spree::Payment::Processing
-      def credit(money, _creditcard, payment_intent_id, gateway_options)
+      def credit(money, payment_intent_id, gateway_options)
+        gateway_options[:stripe_account] = stripe_account_id
+        provider.refund(money, payment_intent_id, gateway_options)
+      end
+
+      # NOTE: this method is required by Spree::Payment::Processing
+      def refund(money, payment_intent_id, gateway_options)
         gateway_options[:stripe_account] = stripe_account_id
         provider.refund(money, payment_intent_id, gateway_options)
       end

app/models/spree/payment.rb

@@ -34,7 +34,7 @@ module Spree
 
     # invalidate previously entered payments
     after_create :invalidate_old_payments
-    after_save :create_payment_profile, if: :profiles_supported?
+    after_save :create_payment_profile
 
     # update the order totals, etc.
     after_save :ensure_correct_adjustment, :update_order
@@ -217,18 +217,13 @@ module Spree
       errors.blank?
     end
 
-    def profiles_supported?
-      payment_method.respond_to?(:payment_profiles_supported?) &&
-        payment_method.payment_profiles_supported?
-    end
-
     def create_payment_profile
       return unless source.is_a?(CreditCard)
       return unless source.try(:save_requested_by_customer?)
       return unless source.number || source.gateway_payment_profile_id
       return unless source.gateway_customer_profile_id.nil?
 
-      payment_method.create_profile(self)
+      payment_method.try(:create_profile, self)
     rescue ActiveMerchant::ConnectionError => e
       gateway_error e
     end

app/models/spree/payment/processing.rb

@@ -58,16 +58,7 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          response = if payment_method.payment_profiles_supported?
+          response = payment_method.void(response_code, gateway_options)
-                       # Gateways supporting payment profiles will need access to credit
-                       # card object because this stores the payment profile information
-                       # so supply the authorization itself as well as the credit card,
-                       # rather than just the authorization code
-                       payment_method.void(response_code, source, gateway_options)
-                     else
-                       # Standard ActiveMerchant void usage
-                       payment_method.void(response_code, gateway_options)
-                     end
 
           record_response(response)
 
@@ -86,20 +77,11 @@ module Spree
 
           credit_amount = calculate_refund_amount(credit_amount)
 
-          response = if payment_method.payment_profiles_supported?
+          response = payment_method.credit(
-                       payment_method.credit(
+            (credit_amount * 100).round,
-                         (credit_amount * 100).round,
+            response_code,
-                         source,
+            gateway_options
-                         response_code,
+          )
-                         gateway_options
-                       )
-                     else
-                       payment_method.credit(
-                         (credit_amount * 100).round,
-                         response_code,
-                         gateway_options
-                       )
-                     end
 
           record_response(response)
 
@@ -125,20 +107,11 @@ module Spree
 
           refund_amount = calculate_refund_amount(refund_amount)
 
-          response = if payment_method.payment_profiles_supported?
+          response = payment_method.refund(
-                       payment_method.refund(
+            (refund_amount * 100).round,
-                         (refund_amount * 100).round,
+            response_code,
-                         source,
+            gateway_options
-                         response_code,
+          )
-                         gateway_options
-                       )
-                     else
-                       payment_method.refund(
-                         (refund_amount * 100).round,
-                         response_code,
-                         gateway_options
-                       )
-                     end
 
           record_response(response)
 

app/models/spree/payment_method.rb

@@ -93,10 +93,6 @@ module Spree
       unscoped { find(*) }
     end
 
-    def payment_profiles_supported?
-      false
-    end
-
     def source_required?
       true
     end
@@ -113,11 +109,6 @@ module Spree
       distributors.include?(distributor)
     end
 
-    def self.clean_name
-      scope = "spree.admin.payment_methods.providers"
-      I18n.t(name.demodulize.downcase, scope:)
-    end
-
     private
 
     def distributor_validation

app/models/spree/payment_method/taler.rb

@@ -21,6 +21,14 @@ module Spree
       preference :backend_url, :string
       preference :api_key, :password
 
+      def actions
+        %w{void}
+      end
+
+      def can_void?(payment)
+        payment.state == "completed"
+      end
+
       # Name of the view to display during checkout
       def method_type
         "check" # empty view
@@ -38,10 +46,9 @@ module Spree
 
         payment.source ||= self
         payment.response_code ||= create_taler_order(payment)
-        payment.redirect_auth_url ||= fetch_order_url(payment)
         payment.save! if payment.changed?
 
-        payment.redirect_auth_url
+        taler_order.status_url
       end
 
       # Main method called by Spree::Payment::Processing during checkout
@@ -53,14 +60,33 @@ module Spree
 
         return unless payment.response_code
 
-        taler_order = client.fetch_order(payment.response_code)
+        taler_order = taler_order(id: payment.response_code)
-        status = taler_order["order_status"]
+        status = taler_order.fetch("order_status")
         success = (status == "paid")
         message = I18n.t(status, default: status, scope: "taler.order_status")
 
         ActiveMerchant::Billing::Response.new(success, message)
       end
 
+      def void(response_code, gateway_options)
+        payment = gateway_options[:payment]
+        taler_order = taler_order(id: response_code)
+        status = taler_order.fetch("order_status")
+
+        if status == "claimed"
+          return ActiveMerchant::Billing::Response.new(true, "Already expired")
+        end
+
+        raise "Unsupported action" if status != "paid"
+
+        amount = taler_order.fetch("contract_terms")["amount"]
+        taler_order.refund(refund: amount, reason: "void")
+
+        PaymentMailer.refund_available(payment, taler_order.status_url).deliver_later
+
+        ActiveMerchant::Billing::Response.new(true, "Refund initiated")
+      end
+
       private
 
       def load_payment(order)
@@ -72,22 +98,20 @@ module Spree
         # current demo backend only working with the KUDOS currency.
         taler_amount = "KUDOS:#{payment.amount}"
         urls = Rails.application.routes.url_helpers
-        new_order = client.create_order(
+        fulfillment_url = urls.payment_gateways_confirm_taler_url(payment_id: payment.id)
-          taler_amount,
+        taler_order.create(
-          I18n.t("payment_method_taler.order_summary"),
+          amount: taler_amount,
-          urls.payment_gateways_confirm_taler_url(payment_id: payment.id),
+          summary: I18n.t("payment_method_taler.order_summary"),
+          fulfillment_url:,
         )
-
-        new_order["order_id"]
       end
 
-      def fetch_order_url(payment)
+      def taler_order(id: nil)
-        order = client.fetch_order(payment.response_code)
+        @taler_order ||= ::Taler::Order.new(
-        order["order_status_url"]
+          backend_url: preferred_backend_url,
-      end
+          password: preferred_api_key,
-
+          id:,
-      def client
+        )
-        @client ||= ::Taler::Client.new(preferred_backend_url, preferred_api_key)
       end
     end
   end

app/models/spree/product.rb

@@ -251,7 +251,7 @@ module Spree
       transaction do
         ExchangeVariant.
           where(exchange_variants: { variant_id: variants.with_deleted.
-          select(:id) }).destroy_all
+            select(:id) }).destroy_all
 
         yield
       end

app/models/spree/taxon.rb

@@ -35,8 +35,8 @@ module Spree
       taxons
         .pluck('spree_taxons.id, enterprises.id AS enterprise_id')
         .each_with_object({}) do |(taxon_id, enterprise_id), collection|
-        collection[enterprise_id.to_i] ||= Set.new
+          collection[enterprise_id.to_i] ||= Set.new
-        collection[enterprise_id.to_i] << taxon_id
+          collection[enterprise_id.to_i] << taxon_id
       end
     end
 

app/models/spree/variant.rb

@@ -167,8 +167,8 @@ module Spree
     # In Rails 3, merging two scopes on the same column will consider only the last scope.
     def self.in_distributor(distributor)
       where(id: ExchangeVariant.select(:variant_id).
-                joins(:exchange).
+        joins(:exchange).
-                where('exchanges.incoming = ? AND exchanges.receiver_id = ?', false, distributor))
+        where('exchanges.incoming = ? AND exchanges.receiver_id = ?', false, distributor))
     end
 
     def self.indexed
@@ -179,11 +179,11 @@ module Spree
       # "where(id:" is necessary so that the returned relation has no includes
       # The relation without includes will not be readonly and allow updates on it
       where(spree_variants: { id: joins(:prices).
-                                          where(deleted_at: nil).
+        where(deleted_at: nil).
-                                          where('spree_prices.currency' =>
+        where('spree_prices.currency' =>
                                             currency || CurrentConfig.get(:currency)).
-                                          where.not(spree_prices: { amount: nil }).
+        where.not(spree_prices: { amount: nil }).
-                                          select("spree_variants.id") })
+        select("spree_variants.id") })
     end
 
     def self.linked_to(semantic_id)

app/queries/product_scope_query.rb

@@ -60,8 +60,8 @@ class ProductScopeQuery
 
   def product_query_includes
     [
-      image: { attachment_attachment: :blob },
+      { image: { attachment_attachment: :blob },
-      variants: [:default_price, :stock_items, :variant_overrides]
+        variants: [:default_price, :stock_items, :variant_overrides] }
     ]
   end
 

app/services/dfc_catalog_importer.rb

@@ -42,10 +42,10 @@ class DfcCatalogImporter
       .includes(:semantic_links).references(:semantic_links)
       .where.not(semantic_links: { semantic_id: present_ids })
       .select do |variant|
-      # Variants that were in the same catalog before:
+        # Variants that were in the same catalog before:
-      variant.semantic_links.map(&:semantic_id).any? do |semantic_id|
+        variant.semantic_links.map(&:semantic_id).any? do |semantic_id|
-        FdcUrlBuilder.new(semantic_id).catalog_url == catalog_url
+          FdcUrlBuilder.new(semantic_id).catalog_url == catalog_url
-      end
+        end
     end
   end
 end

app/services/line_item_syncer.rb

@@ -51,8 +51,8 @@ class LineItemSyncer
   def destroy_obsolete_items(order)
     order.line_items.
       where(variant_id: subscription_line_items.
-                        select(&:marked_for_destruction?).
+        select(&:marked_for_destruction?).
-                        map(&:variant_id)).
+        map(&:variant_id)).
       destroy_all
   end
 

app/services/orders/handle_fees_service.rb

@@ -130,12 +130,11 @@ module Orders
 
     def order_cycle_fees
       return @order_cycle_fees if defined? @order_cycle_fees
+      return [] unless order_cycle && distributor
 
       @order_cycle_fees = begin
         fees = []
 
-        return fees unless order_cycle && distributor
-
         order_cycle.exchanges.supplying_to(distributor).each do |exchange|
           exchange.enterprise_fees.per_item.each do |enterprise_fee|
             fee_value = FeeValue.new(fee: enterprise_fee, role: exchange.role)

app/services/permitted_attributes/enterprise.rb

@@ -14,12 +14,12 @@ module PermittedAttributes
 
     def self.attributes
       basic_permitted_attributes + [
-        group_ids: [], user_ids: [],
+        { group_ids: [], user_ids: [],
-        shipping_method_ids: [], payment_method_ids: [],
+          shipping_method_ids: [], payment_method_ids: [],
-        address_attributes: PermittedAttributes::Address.attributes,
+          address_attributes: PermittedAttributes::Address.attributes,
-        business_address_attributes: PermittedAttributes::BusinessAddress.attributes,
+          business_address_attributes: PermittedAttributes::BusinessAddress.attributes,
-        producer_properties_attributes: [:id, :property_name, :value, :_destroy],
+          producer_properties_attributes: [:id, :property_name, :value, :_destroy],
-        custom_tab_attributes: PermittedAttributes::CustomTab.attributes,
+          custom_tab_attributes: PermittedAttributes::CustomTab.attributes },
       ]
     end
 

app/services/permitted_attributes/order_cycle.rb

@@ -25,8 +25,8 @@ module PermittedAttributes
     private
 
     def attributes
-      self.class.basic_attributes + [incoming_exchanges: permitted_exchange_attributes,
+      self.class.basic_attributes + [{ incoming_exchanges: permitted_exchange_attributes,
-                                     outgoing_exchanges: permitted_exchange_attributes]
+                                       outgoing_exchanges: permitted_exchange_attributes }]
     end
 
     def permitted_exchange_attributes

app/services/permitted_attributes/subscription.rb

@@ -26,11 +26,11 @@ module PermittedAttributes
 
     def other_permitted_attributes
       [
-        subscription_line_items_attributes: [
+        { subscription_line_items_attributes: [
-          :id, :quantity, :variant_id, :price_estimate, :_destroy
+            :id, :quantity, :variant_id, :price_estimate, :_destroy
-        ],
+          ],
-        bill_address_attributes: PermittedAttributes::Address.attributes,
+          bill_address_attributes: PermittedAttributes::Address.attributes,
-        ship_address_attributes: PermittedAttributes::Address.attributes
+          ship_address_attributes: PermittedAttributes::Address.attributes }
       ]
     end
   end

app/views/admin/products_v3/_table.html.haml

@@ -13,6 +13,8 @@
   = hidden_field_tag :search_term, @search_term
   = hidden_field_tag :producer_id, @producer_id
   = hidden_field_tag :category_id, @category_id
+  - @tags.each do |tag|
+    = hidden_field_tag 'tags_name_in[]', tag
 
   %table.products{ 'data-column-preferences-target': "table", class: (hide_producer_column?(producer_options) ? 'hide-producer' : '') }
     %colgroup

app/views/admin/reports/filters/_enterprise_fees_with_tax_report_by_order.html.haml

@@ -1,23 +1,50 @@
+- search_url_query = {report_type: :enterprise_fee_summary, report_subtype: :enterprise_fees_with_tax_report_by_order}
 .row
   .alpha.two.columns= label_tag nil, t(:report_hubs)
-  .omega.fourteen.columns= f.collection_select(:distributor_id_in, @data.distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true})
+  .omega.fourteen.columns
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :distributor_id_in,
+      options: [],
+      selected_option: params.dig(:q, :distributor_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_distributors_url))
 
 .row
   .alpha.two.columns= label_tag nil, t(:report_customers_cycle)
   .omega.fourteen.columns
-    = f.select(:order_cycle_id_in, report_order_cycle_options(@data.order_cycles), {selected: params.dig(:q, :order_cycle_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :order_cycle_id_in,
+      options: [],
+      selected_option: params.dig(:q, :order_cycle_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_order_cycles_url))
 
 .row
   .alpha.two.columns= label_tag nil, t(:fee_name)
   .omega.fourteen.columns
-    = f.select(:enterprise_fee_id_in, fee_name_options(@report.search.result), {selected: params.dig(:q, :enterprise_fee_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :enterprise_fee_id_in,
+      options: [],
+      selected_option: params.dig(:q, :enterprise_fee_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_enterprise_fees_url(search_url_query)))
 
 .row
   .alpha.two.columns= label_tag nil, t(:fee_owner)
   .omega.fourteen.columns
-    = f.select(:enterprise_fee_owner_id_in, fee_owner_options(@report.search.result), {selected: params.dig(:q, :enterprise_fee_owner_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :enterprise_fee_owner_id_in,
+      options: [],
+      selected_option: params.dig(:q, :enterprise_fee_owner_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_enterprise_fee_owners_url(search_url_query)))
 
 .row
   .alpha.two.columns= label_tag nil, t(:report_customers)
   .omega.fourteen.columns
-    = f.select(:customer_id_in, customer_email_options(@data.order_customers), {selected: params.dig(:q, :customer_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :customer_id_in,
+      options: [],
+      selected_option: params.dig(:q, :customer_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_order_customers_url))

app/views/admin/reports/filters/_enterprise_fees_with_tax_report_by_producer.html.haml

@@ -1,27 +1,57 @@
+- search_url_query = {report_type: :enterprise_fee_summary, report_subtype: :enterprise_fees_with_tax_report_by_producer}
 .row
   .alpha.two.columns= label_tag nil, t(:report_hubs)
-  .omega.fourteen.columns= f.collection_select(:distributor_id_in, @data.distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true})
+  .omega.fourteen.columns
-
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :distributor_id_in,
+      options: [],
+      selected_option: params.dig(:q, :distributor_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_distributors_url))
 .row
   .alpha.two.columns= label_tag nil, t(:report_producers)
-  .omega.fourteen.columns= select_tag(:supplier_id_in, options_from_collection_for_select(@data.orders_suppliers, :id, :name, params[:supplier_id_in]), {class: "select2 fullwidth", multiple: true})
+  .omega.fourteen.columns
+    = render(SearchableDropdownComponent.new(name: :supplier_id_in,
+      options: [],
+      selected_option: params.dig(:supplier_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_suppliers_url))
 
 .row
   .alpha.two.columns= label_tag nil, t(:report_customers_cycle)
   .omega.fourteen.columns
-    = f.select(:order_cycle_id_in, report_order_cycle_options(@data.order_cycles), {selected: params.dig(:q, :order_cycle_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
-
+      name: :order_cycle_id_in,
+      options: [],
+      selected_option: params.dig(:q, :order_cycle_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_order_cycles_url))
 .row
   .alpha.two.columns= label_tag nil, t(:fee_name)
   .omega.fourteen.columns
-    = f.select(:enterprise_fee_id_in, fee_name_options(@report.search.result), {selected: params.dig(:q, :enterprise_fee_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :enterprise_fee_id_in,
+      options: [],
+      selected_option: params.dig(:q, :enterprise_fee_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_enterprise_fees_url(search_url_query)))
 
 .row
   .alpha.two.columns= label_tag nil, t(:fee_owner)
   .omega.fourteen.columns
-    = f.select(:enterprise_fee_owner_id_in, fee_owner_options(@report.search.result), {selected: params.dig(:q, :enterprise_fee_owner_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :enterprise_fee_owner_id_in,
+      options: [],
+      selected_option: params.dig(:q, :enterprise_fee_owner_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_enterprise_fee_owners_url(search_url_query)))
 
 .row
   .alpha.two.columns= label_tag nil, t(:report_customers)
   .omega.fourteen.columns
-    = f.select(:customer_id_in, customer_email_options(@data.order_customers), {selected: params.dig(:q, :customer_id_in)}, {class: "select2 fullwidth", multiple: true})
+    = render(SearchableDropdownComponent.new(form: f,
+      name: :customer_id_in,
+      options: [],
+      selected_option: params.dig(:q, :customer_id_in),
+      multiple: true,
+      remote_url: admin_reports_search_order_customers_url))

app/views/home/_brandstory.html.haml

@@ -6,21 +6,21 @@
       %p
         = t :brandstory_intro
 
-      #brand-story-text.hide-show.slideable
+      %details#brand-story-text
-        %p
+        %summary
-          = t :brandstory_part1
+          %i.ofn-i_005-caret-down
-        %p
+          %i.ofn-i_006-caret-up
-          = t :brandstory_part2
+        .brand-story-content
-        %p
+          %p
-          = t :brandstory_part3
+            = t :brandstory_part1
-        %p
+          %p
-          = t :brandstory_part4
+            = t :brandstory_part2
-        %p
+          %p
-          %strong
+            = t :brandstory_part3
-            = t :brandstory_part5_strong
+          %p
-        %p
+            = t :brandstory_part4
-          = t :brandstory_part6
+          %p
-
+            %strong
-      %a.text-vbig{"slide-toggle" => "#brand-story-text", "ng-click" => "toggleBrandStory()"}
+              = t :brandstory_part5_strong
-        %i.ofn-i_005-caret-down{"ng-hide" => "brandStoryExpanded"}
+          %p
-        %i.ofn-i_006-caret-up{  "ng-show" => "brandStoryExpanded"}
+            = t :brandstory_part6

app/views/home/index.html.haml

@@ -5,7 +5,7 @@
 - content_for :page_alert do
   = render "shared/menu/alert"
 
-%div{"ng-controller" => "HomeCtrl"}
+%div
   = render "home/tagline"
 
   #panes

app/views/payment_mailer/authorization_required.html.haml

@@ -1,2 +1,2 @@
-= t('spree.payment_mailer.authorization_required.message', order_number: @order.number)
+= t(".message", order_number: @order.number)
 = link_to spree.edit_admin_order_url(@order), spree.edit_admin_order_url(@order)

app/views/payment_mailer/authorize_payment.html.haml

@@ -1,2 +1,2 @@
-= t('spree.payment_mailer.authorize_payment.instructions', distributor: @payment.order.distributor.name, amount: @payment.display_amount)
+= t(".instructions", distributor: @payment.order.distributor.name, amount: @payment.display_amount)
 = link_to main_app.authorize_payment_url(@payment), main_app.authorize_payment_url(@payment)

app/views/payment_mailer/refund_available.html.haml

@@ -0,0 +1,2 @@
+%p= t(".message", shop: @shop, amount: @amount)
+%p= link_to @taler_order_status_url, @taler_order_status_url

app/views/spree/admin/payment_methods/_providers.html.haml

@@ -3,6 +3,6 @@
     .alpha.four.columns
       = label :payment_method, :type, t('.provider')
     .omega.twelve.columns
-      = collection_select(:payment_method, :type, @providers, :to_s, :clean_name, {}, { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"})
+      = select(:payment_method, :type, payment_method_type_options(@providers), {}, { class: 'select2 fullwidth', required: true, placeholder: t("admin.choose"), 'provider-prefs-for' => "#{@object.id}"})
 
   %div{"ng-include" => "include_html" }

app/views/spree/admin/payment_methods/index.html.haml

@@ -37,7 +37,7 @@
             - method.distributors.each do |distributor|
               = distributor.name
               %br/
-          %td= method.class.clean_name
+          %td= payment_method_type_name(method.class.name)
           - if spree_current_user.admin?
             %td.align-center= method.environment.to_s.titleize
           %td.align-center= method.display_on.blank? ? t('.both') : t('.' + method.display_on.to_s)

app/views/spree/admin/payments/_list.html.haml

@@ -18,5 +18,5 @@
           %span{class: "state #{payment.state}"}= t(payment.state, scope: "spree.payment_states", default: payment.state.capitalize)
         %td.actions
           - payment.actions.each do |action|
-            = link_to_with_icon "icon-#{action}", Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action),
+            = link_to "", fire_admin_order_payment_path(@order, payment, e: action),
-            no_text: true, data: { method: :put, action: action, disable_with: "" }
+            class: "icon_link icon-#{action} no-text", data: { method: :put, action: action, disable_with: "" }, title: Spree.t(action)

app/views/spree/admin/products/new.html.haml

@@ -29,7 +29,7 @@
       .sixteen.columns.alpha
         .eight.columns.alpha
           = f.field_container :variant_unit do
-            = f.label :variant_unit, t(".units")
+            = f.label :variant_unit_with_scale, t(".units")
             %span.required *
             = f.select 'variant_unit', [],
               { include_blank: true },

app/views/spree/admin/shared/_head.html.haml

@@ -14,7 +14,7 @@
   = " - OFN #{t(:administration)}"
 
 %link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"}
-= stylesheet_pack_tag 'admin-style-v3', media: "screen, print"
+= stylesheet_pack_tag 'admin-style', media: "screen, print"
 = render "layouts/bugsnag_js"
 
 - if content_for? :minimal_js

app/webpacker/controllers/tom_select_controller.js

@@ -1,11 +1,16 @@
 import { Controller } from "stimulus";
 import TomSelect from "tom-select/dist/esm/tom-select.complete";
+import showHttpError from "../../webpacker/js/services/show_http_error";
 
 export default class extends Controller {
-  static values = { options: Object, placeholder: String };
+  static values = {
+    options: Object,
+    placeholder: String,
+    remoteUrl: String,
+  };
 
   connect(options = {}) {
-    this.control = new TomSelect(this.element, {
+    let tomSelectOptions = {
       maxItems: 1,
       maxOptions: null,
       plugins: ["dropdown_input"],
@@ -16,7 +21,13 @@ export default class extends Controller {
       },
       ...this.optionsValue,
       ...options,
-    });
+    };
+
+    if (this.remoteUrlValue) {
+      this.#addRemoteOptions(tomSelectOptions);
+    }
+
+    this.control = new TomSelect(this.element, tomSelectOptions);
   }
 
   disconnect() {
@@ -29,4 +40,78 @@ export default class extends Controller {
     const optionsArray = [...this.element.options];
     return optionsArray.find((option) => [null, ""].includes(option.value))?.text;
   }
+
+  #buildUrl(query, page = 1) {
+    const url = new URL(this.remoteUrlValue, window.location.origin);
+    url.searchParams.set("q", query);
+    url.searchParams.set("page", page);
+    return url.toString();
+  }
+
+  #fetchOptions(query, callback) {
+    const url = this.control.getUrl(query);
+
+    fetch(url)
+      .then((response) => {
+        if (!response.ok) {
+          showHttpError(response.status);
+          throw response;
+        }
+        return response.json();
+      })
+      .then((json) => {
+        /**
+         * Expected API shape:
+         * {
+         *   results: [{ value, label }],
+         *   pagination: { more: boolean }
+         * }
+         */
+        if (json.pagination?.more) {
+          const currentUrl = new URL(url);
+          const currentPage = parseInt(currentUrl.searchParams.get("page") || "1");
+          const nextUrl = this.#buildUrl(query, currentPage + 1);
+          this.control.setNextUrl(query, nextUrl);
+        }
+
+        callback(json.results || []);
+      })
+      .catch((error) => {
+        callback();
+        console.error(error);
+      });
+  }
+
+  #addRemoteOptions(options) {
+    this.openedByClick = false;
+
+    options.firstUrl = (query) => {
+      return this.#buildUrl(query, 1);
+    };
+
+    options.load = this.#fetchOptions.bind(this);
+
+    options.onFocus = function () {
+      this.control.load("", () => {});
+    }.bind(this);
+
+    options.onDropdownOpen = function () {
+      this.openedByClick = true;
+    }.bind(this);
+
+    options.onType = function () {
+      this.openedByClick = false;
+    }.bind(this);
+
+    // As per TomSelect source code, Loading state is shown on the UI when this function returns true.
+    // By default it shows loading state only when there is some input in the search box.
+    // We want to show loading state on focus as well (when there is no input) to indicate that options are being loaded.
+    options.shouldLoad = function (query) {
+      return this.openedByClick || query.length > 0;
+    }.bind(this);
+
+    options.valueField = "value";
+    options.labelField = "label";
+    options.searchField = "label";
+  }
 }

app/webpacker/css/admin/all.scss

@@ -16,13 +16,13 @@
 @import "flatpickr/dist/themes/material_blue";
 @import "shortcut-buttons-flatpickr/dist/themes/light";
 
-@import "../admin/globals/functions";
+@import "globals/functions";
 @import "globals/palette"; // admin_v3
 @import "globals/variables"; // admin_v3
-@import "../admin/globals/mixins";
+@import "globals/mixins";
 @import "mixins"; // admin_v3
 
-@import "../admin/plugins/font-awesome";
+@import "plugins/font-awesome";
 
 @import "../shared/variables/layout";
 @import "../shared/variables/variables";
@@ -32,7 +32,7 @@
 @import "shared/icons"; // admin_v3
 @import "shared/forms"; // admin_v3
 @import "shared/layout"; // admin_v3
-@import "../admin/shared/scroll_bar";
+@import "shared/scroll_bar";
 
 @import "../shared/trix";
 
@@ -40,96 +40,94 @@
 @import "plugins/powertip"; // admin_v3
 
 @import "sections/orders"; // admin_v3
-@import "../admin/sections/products";
+@import "sections/products";
 
-@import "../admin/hacks/mozilla";
+@import "hacks/mozilla";
-@import "../admin/hacks/opera";
+@import "hacks/opera";
-@import "../admin/hacks/ie";
+@import "hacks/ie";
 
 @import "components/actions"; // admin_v3
-@import "../admin/components/alert-box";
+@import "components/alert-box";
-@import "../admin/components/alert_row";
+@import "components/alert_row";
 @import "components/buttons"; // admin_v3
 @import "components/date-picker"; // admin_v3
-@import "../admin/components/dialogs";
+@import "components/dialogs";
-@import "../admin/components/input";
+@import "components/input";
-@import "../admin/components/jquery_dialog";
+@import "components/jquery_dialog";
 @import "components/messages"; // admin_v3
 @import "components/navigation"; // admin_v3
-@import "../admin/components/ng-cloak";
+@import "components/ng-cloak";
-@import "../admin/components/page_actions";
+@import "components/page_actions";
 @import "components/pagination"; // admin_v3
-@import "../admin/components/per_page_controls";
+@import "components/per_page_controls";
-@import "../admin/components/product_autocomplete";
+@import "components/product_autocomplete";
-@import "../admin/components/progress";
+@import "components/progress";
-@import "../admin/components/save_bar";
+@import "components/save_bar";
 @import "components/sidebar"; // admin_v3
-@import "../admin/components/simple_modal";
+@import "components/simple_modal";
-@import "../admin/components/states";
+@import "components/states";
-@import "../admin/components/stripe_connect_button";
+@import "components/stripe_connect_button";
-@import "../admin/components/subscriptions_states";
+@import "components/subscriptions_states";
-@import "../admin/components/table-filter";
+@import "components/table-filter";
-@import "../admin/components/table_loading";
+@import "components/table_loading";
-@import "../admin/components/timepicker";
+@import "components/timepicker";
-@import "../admin/components/todo";
+@import "components/todo";
-@import "../admin/components/tooltip";
+@import "components/tooltip";
-@import "../admin/components/wizard_progress";
+@import "components/wizard_progress";
 
-@import "../admin/pages/enterprise_form";
+@import "pages/enterprise_form";
-@import "../admin/pages/subscription_form";
+@import "pages/subscription_form";
-@import "../admin/pages/subscription_line_items";
+@import "pages/subscription_line_items";
-@import "../admin/pages/subscription_review";
+@import "pages/subscription_review";
 
-@import "../admin/advanced_settings";
+@import "advanced_settings";
-@import "../admin/alert";
+@import "alert";
-@import "../admin/animations";
+@import "animations";
 @import "pages/change_type_form"; // admin_v3
-@import "../admin/connected_apps";
+@import "connected_apps";
-@import "../admin/customers";
+@import "customers";
 @import "dashboard/dashboard_item"; // admin_v3
 @import "pages/dashboard-single-ent"; // admin_v3
-@import "../admin/dialog";
+@import "dialog";
-@import "../admin/disabled";
+@import "disabled";
 @import "components/dropdown"; // admin_v3
 @import "pages/edit_variant"; // admin_v3
 @import "pages/enterprise_index_panels"; // admin_v3
-@import "../admin/enterprises";
+@import "enterprises";
-@import "../admin/filters_and_controls";
+@import "filters_and_controls";
-@import "../admin/grid";
+@import "grid";
-@import "../admin/icons";
+@import "icons";
-@import "../admin/index_panel_buttons";
+@import "index_panel_buttons";
-@import "../admin/index_panels";
+@import "index_panels";
-@import "../admin/modals";
+@import "modals";
-@import "../admin/offsets";
+@import "offsets";
-@import "../admin/openfoodnetwork";
+@import "openfoodnetwork";
-@import "../admin/order_cycles";
+@import "order_cycles";
-@import "../admin/orders";
+@import "orders";
 @import "pages/product_import"; // admin_v3
-@import "../admin/products";
+@import "products";
-@import "../admin/products_v3";
+@import "products_v3";
-@import "../admin/question-mark-tooltip";
+@import "question-mark-tooltip";
-@import "../admin/relationships";
+@import "relationships";
-@import "../admin/reports";
+@import "reports";
 @import "components/select2"; // admin_v3
 @import "components/sidebar-item"; // admin_v3
-@import "../admin/side_menu";
+@import "side_menu";
-@import "../admin/tables";
+@import "tables";
-@import "../admin/tag_rules";
+@import "tag_rules";
-@import "../admin/terms_of_service_files";
+@import "terms_of_service_files";
-@import "../admin/validation";
+@import "validation";
-@import "../admin/variant_overrides";
+@import "variant_overrides";
-@import "../admin/welcome";
+@import "welcome";
 
 @import "shared/question-mark-icon";
-@import "../admin/question-mark-tooltip";
+@import "~tom-select/src/scss/tom-select.default";
-
-@import "tom-select/src/scss/tom-select.default";
 @import "components/tom_select"; // admin_v3
 
 @import "modal_component/modal_component";
 @import "vertical_ellipsis_menu_component/vertical_ellipsis_menu_component"; // admin_v3 and only V3
 @import "tag_list_input_component/tag_list_input_component";
-@import "admin/trix";
+@import "trix";
 
 @import "terms_of_service_banner"; // admin_v3
 

app/webpacker/css/admin/change_type_form.scss

@@ -1,110 +0,0 @@
-#change_type {
-  section {
-    margin: 2em 0 0 0;
-
-    &,
-    & * {
-      color: $spree-blue;
-    }
-  }
-
-  .description {
-    background-color: $spree-light-blue;
-    margin-top: -2em;
-    padding: 4em 2em 2em 1em;
-
-    @media all and (max-width: 786px) {
-      margin-bottom: 2em;
-    }
-  }
-
-  .admin-cta {
-    border: 1px solid $spree-blue;
-
-    @include border-radius(3px);
-
-    text-align: center;
-    padding: 1em;
-  }
-
-  .error {
-    display: block;
-    color: #f57e80;
-    border: 1px solid #f57e80;
-    background-color: #fde6e7;
-
-    @include border-radius(3px);
-
-    margin-bottom: 1em;
-    padding: 0.5em;
-  }
-
-  a.selector {
-    position: relative;
-    border: 2px solid black;
-    text-align: center;
-    width: 100%;
-    cursor: pointer;
-
-    &,
-    & * {
-      color: white;
-    }
-
-    &:after,
-    &:before {
-      top: 100%;
-      left: 50%;
-      border: solid transparent;
-      content: " ";
-      height: 0;
-      width: 0;
-      position: absolute;
-      pointer-events: none;
-    }
-
-    &:after {
-      border-color: rgba(136, 183, 213, 0);
-      border-top-color: $spree-blue;
-      border-width: 12px;
-      margin-left: -12px;
-    }
-
-    &:hover {
-      &:after {
-        border-top-color: $spree-green;
-      }
-    }
-
-    &:before {
-      border-color: rgba(84, 152, 218, 0);
-      border-top-color: black;
-      border-width: 15px;
-      margin-left: -15px;
-    }
-
-    .bottom {
-      background: repeating-linear-gradient(
-        60deg,
-        rgba(84, 152, 218, 0),
-        rgba(84, 152, 218, 0) 5px,
-        rgba(255, 255, 255, 0.25) 5px,
-        rgba(255, 255, 255, 0.25) 10px
-      );
-      margin-top: 1em;
-      margin-left: -15px;
-      margin-right: -15px;
-      padding: 5px;
-      text-transform: uppercase;
-    }
-
-    &.selected {
-      background-color: black;
-
-      &:after,
-      &:hover &:after {
-        border-top-color: black;
-      }
-    }
-  }
-}

app/webpacker/css/admin/dashboard-single-ent.scss

@@ -1,21 +0,0 @@
-.dashboard_item.single-ent {
-  .header {
-    padding: 0.77778em 1.33333em 0.77778em 0.77778em;
-    height: auto !important;
-  }
-
-  .list {
-    .button.bottom {
-      width: 100%;
-    }
-  }
-}
-
-.button.big {
-  width: 100%;
-  font-size: 1rem;
-
-  @include border-radius(25px);
-
-  padding: 15px;
-}

app/webpacker/css/admin/dashboard_item.scss

@@ -1,244 +0,0 @@
-div.dashboard_item {
-  margin-bottom: 30px;
-
-  .centered {
-    text-align: center;
-  }
-
-  .text-icon {
-    margin-top: 8px;
-    display: block;
-    font-size: 16px;
-    font-weight: bold;
-    color: #fff;
-    padding: 0px 6px;
-    border-radius: 10px;
-
-    &.green {
-      background-color: $spree-green;
-    }
-
-    &.warning {
-      background-color: $color-warning;
-    }
-
-    &.orange {
-      background-color: $color-warning;
-    }
-  }
-
-  div.header {
-    height: 50px;
-    border-radius: 6px 6px 0px 0px;
-    border: 1px solid $spree-blue;
-    position: relative;
-
-    a[ofn-with-tip] {
-      position: absolute;
-      right: 5px;
-      bottom: 5px;
-    }
-
-    &.warning {
-      border-color: $color-warning;
-      border-width: 3px;
-
-      h3 {
-        color: $color-warning;
-      }
-    }
-
-    &.orange {
-      border-color: $color-warning;
-      border-width: 3px;
-
-      h3 {
-        color: $color-warning;
-      }
-    }
-
-    h3.alpha {
-      height: 100%;
-      padding: 10px 5px 0px 3%;
-    }
-
-    a {
-      border-radius: 0px 4px 0px 0px;
-      height: 100%;
-      padding: 15px 2px 0px 2px;
-    }
-  }
-
-  .tabs {
-    height: 30px;
-    border: solid $spree-blue;
-    border-width: 0px 0px 1px 0px;
-    margin-top: 3px;
-
-    div.dashboard_tab {
-      cursor: pointer;
-      height: 30px;
-      color: #fff;
-      background-color: $spree-blue;
-      padding: 5px 5px 0px 5px;
-      text-align: center;
-      font-weight: bold;
-      border: solid $spree-blue;
-      border-width: 1px 1px 0px 1px;
-
-      &:hover {
-        background-color: $spree-green;
-      }
-
-      &.selected {
-        color: $spree-blue;
-        background-color: #fff;
-      }
-    }
-  }
-
-  .list {
-    max-height: 250px;
-    overflow-y: auto;
-    overflow-x: hidden;
-
-    &:focus {
-      outline: none;
-    }
-  }
-
-  .list-title {
-    border: solid $spree-blue;
-    border-width: 0px 1px 0px 1px;
-
-    span {
-      font-size: 105%;
-      padding: 10px 0px;
-      font-weight: bold;
-    }
-
-    span.alpha {
-      padding: 10px 2px 10px 5%;
-    }
-  }
-
-  .list-item {
-    border: solid $spree-blue;
-    border-width: 0px 1px 0px 1px;
-    height: 41px;
-
-    span.alpha {
-      font-weight: bold;
-      margin-left: -3px;
-      padding: 10px 2px 0px 5%;
-    }
-
-    span.omega {
-      padding-right: 13px;
-      margin-right: -3px;
-      text-align: right;
-    }
-
-    .icon-arrow-right {
-      padding-top: 6px;
-      font-size: 20px;
-    }
-
-    .icon-warning-sign {
-      color: $color-warning;
-      font-size: 30px;
-    }
-
-    .icon-remove-sign {
-      color: $color-warning;
-      font-size: 30px;
-    }
-
-    .icon-ok-sign {
-      color: $spree-green;
-      font-size: 30px;
-    }
-
-    &.orange {
-      color: $color-warning;
-      border: solid $color-warning;
-    }
-
-    &.warning {
-      color: $color-warning;
-      border: solid $color-warning;
-    }
-
-    &.orange,
-    &.warning {
-      border-width: 0px 3px 0px 3px;
-    }
-
-    &.even {
-      background-color: #fff;
-    }
-
-    &.odd {
-      background-color: $spree-light-blue;
-    }
-
-    &.even,
-    &.odd {
-      &:hover {
-        color: #ffffff;
-        background-color: $spree-green;
-
-        .icon-arrow-right {
-          color: #fff;
-        }
-
-        .icon-remove-sign {
-          color: #fff;
-        }
-
-        .icon-warning-sign {
-          color: #fff;
-        }
-
-        .icon-ok-sign {
-          color: #fff;
-        }
-
-        .text-icon {
-          &.green {
-            color: $spree-green;
-            background-color: #fff;
-          }
-        }
-      }
-    }
-  }
-
-  a.button {
-    color: #fff;
-    font-size: 110%;
-    font-weight: bold;
-    text-align: center;
-
-    &.orange {
-      background-color: $color-warning;
-    }
-
-    &.blue {
-      background-color: $spree-blue;
-    }
-
-    &.warning {
-      background-color: $color-warning;
-    }
-
-    &:hover {
-      background-color: $spree-green;
-    }
-
-    &.bottom {
-      border-radius: 0px 0px 6px 6px;
-      padding: 15px 15px;
-    }
-  }
-}

app/webpacker/css/admin/dropdown.scss

@@ -1,271 +0,0 @@
-#content-header .ofn-drop-down {
-  border: none;
-  background-color: $spree-blue;
-  color: #fff;
-  float: none;
-  margin-left: 3px;
-}
-
-.ofn-drop-down {
-  .dropdown-content {
-    display: none;
-  }
-
-  .toggle-off {
-    display: none;
-  }
-
-  &:active:not(.disabled),
-  &:focus:not(.disabled) {
-    .dropdown-content {
-      display: inline-block;
-    }
-  }
-}
-
-.ofn-drop-down:hover,
-.ofn-drop-down.expanded {
-  border: 1px solid #adadad;
-  color: #575757;
-}
-
-@mixin ofn-drop-down-style {
-  padding: 7px 15px;
-  border-radius: 3px;
-  border: 1px solid #d4d4d4;
-  background-color: #f5f5f5;
-  display: block;
-  color: #828282;
-  cursor: pointer;
-  -moz-user-select: none;
-  -khtml-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  text-align: center;
-  margin-right: 10px;
-
-  &.disabled {
-    opacity: 0.5;
-    pointer-events: none;
-
-    &:hover {
-      cursor: default;
-      border-color: #d4d4d4;
-      color: #828282;
-    }
-  }
-}
-
-.ofn-drop-down-with-prepend {
-  display: flex;
-
-  &.right {
-    float: right;
-  }
-
-  .ofn-drop-down {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  .ofn-drop-down-prepend {
-    @include ofn-drop-down-style;
-
-    border-right: none;
-    margin-left: 0;
-    margin-right: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    cursor: default;
-  }
-}
-
-.ofn-drop-down {
-  @include ofn-drop-down-style;
-
-  position: relative;
-  float: left;
-
-  &.right {
-    float: right;
-    margin-right: 0px;
-    margin-left: 10px;
-  }
-
-  &:hover,
-  &.expanded {
-    border: 1px solid #adadad;
-    color: #575757;
-  }
-
-  > span {
-    width: auto;
-    text-transform: uppercase;
-    font-size: 85%;
-    font-weight: 600;
-  }
-
-  .menu {
-    margin-top: 1px;
-    position: absolute;
-    float: none;
-    top: 100%;
-    left: 0px;
-    padding: 5px 0px;
-    border: 1px solid #adadad;
-    background-color: #ffffff;
-    box-shadow: 1px 3px 10px #888888;
-    z-index: 100;
-    white-space: nowrap;
-
-    .filter {
-      padding-left: 5px;
-      padding-right: 5px;
-      position: relative;
-
-      > input[type="text"] {
-        border: 1px solid rgba(18, 18, 18, 0.1);
-        width: 100%;
-        padding-left: 30px;
-        padding-top: 10px;
-        padding-bottom: 10px;
-        font-size: 13px;
-        color: #454545;
-      }
-
-      &:after {
-        content: "\f002";
-        font-family: FontAwesome;
-        position: absolute;
-        left: 15px;
-        top: 13px;
-        color: #454545;
-      }
-    }
-
-    .menu_item {
-      margin: 0px;
-      padding: 2px 10px;
-      color: #454545;
-      text-align: left;
-      display: block;
-
-      .check {
-        display: inline-block;
-        text-align: center;
-        width: 40px;
-        &:before {
-          content: "\00a0";
-        }
-      }
-
-      .name {
-        display: inline-block;
-        padding: 0px 15px 0px 0px;
-      }
-
-      &.selected {
-        .check:before {
-          content: "\2713";
-        }
-      }
-
-      &.hidden {
-        display: none;
-      }
-    }
-
-    .menu_item:hover {
-      background-color: #ededed;
-    }
-  }
-
-  > details {
-    // Override padding on ofn-drop-down-style
-    margin: -7px -15px;
-    padding: 7px 15px;
-  }
-
-  > details > summary {
-    display: inline-block;
-    list-style: none;
-    width: auto;
-    text-transform: uppercase;
-    font-size: 85%;
-    font-weight: 600;
-    // Override padding on ofn-drop-down-style to increase clickable area
-    margin: -8px -15px;
-    padding: 8px 15px;
-  }
-
-  > details > summary:after {
-    content: "\f0d7";
-    font-family: FontAwesome;
-  }
-
-  > details[open] > summary:after {
-    content: "\f0d8";
-    font-family: FontAwesome;
-  }
-}
-
-.ofn-drop-down-v2 {
-  border: 1px solid $pale-blue;
-  background-color: white;
-  padding: 0px;
-
-  &:hover {
-    border-color: $spree-blue;
-  }
-
-  .ofn-drop-down-label {
-    color: $color-3;
-    padding: 10px;
-    width: 235px;
-    display: flex;
-    justify-content: space-between;
-
-    &:hover {
-      color: $color-3;
-    }
-
-    .label {
-      padding-right: 10px;
-    }
-
-    .icon-caret-down,
-    .icon-caret-up {
-      padding-right: 0px;
-    }
-  }
-
-  .menu {
-    width: 100%;
-  }
-
-  .menu_items {
-    max-height: 200px;
-    overflow-y: scroll;
-
-    .menu_item {
-      margin-bottom: 5px;
-      color: #454545;
-      font-weight: 400;
-      cursor: pointer;
-      padding-top: 4px;
-      padding-bottom: 5px;
-      text-transform: uppercase;
-      font-size: 85%;
-    }
-  }
-}
-
-.ofn-drop-down.ofn-drop-down-v2 {
-  // Add very specific styling here for components that are in transition:
-  // ie. the ones using the two classes above
-  .ofn-drop-down-label {
-    padding-top: 7px;
-    padding-bottom: 7px;
-  }
-}

app/webpacker/css/admin/enterprise_index_panels.scss

@@ -1,120 +0,0 @@
-.enterprise_package_panel,
-.enterprise_producer_panel {
-  .info {
-    p {
-      font-size: 1rem;
-      margin: 10px 0px;
-    }
-  }
-
-  a.selector {
-    display: block;
-    position: relative;
-    margin-bottom: 20px;
-    border: 2px solid black;
-    text-align: center;
-    // width: 100%;
-    cursor: pointer;
-    &,
-    & * {
-      color: white;
-    }
-    &:hover {
-      &:after {
-        border-top-color: $spree-green;
-      }
-    }
-    &.disabled {
-      background-color: #c1c1c1;
-    }
-    .bottom {
-      background: repeating-linear-gradient(
-        60deg,
-        rgba(84, 152, 218, 0),
-        rgba(84, 152, 218, 0) 5px,
-        rgba(255, 255, 255, 0.25) 5px,
-        rgba(255, 255, 255, 0.25) 10px
-      );
-      margin-top: 1em;
-      margin-left: -15px;
-      margin-right: -15px;
-      padding: 5px;
-      text-transform: uppercase;
-    }
-    &.selected {
-      background-color: #000000;
-
-      &:after {
-        top: 50%;
-        left: 0;
-        border: solid transparent;
-        content: " ";
-        height: 0;
-        width: 0;
-        position: absolute;
-        pointer-events: none;
-
-        border-top: 20px solid transparent;
-        border-bottom: 20px solid transparent;
-        border-right: 20px solid #000000;
-        margin-top: -20px;
-        margin-left: -20px;
-      }
-    }
-  }
-}
-
-.enterprise_status_panel {
-  .status-ok {
-    margin: 30px 0px;
-    i.icon-ok-sign {
-      color: $spree-green;
-      font-size: 1.5rem;
-    }
-  }
-
-  td.description {
-    font-size: 0.9rem;
-  }
-
-  td.severity {
-    text-align: center;
-
-    i {
-      font-size: 1.5rem;
-
-      &.issue {
-        color: $color-warning;
-      }
-
-      &.warning {
-        color: #ff9848;
-      }
-    }
-  }
-}
-
-tags-input .tags li.tag-item {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  -ms-border-radius: 3px;
-  -o-border-radius: 3px;
-  border-radius: 3px;
-  margin: 2px 0 2px 3px;
-  background-image: none;
-  background-color: #5fa5e8;
-  border: none;
-  box-shadow: none;
-  color: white !important;
-  font-size: 85%;
-  height: 25px;
-}
-
-tags-input .tags .tag-item .remove-button {
-  color: white;
-}
-
-table th.actions .no-text[class*="icon-"],
-table td.actions .no-text[class*="icon-"] {
-  cursor: pointer;
-}

app/webpacker/css/admin/globals/palette.scss

@@ -1,20 +1,38 @@
-// Basic color palette for admin
+// Basic color palette for admin styles v3
-$spree-green: #9fc820;
+$white: #ffffff !default; // White
-$spree-blue: #5498da;
+$green: #9fc820 !default; // Green
+$teal: #008397 !default; // Teal (Allports)
+$orient: #006878 !default; // Orient (Cerulean)
+$dark-blue: #004e5b !default; // Dark Blue (Sherpa)
+$pale-blue: #cee1f4; // Pale blue
+$red: #c85136 !default; // Red/Orange (Mojo)
+$bright-orange: #ffa92e; // Bright orange
+$yellow: #ff9300 !default; // Yellow
+$mystic: #d9e8eb !default; // Mystic
+$lighter-grey: #f8f9fa !default; // Lighter grey
+$light-grey: #eff1f2 !default; // Light grey (Porcelain)
+$medium-light-grey: #babdbe !default; // Silver Sand
+$medium-grey: #919191 !default; // Medium grey
+$dark-grey: #2e3132 !default; // Dark Grey
+$near-black: #191c1d !default; // Near-black (Shark)
+$fair-pink: #ffefeb !default; // Fair Pink
+$roof-terracotta: #b83b1f !default; // Roof Terracotta
+
+// Old colour variables for backwards compatibility
+$spree-green: $green;
+$spree-blue: $teal;
 $spree-light-blue: #eff5fc;
-$pale-blue: #cee1f4;
+$color-1: $white;
-$bright-orange: #ffa92e;
+$color-2: $green;
-$medium-grey: #919191;
+$color-3: $teal;
-$light-grey: #ccc;
+$color-4: $dark-blue;
-
+$color-5: $red;
-$color-1: #ffffff !default; // White
+$color-6: $yellow;
-$color-2: $spree-green !default; // Green
+$color-7: $light-grey;
-$color-3: $spree-blue !default; // Light Blue
+$color-8: $near-black;
-$color-4: #6788a2 !default; // Dark Blue
+$color-9: $dark-grey;
-$color-5: #c60f13 !default; // Red
+$color-10: $orient;
-$color-6: #ff9300 !default; // Yellow
+$color-11: $mystic;
-$color-14: #f8f9fa !default; // Lighter grey
+$color-12: $fair-pink;
-
+$color-13: $roof-terracotta;
-$dark-grey: #333;
+$color-14: $lighter-grey;
-$light-grey: #ddd;
-$near-black: #222;

app/webpacker/css/admin/plugins/select2.scss

@@ -1,189 +0,0 @@
-.select2-container {
-  &:hover .select2-choice,
-  &.select2-container-active .select2-choice {
-    background-color: $color-sel-hover-bg !important;
-    border-color: $color-sel-hover-bg !important;
-  }
-  .select2-choice {
-    background-image: none !important;
-    background-color: $color-sel-bg;
-    border: none !important;
-    box-shadow: none !important;
-    @include border-radius($border-radius);
-    color: $color-1 !important;
-    font-size: 90%;
-    height: 31px;
-    line-height: inherit !important;
-    padding: 5px 15px 7px;
-
-    span {
-      display: block;
-      padding: 2px;
-    }
-
-    .select2-search-choice-close {
-      background-image: none !important;
-      font-size: 100% !important;
-      @extend .icon-remove;
-      @extend [class^="icon-"], :before;
-      margin-top: 2px;
-    }
-  }
-
-  &.select2-container-active {
-    .select2-choice {
-      box-shadow: none !important;
-    }
-
-    &.select2-dropdown-open .select2-choice div b {
-      @extend .icon-caret-up;
-    }
-  }
-}
-
-.select2-drop {
-  border-color: $color-sel-hover-bg;
-  box-shadow: none !important;
-  z-index: 1000000;
-
-  &.select2-drop-above {
-    border-color: $color-sel-hover-bg;
-  }
-}
-
-.select2-search {
-  @extend .icon-search;
-
-  font-size: 100%;
-  color: darken($color-border, 15);
-  padding: 0 9px 0 0;
-
-  &:before {
-    @extend [class^="icon-"], :before;
-
-    position: absolute;
-    top: 13px;
-    left: 13px;
-  }
-
-  input {
-    @extend input, [type="text"];
-
-    padding: 6px 0 6px 25px;
-    margin: 5px 0 0 5px;
-    font-family: $base-font-family;
-    font-size: 90%;
-    box-shadow: none;
-    background-image: none;
-  }
-}
-
-.select2-container .select2-choice .select2-arrow {
-  background-image: none;
-  background: transparent;
-  border: 0;
-
-  b {
-    padding-top: 7px;
-    display: block;
-    width: 100%;
-    height: 100%;
-    background: none;
-    font-family: FontAwesome;
-    font-weight: 200 !important;
-
-    &:before {
-      content: "\f0d7";
-    }
-  }
-}
-
-.select2-results {
-  padding-left: 0 !important;
-
-  li {
-    font-size: 85% !important;
-
-    &.select2-highlighted {
-      .select2-result-label {
-        &,
-        h6 {
-          color: $color-1 !important;
-        }
-      }
-    }
-
-    .select2-result-label {
-      color: $color-body-text;
-      min-height: 22px;
-      clear: both;
-      overflow: auto;
-    }
-
-    &.select2-no-results,
-    &.select2-searching {
-      padding: 5px;
-      background-color: transparent;
-      color: $color-body-text;
-      text-align: center;
-      font-weight: $font-weight-bold;
-      text-transform: uppercase;
-    }
-  }
-
-  .select2-highlighted {
-    background-color: $color-sel-bg;
-  }
-}
-
-.select2-container-multi {
-  &.select2-container-active,
-  &.select2-dropdown-open {
-    .select2-choices {
-      border-color: $color-sel-hover-bg !important;
-      box-shadow: none;
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-  }
-  .select2-choices {
-    @extend input, [type="text"];
-    padding: 6px 3px 3px 3px;
-    box-shadow: none;
-    background-image: none !important;
-
-    .select2-search-choice {
-      @include border-radius($border-radius);
-      margin: 0 0 3px 3px;
-      background-image: none;
-      background-color: $color-sel-bg;
-      border: none;
-      box-shadow: none;
-      color: $color-1 !important;
-      font-size: 85%;
-
-      &:hover {
-        background-color: $color-sel-hover-bg;
-      }
-
-      .select2-search-choice-close {
-        background-image: none !important;
-        font-size: 85% !important;
-        @extend .icon-remove;
-        @extend [class^="icon-"], :before;
-        margin-left: 2px;
-        color: $color-1;
-      }
-    }
-  }
-}
-
-label .select2-container {
-  margin-top: -6px;
-  .select2-choice {
-    span {
-      text-transform: none;
-      font-weight: normal;
-    }
-  }
-}

app/webpacker/css/admin/product_import.scss

@@ -1,299 +0,0 @@
-$pi-red: $color-warning;
-$pi-green: lighten($spree-green, 10%);
-$pi-orange: $bright-orange;
-$pi-blue: lighten($spree-blue, 10%);
-$pi-light-yellow: #faffaf;
-
-// scss-lint:disable NestingDepth
-
-div.panel-section {
-  .error {
-    color: $pi-red;
-  }
-  .warning {
-    color: $bright-orange;
-  }
-  .success {
-    color: $pi-green;
-  }
-  .info {
-    color: #68b7c0;
-  }
-
-  div.panel-header {
-    width: 100%;
-    clear: both;
-    float: left;
-    padding: 0.5em;
-
-    div {
-      font-size: 1.25em;
-      float: left;
-    }
-
-    div.header-caret {
-      width: 2em;
-      text-align: center;
-      min-height: 0.1em; //Empty div fix
-    }
-
-    div.header-icon {
-      width: 2.5em;
-      text-align: center;
-      padding-top: 0.18em;
-
-      i {
-        font-size: 1.5em;
-        line-height: 0.9em;
-      }
-    }
-
-    div.header-count {
-      min-width: 2em;
-      text-align: right;
-      padding-right: 0.5em;
-    }
-
-    div.header-description {
-      width: auto;
-    }
-  }
-
-  div.panel-header:hover {
-    cursor: pointer;
-    background-color: #f7f7f7;
-  }
-
-  div.panel-header.active {
-    background-color: #efefef;
-    text-shadow: 1px 1px 0px rgba(255, 255, 255, 0.75);
-  }
-
-  div.panel-content {
-    width: 100%;
-    clear: both;
-    margin-bottom: 0.5em;
-    background-color: #f9f9f9;
-    padding: 1.5em;
-
-    div.table-wrap {
-      width: 100%;
-      overflow: auto;
-      border-right: 1px solid #ceede3;
-      max-height: 23em;
-    }
-
-    table {
-      background-color: white;
-      margin-bottom: 0;
-      td,
-      th {
-        white-space: nowrap;
-      }
-
-      tr {
-        &.error {
-          color: #c84c4c;
-        }
-
-        &:hover td.invalid {
-          background-color: darken(#f05c51, 5%);
-        }
-
-        i {
-          display: block;
-          margin-bottom: -0.2em;
-          font-size: 1.4em !important;
-        }
-      }
-
-      td {
-        &.invalid {
-          background-color: #f05c51;
-          box-shadow: inset 0px 0px 1px red;
-          color: white;
-        }
-      }
-    }
-
-    div.import-errors {
-      margin-bottom: 0.85em;
-
-      p.line {
-        font-size: 1.15em;
-        margin-bottom: 0.2em;
-        color: #577084;
-      }
-      p.error {
-        color: #cb1b1b;
-        margin-bottom: 0.2em;
-      }
-    }
-  }
-}
-
-br.panels.clearfix {
-  clear: both;
-}
-
-.panel-section.import-settings {
-  .header-description {
-    padding-left: 1em;
-  }
-
-  span.header-error {
-    font-size: 0.85em;
-    color: $pi-red;
-  }
-
-  .select2-search {
-    display: none;
-  }
-
-  .select2-results {
-    margin: 0;
-  }
-}
-
-.post-save-results {
-  p {
-    font-size: 1.25em;
-    margin-bottom: 0.5em;
-
-    strong {
-      margin-right: 0.2em;
-      min-width: 1.8em;
-      display: inline-block;
-      text-align: right;
-    }
-
-    i {
-      font-size: 1.4em;
-      vertical-align: middle;
-      position: relative;
-    }
-
-    i.fa-check-circle {
-      color: $pi-green;
-    }
-    i.fa-info-circle {
-      color: $pi-blue;
-    }
-  }
-
-  p.save-error {
-    color: #ee4728;
-    font-size: 1.05em;
-    margin-top: 0.4em;
-  }
-}
-
-form.product-import,
-div.post-save-results,
-div.import-wrapper {
-  input[type="submit"] {
-    margin-right: 0.5em;
-  }
-  input[type="submit"],
-  button,
-  a.button {
-    min-width: 8em;
-    text-align: center;
-  }
-}
-
-div.import-wrapper {
-  .alert-box {
-    margin: 0 0 1.75em;
-  }
-
-  .ng-hide:not(.ng-hide-animate) {
-    // We have to use !important here to override angular's display properties
-    // scss-lint:disable ImportantRule
-    display: block !important;
-    position: absolute;
-    opacity: 0;
-    top: -9999px;
-    left: -9999px;
-  }
-
-  .ng-hide-add,
-  .ng-hide-remove,
-  .ng-hide-animate {
-    transition: all 0.4s ease-in-out;
-  }
-
-  form.product-import,
-  div.save-results {
-    transition: all 0.4s ease-in-out;
-  }
-
-  div.progress-interface {
-    text-align: center;
-    transition: all 0.4s ease-in-out;
-
-    button:disabled {
-      background: #ccc !important;
-    }
-  }
-
-  .post-save-results {
-    a.button {
-      float: left;
-      margin-right: 0.5em;
-    }
-  }
-}
-
-div.progress-bar {
-  height: 25px;
-  width: 30em;
-  max-width: 90%;
-  margin: 1em auto;
-  background: #f7f7f7;
-  padding: 3px;
-  border-radius: 0.3em;
-  border: 1px solid #eee;
-
-  span.progress-track {
-    display: block;
-    background: lighten($pi-green, 10%);
-    height: 100%;
-    border-radius: 0.3em;
-    box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-    transition: width 0.3s ease-in-out;
-  }
-}
-
-#upload-sidebar {
-  float: right;
-  background-color: lighten($spree-light-blue, 2.5%);
-  border: 1px solid lighten($pale-blue, 2.5%);
-  width: 50%;
-  padding: 0 1.5em 1.5em;
-
-  h4,
-  h5,
-  h6,
-  p {
-    margin: 1.25em 0 1em;
-  }
-
-  a.download {
-    display: block;
-    font-size: 1.05em;
-    margin-bottom: 0.5em;
-
-    i {
-      margin-right: 0.25em;
-    }
-  }
-
-  span.category {
-    display: inline-block;
-    background-color: $pi-blue;
-    color: white;
-    padding: 0.3em 0.6em;
-    margin: 0 0.4em 0.5em 0;
-  }
-}

app/webpacker/css/admin/products_v3.scss

@@ -1,6 +1,6 @@
 // Customisations for the new Bulk Edit Products page only
 // Scoped to containing div, because Turbo messes with body classes
-@import "../admin_v3/pages/unit_popout";
+@import "pages/unit_popout";
 
 #products_v3_page {
   #content > .row:first-child > .container:first-child {
@@ -59,6 +59,7 @@
         overflow: visible;
         background-color: white;
       }
+
       .form-actions-wrapper2 {
         position: relative;
         // Stretch to cover table side borders
@@ -157,6 +158,7 @@
       tr:first-child td {
         border-top: 4px solid $color-tbl-bg;
       }
+
       tr:last-child td {
         border-bottom: 1px solid $color-tbl-cell-shadow;
       }
@@ -187,6 +189,7 @@
     $columns:
       "image", "name", "sku", "unit_scale", "unit", "price", "on_hand", "producer", "category",
       "tax_category", "tags", "inherits_properties";
+
     @each $col in $columns {
       &.hide-#{$col} {
         .col-#{$col} {
@@ -237,6 +240,7 @@
       align-items: center;
       gap: 10px;
     }
+
     .per-page {
       width: 9em;
     }
@@ -286,6 +290,7 @@
 
       .search-button {
         position: relative;
+
         > input {
           padding-left: 30px;
         }
@@ -295,6 +300,7 @@
 
   // Blurred and non-clickable
   $disabled-blur: 1.5px;
+
   .disabled-section {
     position: relative;
 
@@ -346,6 +352,7 @@
     from {
       transform: scaleY(1);
     }
+
     to {
       transform: scaleY(0);
     }
@@ -360,6 +367,7 @@
     from {
       transform: scaleY(0);
     }
+
     to {
       transform: scaleY(1);
     }

app/webpacker/css/admin/select2.scss

@@ -1,63 +0,0 @@
-.select2-container {
-  .select2-choice {
-    .select2-search-choice-close {
-      display: none !important;
-    }
-    .select2-arrow {
-      width: 22px;
-      border: none;
-      background-image: none;
-      background-color: transparent;
-    }
-  }
-
-  &.light {
-    .select2-choice {
-      background-color: #ffffff;
-      font-weight: normal;
-      color: $spree-blue !important;
-      border: 1px solid $color-border !important;
-    }
-
-    &:hover,
-    &.select2-container-active {
-      .select2-choice {
-        background-color: #ffffff !important;
-        border: 1px solid $spree-green !important;
-
-        .select2-arrow {
-          &:before {
-            color: $spree-blue;
-          }
-        }
-      }
-    }
-  }
-
-  &.select2-container-multi {
-    .select2-search-field {
-      max-height: 20px;
-      input {
-        padding: 0 !important;
-        margin: 0 0 0 5px !important;
-      }
-    }
-    .select2-search-choice {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding-left: 7px;
-
-      .select2-search-choice-close {
-        position: relative;
-        order: -1;
-        width: auto;
-        left: 0;
-        top: 0;
-        margin: 0;
-        padding: 0;
-        font-size: 100% !important;
-      }
-    }
-  }
-}

app/webpacker/css/admin/sidebar-item.scss

@@ -1,124 +0,0 @@
-div.sidebar_item {
-  margin-bottom: 30px;
-
-  .centered {
-    text-align: center;
-  }
-
-  div.header {
-    font-size: 105%;
-    color: #fff;
-    padding: 10px 0px;
-    position: relative;
-
-    &.blue {
-      background-color: $spree-blue;
-    }
-
-    &.red {
-      background-color: $color-warning;
-    }
-  }
-
-  .list {
-    max-height: 400px;
-    overflow-y: auto;
-    overflow-x: hidden;
-
-    &.red {
-      color: $color-warning;
-
-      .list-item {
-        border: solid $color-warning;
-        border-width: 0px 3px 0px 3px;
-
-        a.alpha,
-        span.alpha {
-          margin-left: -3px;
-        }
-
-        &.odd {
-          background-color: #fcf6ef;
-
-          &:hover {
-            background-color: $spree-green;
-          }
-        }
-      }
-
-      a {
-        color: $color-warning;
-      }
-    }
-  }
-
-  .list-item {
-    .icon-arrow-right {
-      padding-top: 6px;
-      font-size: 20px;
-    }
-
-    border: solid $spree-blue;
-    border-width: 0px 1px 0px 1px;
-
-    a.alpha,
-    span.alpha {
-      font-weight: bold;
-      margin-left: -1px;
-      padding: 10px 2px 10px 5%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    span.omega {
-      padding: 8px 18px 8px 0px;
-      margin-right: -3px;
-      text-align: right;
-    }
-
-    .icon-remove-sign {
-      color: $color-warning;
-      font-size: 18px;
-    }
-
-    &.even {
-      background-color: #fff;
-    }
-
-    &.odd {
-      background-color: $spree-light-blue;
-    }
-
-    &.even,
-    &.odd {
-      &:hover {
-        color: #ffffff;
-        background-color: $spree-green;
-
-        a {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-
-  a.button {
-    color: #fff;
-    padding: 15px 15px;
-    font-weight: bold;
-    text-align: center;
-    border-radius: 0px;
-
-    &.blue {
-      background-color: $spree-blue;
-    }
-
-    &.red {
-      background-color: $color-warning;
-    }
-
-    &:hover {
-      background-color: $spree-green;
-    }
-  }
-}