Merge pull request #12914 from mkllnk/remove-stock-location-from-retu…

…rn-authorization Remove StockLocation from ReturnAuthorization
openfoodfoundation · Oct 15, 2024 · b461d49 · b461d49
2 parents c1c2811 + a64aea4
commit b461d49
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/app/controllers/spree/admin/return_authorizations_controller.rb b/app/controllers/spree/admin/return_authorizations_controller.rb
@@ -23,7 +23,7 @@ def associate_inventory_units
 
       def permitted_resource_params
         params.require(:return_authorization).
-          permit(:amount, :reason, :stock_location_id)
+          permit(:amount, :reason)
       end
     end
   end

diff --git a/app/models/spree/return_authorization.rb b/app/models/spree/return_authorization.rb
@@ -2,12 +2,12 @@
 
 module Spree
   class ReturnAuthorization < ApplicationRecord
+    self.ignored_columns += [:stock_location_id]
     acts_as_paranoid
 
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 
     has_many :inventory_units, inverse_of: :return_authorization, dependent: :nullify
-    has_one :stock_location, dependent: nil
     before_save :force_positive_amount
     before_create :generate_number
 

diff --git a/app/views/spree/admin/return_authorizations/_form.html.haml b/app/views/spree/admin/return_authorizations/_form.html.haml
@@ -41,8 +41,3 @@
     = f.label :reason, t('.reason')
     = f.text_area :reason, { style: 'height:100px;', class: 'fullwidth' }
     = f.error_message_on :reason
-
-  = f.field_container :stock_location do
-    = f.label :stock_location, t('.stock_location')
-    = f.select :stock_location_id, Spree::StockLocation.all.collect{ |l| [l.name, l.id] }, { style: 'height:100px;', class: 'fullwidth' }
-    = f.error_message_on :reason