raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6021 from Matt-Yorkley/concerns

Browse Source 
Move concern to concerns directory
This commit is contained in:
Pau Pérez Fabregat
2020-09-15 17:45:24 +02:00
committed by GitHub
parent 27ffe9edb2 276fea6942
commit 7006b0af4c
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/concerns/payment_method_distributors.rb Normal file
View File

@@ -0,0 +1,19 @@
# frozen_string_literal: true
require 'active_support/concern'
# This concern is used to duplicate the associations distributors and distributor_ids
# across payment method and gateway
# this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
module PaymentMethodDistributors
extend ActiveSupport::Concern
def self.included(base)
base.class_eval do
has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods',
class_name: 'Enterprise',
foreign_key: 'payment_method_id',
association_foreign_key: 'distributor_id'
end
end
end

16
app/models/spree/concerns/payment_method_distributors.rb
View File

@@ -1,16 +0,0 @@
require 'active_support/concern'
# This concern is used to duplicate the associations distributors and distributor_ids
# across payment method and gateway
# this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
module Spree
module PaymentMethodDistributors
extend ActiveSupport::Concern
def self.included(base)
base.class_eval do
has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods', class_name: 'Enterprise', foreign_key: 'payment_method_id', association_foreign_key: 'distributor_id'
end
end
end
end

4
app/models/spree/gateway.rb
View File

@@ -1,10 +1,8 @@
# frozen_string_literal: true
require 'spree/concerns/payment_method_distributors'
module Spree
class Gateway < PaymentMethod
include Spree::PaymentMethodDistributors
include PaymentMethodDistributors
delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit

4
app/models/spree/payment_method.rb
View File

@@ -1,11 +1,9 @@
# frozen_string_literal: true
require 'spree/concerns/payment_method_distributors'
module Spree
class PaymentMethod < ActiveRecord::Base
include Spree::Core::CalculatedAdjustments
include Spree::PaymentMethodDistributors
include PaymentMethodDistributors
acts_as_taggable
acts_as_paranoid