diff --git a/app/models/spree/calculator/flat_rate_decorator.rb b/app/models/spree/calculator/flat_rate_decorator.rb index 9208223ee4..d7abe3cf1b 100644 --- a/app/models/spree/calculator/flat_rate_decorator.rb +++ b/app/models/spree/calculator/flat_rate_decorator.rb @@ -5,5 +5,9 @@ module Spree extend Spree::LocalizedNumber localize_number :preferred_amount + + def self.description + I18n.t(:flat_rate_per_order) + end end end diff --git a/app/models/spree/calculator/flexi_rate_decorator.rb b/app/models/spree/calculator/flexi_rate_decorator.rb index f583962e07..04ad709cbe 100644 --- a/app/models/spree/calculator/flexi_rate_decorator.rb +++ b/app/models/spree/calculator/flexi_rate_decorator.rb @@ -7,6 +7,10 @@ module Spree localize_number :preferred_first_item, :preferred_additional_item + def self.description + I18n.t(:flexible_rate) + end + def compute(object) sum = 0 max = self.preferred_max_items.to_i diff --git a/app/models/spree/calculator/per_item_decorator.rb b/app/models/spree/calculator/per_item_decorator.rb index 6a87ee2c35..9f4ecb17c4 100644 --- a/app/models/spree/calculator/per_item_decorator.rb +++ b/app/models/spree/calculator/per_item_decorator.rb @@ -6,6 +6,10 @@ module Spree localize_number :preferred_amount + def self.description + I18n.t(:flat_rate_per_item) + end + def compute(object=nil) return 0 if object.nil? self.preferred_amount * line_items_for(object).reduce(0) do |sum, value| diff --git a/app/models/spree/calculator/price_sack_decorator.rb b/app/models/spree/calculator/price_sack_decorator.rb index 3176820e68..c33f9fb4f9 100644 --- a/app/models/spree/calculator/price_sack_decorator.rb +++ b/app/models/spree/calculator/price_sack_decorator.rb @@ -7,5 +7,9 @@ module Spree localize_number :preferred_minimal_amount, :preferred_normal_amount, :preferred_discount_amount + + def self.description + I18n.t(:price_sack) + end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 9f022a3d3c..e0b1a924af 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1881,6 +1881,10 @@ See the %{link} to find out more about %{sitename}'s features and to start using calculator: "Calculator" calculator_values: "Calculator values" flat_percent_per_item: "Flat Percent (per item)" + flat_rate_per_item: "Flat Rate (per item)" + flat_rate_per_order: "Flat Rate (per order)" + flexible_rate: "Flexible Rate" + price_sack: "Price Sack" new_order_cycles: "New Order Cycles" new_order_cycle: "New Order Cycle" select_a_coordinator_for_your_order_cycle: "Select a coordinator for your order cycle"