accept changesfrom upstream and resolve merge conflict ~ automatic go invoices

config/app_config.yml.SAMPLE

@@ -118,9 +118,9 @@ default: &defaults
   #      label: Birthday
   #      as: date_picker
 
-  # Uncomment to add tracking code for web statistics, e.g. for Piwik. (Added to bottom of page)
+  # Uncomment to add tracking code for web statistics, e.g. for Matomo. (Added to bottom of page)
   #webstats_tracking_code: |
-  #  <!-- Piwik -->
+  #  <!-- Matomo -->
   #  ......
 
   # email address to be used as sender
@@ -137,6 +137,8 @@ default: &defaults
   notification:
     error_recipients:
       - admin@foodcoop.test
+    feedback_recipients:
+      - support@foodcoop.test
     sender_address: "\"Foodsoft Error\" <foodsoft@foodcoop.test>"
     email_prefix: "[Foodsoft]"
 

config/environments/development.rb.SAMPLE

@@ -31,6 +31,9 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 

config/environments/production.rb

@@ -40,6 +40,9 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'

config/environments/test.rb

@@ -31,6 +31,10 @@ Rails.application.configure do
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.

config/initializers/active_storage_foodcoop_path.rb

@@ -0,0 +1,15 @@
+require 'active_storage/service/disk_service'
+
+module FoodsoftActiveStorageDiskService
+  def self.included(base) # :nodoc:
+    base.class_eval do
+      def path_for(key)
+        File.join root, FoodsoftConfig.scope, folder_for(key), key
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:after_initialize) do
+  ActiveStorage::Service::DiskService.include FoodsoftActiveStorageDiskService
+end

config/storage.yml.SAMPLE

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]