Fix delegates (Solidus 1.1)

renuo · Apr 17, 2018 · 26d80ba · 26d80ba
1 parent 5cd86df
commit 26d80ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
@@ -6,9 +6,9 @@
   # All write values will write to all variants (including the Master) unless that method's all_variants parameter is
   # set to false, in which case it will only write to the Master variant.
 
-  delegate_belongs_to :master, :active_sale_in, :current_sale_in, :next_active_sale_in, :next_current_sale_in,
-                      :sale_price_in, :on_sale_in?, :original_price_in, :discount_percent_in, :discount_percent, :sale_price,
-                      :original_price, :on_sale?
+  delegate :active_sale_in, :current_sale_in, :next_active_sale_in, :next_current_sale_in,
+           :sale_price_in, :on_sale_in?, :original_price_in, :discount_percent_in, :discount_percent, :sale_price,
+           :original_price, :on_sale?, to: :master
 
   # TODO also accept a class reference for calculator type instead of only a string
   def put_on_sale(value, params = {})

diff --git a/app/models/spree/sale_price.rb b/app/models/spree/sale_price.rb
@@ -2,7 +2,7 @@ module Spree
   class SalePrice < ActiveRecord::Base
 
     belongs_to :price, class_name: "Spree::Price"
-    delegate_belongs_to :price, :currency
+    delegate :currency, to: :price
 
     has_one :variant, through: :price
 

diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb
@@ -2,7 +2,7 @@
 
   has_many :sale_prices, through: :prices
 
-  delegate_belongs_to :default_price, :sale_price, :original_price, :on_sale?, :discount_percent
+  delegate :sale_price, :original_price, :on_sale?, :discount_percent, to: :default_price
 
   def put_on_sale(value, params = {})
     currencies = params.fetch(:currencies, [])