Merge pull request #867 from Murph33/extend_exchange_class

Add ActiveModel::Naming to Exchange class

backend/app/views/spree/admin/orders/_carton.html.erb

@@ -4,7 +4,7 @@
  <span class="carton-number"><%= carton.number %></span>
  -
  <span class="carton-state"><%= Spree.t("shipment_states.shipped") %></span>
- <span class="carton-exchange"><%= Spree.t(:exchange) if carton.any_exchanges? %></span>
+ <span class="carton-exchange"><%= Spree::Exchange.model_name.human if carton.any_exchanges? %></span>
  <%= Spree.t(:package_from) %>
  <strong class="stock-location-name" data-hook="stock-location-name">'<%= carton.stock_location.name %>'</strong>
  </legend>

core/app/models/spree/exchange.rb

@@ -1,6 +1,7 @@
 module Spree
  class Exchange
  class UnableToCreateShipments < StandardError; end
+ extend ActiveModel::Naming
 
  def initialize(order, reimbursement_objects)
  @order = order
@@ -38,13 +39,5 @@ def to_key
  def self.param_key
  "spree_exchange"
  end
-
- def self.model_name
- Spree::Exchange
- end
-
- def model_name
- self.class.model_name
- end
  end
 end

core/config/locales/en.yml

@@ -318,6 +318,9 @@ en:
  spree/customer_return:
  one: Customer Return
  other: Customer Returns
+ spree/exchange:
+ one: Exchange
+ other: Exchanges
  spree/inventory_unit:
  one: Inventory Unit
  other: Inventory Units

core/spec/models/spree/exchange_spec.rb

@@ -70,9 +70,5 @@ module Spree
  describe ".param_key" do # for dom_id
  it { expect(Exchange.param_key).to eq "spree_exchange" }
  end
-
- describe ".model_name" do # for dom_id
- it { expect(Exchange.model_name).to eq Spree::Exchange }
- end
  end
 end