From c1e6344b18058a2d5e8f8b0fe576b65fe9ea33b3 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Tue, 17 Dec 2019 15:03:01 +0000
Subject: [PATCH] Merge spree js function and override

---
 app/assets/javascripts/admin/spree/base.js.erb |  4 +++-
 app/assets/javascripts/admin/util.js.erb       | 16 ----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/admin/spree/base.js.erb b/app/assets/javascripts/admin/spree/base.js.erb
index 434cf43937..dd52223cf0 100644
--- a/app/assets/javascripts/admin/spree/base.js.erb
+++ b/app/assets/javascripts/admin/spree/base.js.erb
@@ -81,6 +81,8 @@ jQuery(function($) {
 
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
+// Overriding a broken function in Spree. Bug report at
+// https://github.com/spree/spree/issues/4032
 show_flash_error = function(message) {
   error_div = $('.flash.error');
   if (error_div.length > 0) {
@@ -90,7 +92,7 @@ show_flash_error = function(message) {
     if ($("#content .toolbar").length > 0) {
       $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
     } else {
-      $("#content h1").before('<div class="flash error">' + message + '</div>');
+      $("#progress").before('<div class="flash error">' + message + '</div>');
     }
   }
 }
diff --git a/app/assets/javascripts/admin/util.js.erb b/app/assets/javascripts/admin/util.js.erb
index 37ff1cb9ca..aabd313b0f 100644
--- a/app/assets/javascripts/admin/util.js.erb
+++ b/app/assets/javascripts/admin/util.js.erb
@@ -16,22 +16,6 @@ $(document).ready(function() {
   });
 });
 
-// Overriding a broken function in Spree. Bug report at
-// https://github.com/spree/spree/issues/4032
-show_flash_error = function(message) {
-  error_div = $('.flash.error');
-  if (error_div.length > 0) {
-    error_div.html(message);
-    error_div.show();
-  } else {
-    if ($("#content .toolbar").length > 0) {
-      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
-    } else {
-      $("#progress").before('<div class="flash error">' + message + '</div>');
-    }
-  }
-}
-
 $(document).ready(function(){
   $('a.close').click(function(event){
     event.preventDefault();