[CIty OFN Voucher]Fix VINE settings page

Dockerfile

@@ -89,4 +89,4 @@ RUN ./script/install-bundler
 RUN yarn install
 
 # Run bundler install in parallel with the amount of available CPUs
-RUN bundle install --jobs="$(nproc)"
+RUN bundle install --jobs="$(nproc)"

alpine.Dockerfile

@@ -0,0 +1,32 @@
+FROM ruby:3.1.4-alpine3.19 AS base
+ENV LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    TZ=Europe/London \
+    RAILS_ROOT=/usr/src/app
+RUN apk --no-cache upgrade && \
+    apk add --no-cache tzdata postgresql-client imagemagick imagemagick-jpeg && \
+    apk add --no-cache --virtual wkhtmltopdf
+
+WORKDIR $RAILS_ROOT
+
+# Development dependencies
+FROM base AS development-base
+RUN apk add --no-cache --virtual .build-deps \
+    build-base postgresql-dev git nodejs yarn && \
+    apk add --no-cache --virtual .dev-utils \
+    bash curl less vim chromium-chromedriver zlib-dev openssl-dev \
+    readline-dev yaml-dev sqlite-dev libxml2-dev libxslt-dev libffi-dev vips-dev && \
+    curl -o /usr/local/bin/wait-for-it https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
+    chmod +x /usr/local/bin/wait-for-it
+
+# Install yarn dependencies separately for caching
+FROM development-base AS yarn-dependencies
+COPY package.json yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+# Install Ruby gems
+FROM development-base
+COPY . $RAILS_ROOT
+COPY Gemfile Gemfile.lock ./
+RUN bundle install --jobs "$(nproc)"
+COPY --from=yarn-dependencies $RAILS_ROOT/node_modules ./node_modules

app/assets/javascripts/darkswarm/directives/map_search.js.coffee

@@ -20,10 +20,13 @@ angular.module('Darkswarm').directive 'mapSearch', ($timeout, Search) ->
     $timeout =>
       map = ctrl.getMap()
 
-      searchBox = scope.createSearchBox map
-      scope.bindSearchResponse map, searchBox
-      scope.biasResults map, searchBox
-      scope.performUrlSearch map
+      if !map
+        alert(t('gmap_load_failure'))
+      else
+        searchBox = scope.createSearchBox map
+        scope.bindSearchResponse map, searchBox
+        scope.biasResults map, searchBox
+        scope.performUrlSearch map
 
     scope.createSearchBox = (map) ->
       map.controls[google.maps.ControlPosition.TOP_LEFT].push scope.input

app/controllers/admin/connected_apps_controller.rb

@@ -77,7 +77,7 @@ def handle_error(message)
 
     def log_and_notify_exception(exception)
       Rails.logger.error exception.inspect
-      Bugsnag.notify(exception)
+      Alert.raise(exception)
     end
 
     def vine_params_empty?

app/controllers/api/v0/base_controller.rb

@@ -66,7 +66,7 @@ def set_content_type
       end
 
       def error_during_processing(exception)
-        Bugsnag.notify(exception)
+        Alert.raise(exception)
 
         render(json: { exception: exception.message },
                status: :unprocessable_entity) && return

app/controllers/api/v1/base_controller.rb

@@ -52,7 +52,7 @@ def api_key
       end
 
       def error_during_processing(exception)
-        Bugsnag.notify(exception)
+        Alert.raise(exception)
 
         if Rails.env.development? || Rails.env.test?
           render status: :unprocessable_entity,

app/controllers/concerns/order_completion.rb

@@ -50,9 +50,7 @@ def order_invalid_for_checkout?
   end
 
   def order_invalid!
-    Bugsnag.notify("Notice: invalid order loaded during checkout") do |payload|
-      payload.add_metadata :order, :order, @order
-    end
+    Alert.raise_with_record("Notice: invalid order loaded during checkout", @order)
 
     flash[:error] = t('checkout.order_not_loaded')
     redirect_to main_app.shop_path
@@ -92,9 +90,7 @@ def processing_failed
   end
 
   def notify_failure(error = RuntimeError.new(order_processing_error))
-    Bugsnag.notify(error) do |payload|
-      payload.add_metadata :order, @order
-    end
+    Alert.raise_with_record(error, @order)
     flash[:error] = order_processing_error if flash.blank?
   end
 

app/controllers/concerns/order_stock_check.rb

@@ -20,9 +20,7 @@ def handle_insufficient_stock
   def check_order_cycle_expiry
     return unless current_order_cycle&.closed?
 
-    Bugsnag.notify("Notice: order cycle closed during checkout completion") do |payload|
-      payload.add_metadata :order, :order, current_order
-    end
+    Alert.raise_with_record("Notice: order cycle closed during checkout completion", current_order)
     current_order.empty!
     current_order.set_order_cycle! nil
 

app/controllers/errors_controller.rb

@@ -4,11 +4,6 @@ class ErrorsController < ApplicationController
   layout "errors"
 
   def not_found
-    Bugsnag.notify("404") do |event|
-      event.severity = "info"
-
-      event.add_metadata(:request, :env, request.env)
-    end
     render status: :not_found, formats: :html
   end
 

app/controllers/spree/admin/payments_controller.rb

@@ -67,7 +67,7 @@ def fire
         end
       rescue StandardError => e
         logger.error e.message
-        Bugsnag.notify(e)
+        Alert.raise(e)
         flash[:error] = e.message
       ensure
         redirect_to request.referer

app/controllers/spree/admin/products_controller.rb

@@ -213,7 +213,7 @@ def set_stock_levels(product, on_hand, on_demand)
       end
 
       def notify_bugsnag(error, product, variant)
-        Bugsnag.notify(error) do |report|
+        Alert.raise(error) do |report|
           report.add_metadata(:product,
                               { product: product.attributes, variant: variant.attributes })
           report.add_metadata(:product, :product_error, product.errors.first) unless product.valid?

app/controllers/user_registrations_controller.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'open_food_network/error_logger'
 require "spree/core/controller_helpers/auth"
 require "spree/core/controller_helpers/common"
 require "spree/core/controller_helpers/order"
@@ -37,7 +36,7 @@ def create
       end
     end
   rescue StandardError => e
-    OpenFoodNetwork::ErrorLogger.notify(e)
+    Alert.raise(e)
     render_error(message: I18n.t('unknown_error', scope: I18N_SCOPE))
   end
 

app/jobs/backorder_job.rb

@@ -19,9 +19,7 @@ def self.check_stock(order)
   rescue StandardError => e
     # Errors here shouldn't affect the checkout. So let's report them
     # separately:
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata(:order, :order, order)
-    end
+    Alert.raise_with_record(e, order)
   end
 
   def perform(order)

app/jobs/report_job.rb

@@ -22,11 +22,7 @@ def perform(report_class:, user:, params:, format:, blob:, channel: nil)
 
     broadcast_result(channel, format, blob) if channel
   rescue StandardError => e
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata :report, {
-        report_class:, user:, params:, format:
-      }
-    end
+    Alert.raise(e, { report: { report_class:, user:, params:, format: } })
 
     broadcast_error(channel)
   end

app/jobs/stock_sync_job.rb

@@ -16,9 +16,7 @@ def self.sync_linked_catalogs(order)
   rescue StandardError => e
     # Errors here shouldn't affect the shopping. So let's report them
     # separately:
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata(:order, :order, order)
-    end
+    Alert.raise_with_record(e, order)
   end
 
   def self.sync_linked_catalogs_now(order)
@@ -29,9 +27,7 @@ def self.sync_linked_catalogs_now(order)
   rescue StandardError => e
     # Errors here shouldn't affect the shopping. So let's report them
     # separately:
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata(:order, :order, order)
-    end
+    Alert.raise_with_record(e, order)
   end
 
   def self.catalog_ids(order)

app/jobs/subscription_confirm_job.rb

@@ -55,9 +55,7 @@ def confirm_order!(order)
     if order.errors.any?
       send_failed_payment_email(order)
     else
-      Bugsnag.notify(e) do |payload|
-        payload.add_metadata :order, :order, order
-      end
+      Alert.raise_with_record(e, order)
       send_failed_payment_email(order, e.message)
     end
   end
@@ -108,8 +106,6 @@ def send_failed_payment_email(order, error_message = nil)
     record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver_now
   rescue StandardError => e
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata :subscription_data, { order:, error_message: }
-    end
+    Alert.raise(e, { subscription_data: { order:, error_message: } })
   end
 end

app/models/calculator/default_tax.rb

@@ -28,7 +28,7 @@ def compute_order(order)
       # In theory it should never be called any more after this has been deployed.
       # If the message below doesn't show up in Bugsnag, we can safely delete this method and all
       # the related methods below it.
-      Bugsnag.notify("Calculator::DefaultTax was called with legacy tax calculations")
+      Alert.raise("Calculator::DefaultTax was called with legacy tax calculations")
 
       calculator = OpenFoodNetwork::EnterpriseFeeCalculator.new(order.distributor,
                                                                 order.order_cycle)

app/models/enterprise.rb

@@ -481,7 +481,7 @@ def image_url_for(image, name)
 
     image_variant_url_for(image.variant(name))
   rescue StandardError => e
-    Bugsnag.notify "Enterprise ##{id} #{image.try(:name)} error: #{e.message}"
+    Alert.raise "Enterprise ##{id} #{image.try(:name)} error: #{e.message}"
     Rails.logger.error(e.message)
 
     nil

app/models/product_import/entry_validator.rb

@@ -161,7 +161,7 @@ def primary_producer_error(entry)
     end
 
     def unit_fields_validation(entry)
-      unit_types = ['g', 'oz', 'lb', 'kg', 't', 'ml', 'l', 'kl', '']
+      unit_types = ['mg', 'g', 'kg', 'oz', 'lb', 't', 'ml', 'cl', 'dl', 'l', 'kl', 'gal', '']
 
       if entry.units.blank?
         mark_as_invalid(entry, attribute: 'units',
@@ -297,7 +297,7 @@ def inventory_validation(entry)
         unscaled_units = entry.unscaled_units.to_f || 0
         entry.unit_value = unscaled_units * unit_scale unless unit_scale.nil?
 
-        if entry.match_inventory_variant?(existing_variant)
+        if entry.match_variant?(existing_variant)
           variant_override = create_inventory_item(entry, existing_variant)
           return validate_inventory_item(entry, variant_override)
         end

app/models/product_import/spreadsheet_entry.rb

@@ -85,10 +85,6 @@ def invalid_attributes
     end
 
     def match_variant?(variant)
-      match_display_name?(variant) && variant.unit_value.to_d == unscaled_units.to_d
-    end
-
-    def match_inventory_variant?(variant)
       match_display_name?(variant) && variant.unit_value.to_d == unit_value.to_d
     end
 

app/models/product_import/unit_converter.rb

@@ -32,14 +32,18 @@ def convert_custom_unit_fields
 
     def unit_scales
       {
+        'mg' => { scale: 0.001, unit: 'weight' },
         'g' => { scale: 1, unit: 'weight' },
         'kg' => { scale: 1000, unit: 'weight' },
         'oz' => { scale: 28.35, unit: 'weight' },
         'lb' => { scale: 453.6, unit: 'weight' },
         't' => { scale: 1_000_000, unit: 'weight' },
         'ml' => { scale: 0.001, unit: 'volume' },
+        'cl' => { scale: 0.01, unit: 'volume' },
+        'dl' => { scale: 0.1, unit: 'volume' },
         'l' => { scale: 1, unit: 'volume' },
-        'kl' => { scale: 1000, unit: 'volume' }
+        'kl' => { scale: 1000, unit: 'volume' },
+        'gal' => { scale: 4.54609, unit: 'volume' },
       }
     end
 

app/models/spree/image.rb

@@ -34,7 +34,7 @@ def url(size)
 
       image_variant_url_for(variant(size))
     rescue StandardError => e
-      Bugsnag.notify "Product ##{viewable_id} Image ##{id} error: #{e.message}"
+      Alert.raise "Product ##{viewable_id} Image ##{id} error: #{e.message}"
       Rails.logger.error(e.message)
 
       self.class.default_image_url(size)

app/models/spree/order.rb

@@ -535,7 +535,7 @@ def save_or_rescue_shipment(shipment)
       # because an outdated shipping fee is not as bad as a lost payment.
       # And the shipping fee is already up-to-date when this error occurs.
       # https://github.com/openfoodfoundation/openfoodnetwork/issues/3924
-      Bugsnag.notify(e) do |report|
+      Alert.raise(e) do |report|
         report.add_metadata(:order, attributes)
         report.add_metadata(:shipment, shipment.attributes)
         report.add_metadata(:shipment_in_db, Spree::Shipment.find_by(id: shipment.id).attributes)

app/models/spree/tax_rate.rb

@@ -106,7 +106,7 @@ def compute_amount(item)
           calculator.compute(item)
         else
           # Tax refund should not be possible with the way our production server are configured
-          Bugsnag.notify(
+          Alert.raise(
             "Notice: Tax refund should not be possible, please check the default zone and " \
             "the tax rate zone configuration"
           ) do |payload|

app/models/spree/variant.rb

@@ -293,7 +293,7 @@ def destruction
     end
 
     def ensure_unit_value
-      Bugsnag.notify("Trying to set unit_value to NaN") if unit_value&.nan?
+      Alert.raise("Trying to set unit_value to NaN") if unit_value&.nan?
       return unless (variant_unit == "items" && unit_value.nil?) || unit_value&.nan?
 
       self.unit_value = 1.0

app/models/stripe_account.rb

@@ -15,7 +15,7 @@ def deauthorize_and_destroy
 
     destroy && Stripe::OAuth.deauthorize(stripe_user_id:)
   rescue Stripe::OAuth::OAuthError => e
-    Bugsnag.notify(
+    Alert.raise(
       e,
       stripe_account: stripe_user_id,
       enterprise_id:

app/models/variant_override.rb

@@ -48,8 +48,8 @@ def use_producer_stock_settings?
 
   def move_stock!(quantity)
     unless stock_overridden?
-      Bugsnag.notify RuntimeError.new "Attempting to move stock of a VariantOverride " \
-                                      "without a count_on_hand specified."
+      Alert.raise "Attempting to move stock of a VariantOverride " \
+                  "without a count_on_hand specified."
       return
     end
 
@@ -73,8 +73,8 @@ def reset_stock!
         self.attributes = { on_demand: false, count_on_hand: default_stock }
         save
       else
-        Bugsnag.notify RuntimeError.new "Attempting to reset stock level for a variant " \
-                                        "with no default stock level."
+        Alert.raise "Attempting to reset stock level for a variant " \
+                    "with no default stock level."
       end
     end
     self