From 91fc4b51b4a49651fdb16ff76e9b81179466f727 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:15:47 +0100
Subject: [PATCH] Rescue ImageMagick errors

---
 app/models/enterprise.rb  | 2 +-
 app/models/spree/image.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 99ce5c85c7..976b85a89f 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -461,7 +461,7 @@ class Enterprise < ApplicationRecord
     return unless image.variable?
 
     image_variant_url_for(image.variant(name))
-  rescue ActiveStorage::Error => e
+  rescue ActiveStorage::Error, MiniMagick::Error, ActionView::Template::Error => e
     Bugsnag.notify "Enterprise ##{id} #{image.try(:name)} error: #{e.message}"
     Rails.logger.error(e.message)
 
diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb
index 2ed624b595..ae021c51df 100644
--- a/app/models/spree/image.rb
+++ b/app/models/spree/image.rb
@@ -33,7 +33,7 @@ module Spree
       return self.class.default_image_url(size) unless attachment.attached?
 
       image_variant_url_for(variant(size))
-    rescue ActiveStorage::Error => e
+    rescue ActiveStorage::Error, MiniMagick::Error, ActionView::Template::Error => e
       Bugsnag.notify "Product ##{viewable_id} Image ##{id} error: #{e.message}"
       Rails.logger.error(e.message)