solidus_core 1.3.2 → 1.4.0.beta1

data/app/models/spree/store.rb

@@ -15,7 +15,8 @@ module Spree
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
     def self.current(store_key = nil)
-      current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first
+      Spree::Deprecation.warn "Spree::Store.current needs a code or URL as an argument. If you want the default store use Spree::Store.default", caller if !store_key
+      current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first if store_key
       current_store || Store.default
     end
 

data/app/models/spree/tax_rate.rb

@@ -72,7 +72,7 @@ module Spree
     # @param [Spree::Zone] order_tax_zone is the smalles applicable zone to the order's tax address
     # @param [Array<Spree::LineItem,Spree::Shipment>] items to be adjusted
     def self.adjust(order_tax_zone, items)
-      ActiveSupport::Deprecation.warn("Please use Spree::Tax::OrderAdjuster or Spree::Tax::ItemAdjuster instead", caller)
+      Spree::Deprecation.warn("Please use Spree::Tax::OrderAdjuster or Spree::Tax::ItemAdjuster instead", caller)
       items.map do |item|
         Spree::Tax::ItemAdjuster.new(item, rates_for_order_zone: for_zone(order_tax_zone)).adjust!
       end

data/app/models/spree/wallet/add_payment_sources_to_wallet.rb

@@ -0,0 +1,29 @@
+# This class is responsible for saving payment sources in the user's "wallet"
+# for future use.  You can substitute your own class via
+# `Spree::Config.add_payment_sources_to_wallet_class`.
+class Spree::Wallet::AddPaymentSourcesToWallet
+  def initialize(order)
+    @order = order
+  end
+
+  # This is called after an order transistions to complete and should save the
+  # order's payment source/s in the user's "wallet" for future use.
+  #
+  # @return [undefined]
+  def add_to_wallet
+    if !order.temporary_credit_card &&
+       order.user_id &&
+       order.valid_credit_cards.present?
+      # arbitrarily pick the first one for the default
+      default_cc = order.valid_credit_cards.first
+      # TODO: target for refactoring -- why is order checkout responsible for the user -> credit_card relationship?
+      default_cc.user_id = order.user_id
+      default_cc.default = true
+      default_cc.save
+    end
+  end
+
+  private
+
+  attr_reader :order
+end

data/app/models/spree/wallet/default_payment_builder.rb

@@ -0,0 +1,26 @@
+# This class is responsible for building a default payment on an order, using a
+# payment source that is already in the user's "wallet".
+class Spree::Wallet::DefaultPaymentBuilder
+  def initialize(order)
+    @order = order
+  end
+
+  # Build a payment to be added to an order prior to moving into the "payment"
+  # state.
+  #
+  # @return [Payment] the unsaved payment to be added, or nil if none.
+  def build
+    credit_card = order.user.try!(:default_credit_card)
+
+    if credit_card.try!(:valid?) && order.payments.from_credit_card.count == 0
+      Spree::Payment.new(
+        payment_method_id: credit_card.payment_method_id,
+        source: credit_card,
+      )
+    end
+  end
+
+  private
+
+  attr_reader :order
+end

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -0,0 +1,46 @@
+<table>
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
+      </p>
+      <% if @reimbursement.return_items.exchange_requested.present? %>
+        <p>
+          <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
+        </p>
+        <table>
+          <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
+            <tr>
+              <td>
+                <%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %>
+              </td>
+              <td>
+                ->
+              </td>
+              <td>
+                <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.name) %> <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? %>
+              </td>
+            </tr>
+          <% end %>
+          <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
+            <tr>
+              <td colspan="3">
+                <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      <% end %>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb

@@ -12,7 +12,7 @@
 <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
 ============================================================
 <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
-<%= return_item.variant.sku %> <%= raw(return_item.variant.product.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? -%> -> <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.product.name) if return_item.exchange_variant.options_text.present? %> <%= "(#{raw(return_item.exchange_variant.options_text)})" -%>
+<%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %> -> <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.name) %> <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? %>
 <% end %>
 
 

data/app/views/spree/shared/_base_mailer_footer.html.erb

@@ -1,20 +1 @@
-<!-- You can override this template to design your own footer.
-<table class="row footer">
-  <tr>
-    <td class="wrapper last">
-
-      <table class="twelve columns">
-        <tr>
-          <td align="center">
-            <center>
-              <p style="text-align:center;"><a href="#">Terms</a> | <a href="#">Privacy</a> | <a href="#">Unsubscribe</a></p>
-            </center>
-          </td>
-          <td class="expander"></td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
--->
+<!-- You can override this template to design your own footer. -->

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -1,31 +1 @@
-<!-- You can override this template to design your own header.
-<table class="row header">
-  <tr>
-    <td class="center" align="center">
-      <center>
-
-        <table class="container">
-          <tr>
-            <td class="wrapper last">
-
-              <table class="twelve columns">
-                <tr>
-                  <td class="six sub-columns">
-                    <%= image_tag(Spree::Config.logo) %>
-                  </td>
-                  <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
-                    <span class="template-label"><%= Spree::Store.current.name %></span>
-                  </td>
-                  <td class="expander"></td>
-                </tr>
-              </table>
-
-            </td>
-          </tr>
-        </table>
-
-      </center>
-    </td>
-  </tr>
-</table>
--->
+<!-- You can override this template to design your own header. -->

data/config/initializers/spree_user.rb

@@ -4,7 +4,7 @@
 
 Spree::Core::Engine.config.to_prepare do
   if Spree.user_class && !Spree.user_class.included_modules.include?(Spree::UserMethods)
-    ActiveSupport::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
+    Spree::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
     Spree.user_class.include Spree::UserMethods
   end
 end

data/config/locales/en.yml

@@ -345,6 +345,10 @@ en:
         name: Name
         default_tax: Default Tax Zone
     models:
+      # LegacyUser maps to this model_name so we want to provide translations for it
+      user:
+        one: User
+        other: Users
       spree/address:
         one: Address
         other: Addresses
@@ -369,6 +373,9 @@ en:
       spree/exchange:
         one: Exchange
         other: Exchanges
+      spree/image:
+        one: Image
+        other: Images
       spree/inventory_unit:
         one: Inventory Unit
         other: Inventory Units
@@ -415,8 +422,8 @@ en:
         one: Promotion Category
         other: Promotion Categories
       spree/property:
-        one: Property
-        other: Properties
+        one: Property Type
+        other: Property Types
       spree/prototype:
         one: Prototype
         other: Prototypes
@@ -436,8 +443,8 @@ en:
         one: Return Authorization
         other: Return Authorizations
       spree/return_reason:
-        one: Return Reason
-        other: Return Reasons
+        one: RMA Reason
+        other: RMA Reasons
       spree/role:
         one: Roles
         other: Roles
@@ -466,6 +473,9 @@ en:
       spree/stock_transfer:
         one: Stock Transfer
         other: Stock Transfers
+      spree/store_credit:
+        one: Store Credit
+        other: Store Credits
       spree/store_credit_category:
         one: Category
         other: Categories
@@ -688,10 +698,11 @@ en:
     adjustments: Adjustments
     admin:
       tab:
-        areas: Areas
-        checkout: Checkout
+        areas: Locations
+        checkout: Refunds and Returns
         configuration: Configuration
-        general: General
+        display_order: Display Order
+        general: Store
         option_types: Option Types
         orders: Orders
         overview: Overview
@@ -699,15 +710,15 @@ en:
         products: Products
         promotions: Promotions
         promotion_categories: Promotion Categories
-        properties: Properties
+        properties: Property Types
         prototypes: Prototypes
         reports: Reports
         rma: RMA
         settings: Settings
         shipping: Shipping
         stock: Stock
-        stock_items: Management
-        stock_transfers: Transfers
+        stock_items: Store Stock
+        stock_transfers: Stock Transfers
         taxes: Taxes
         taxonomies: Taxonomies
         taxons: Taxons
@@ -762,8 +773,10 @@ en:
           amount_authorized_exceeds_total_credit: " exceeds the available credit"
           amount_used_not_zero: "is greater than zero. Can not delete store credit"
           update_reason_required: "A reason for the change must be selected"
+      taxons:
+        display_order: Display Order
       variants:
-        index:
+        table_filter:
           show_deleted: Show deleted variants
         new:
           new_variant: New variant
@@ -804,6 +817,7 @@ en:
     analytics_desc_list_4: It's completely free!
     analytics_trackers: Analytics Trackers
     and: and
+    apply_code: Apply Code
     approve: approve
     approver: Approver
     approved_at: Approved at
@@ -834,12 +848,12 @@ en:
     back_to_products_list: Back To Products List
     back_to_promotions_list: Back To Promotions List
     back_to_promotion_categories_list: Back To Promotions Categories List
-    back_to_properties_list: Back To Properties List
+    back_to_properties_list: Back To Property Types List
     back_to_prototypes_list: Back To Prototypes List
     back_to_reports_list: Back To Reports List
     back_to_refund_reason_list: Back To Refund Reason List
     back_to_reimbursement_type_list: Back To Reimbursement Type List
-    back_to_return_authorizations_list: Back To Return Authorizations List
+    back_to_return_authorizations_list: Back To RMA List
     back_to_rma_reason_list: Back To RMA Reason List
     back_to_shipping_categories: Back To Shipping Categories
     back_to_shipping_categories_list: Back To Shipping Categories List
@@ -870,7 +884,7 @@ en:
     calculator: Calculator
     calculator_settings_warning: If you are changing the calculator type or preference source, you must save first before you can edit the calculator settings
     cancel: cancel
-    cancel_inventory: 'Cancel Inventory'
+    cancel_inventory: 'Cancel Items'
     canceled: canceled
     canceled_at: Canceled at
     canceler: Canceler
@@ -1021,7 +1035,7 @@ en:
     editing_product: Editing Product
     editing_promotion: Editing Promotion
     editing_promotion_category: Editing Promotion Category
-    editing_property: Editing Property
+    editing_property: Editing Property Type
     editing_prototype: Editing Prototype
     edit_refund_reason: Edit Refund Reason
     editing_refund: Editing Refund
@@ -1097,6 +1111,15 @@ en:
     expiration: Expiration
     extension: Extension
     existing_shipments: Existing shipments
+    hints:
+      spree/price:
+        country: "This determines in what country the price is valid.<br/>Default: Any Country"
+      spree/product:
+        promotionable: "This determines whether or not promotions can apply to this product.<br/>Default: Checked"
+        shipping_category: "This determines what kind of shipping this product requires.<br/> Default: Default"
+        tax_category: "This determines what kind of taxation is applied to this product.<br/> Default: None"
+      spree/variant:
+        tax_category: "This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant"
     failed_payment_attempts: Failed Payment Attempts
     failure: Failure
     filename: Filename
@@ -1125,7 +1148,7 @@ en:
     gateway_config_unavailable: Gateway unavailable for environment
     gateway_error: Gateway Error
     general: General
-    general_settings: General Settings
+    general_settings: Store
     google_analytics: Google Analytics
     google_analytics_id: Analytics ID
     group_size: Group size
@@ -1202,7 +1225,7 @@ en:
         gt: greater than
         gte: greater than or equal to
     items_cannot_be_shipped: We are unable to calculate shipping rates for the selected items.
-    items_in_rmas: Items in Return Authorizations
+    items_in_rmas: Items in RMA's (Return Merchandise Authorizations)
     items_to_be_reimbursed: Items to be reimbursed
     items_reimbursed: Items reimbursed
     jirafe: Jirafe
@@ -1214,12 +1237,12 @@ en:
     lifetime_stats: Lifetime Stats
     line_item_adjustments: "Line item adjustments"
     list: List
-    listing_countries: Listing Countries
-    listing_orders: Listing Orders
-    listing_products: Listing Products
-    listing_reports: Listing Reports
-    listing_tax_categories: Listing Tax Categories
-    listing_users: Listing Users
+    listing_countries: Countries
+    listing_orders: Orders
+    listing_products: Products
+    listing_reports: Reports
+    listing_tax_categories: Tax Categories
+    listing_users: Users
     loading: Loading
     locale_changed: Locale Changed
     location: Location
@@ -1238,7 +1261,7 @@ en:
     make_refund: Make refund
     make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
     manage_promotion_categories: Manage Promotion Categories
-    manage_stock: Manage Stock
+    manage_stock: Store Stock
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
     master_price: Master Price
@@ -1277,12 +1300,12 @@ en:
     new_product: New Product
     new_promotion: New Promotion
     new_promotion_category: New Promotion Category
-    new_property: New Property
+    new_property: New Property Type
     new_prototype: New Prototype
     new_refund: New Refund
     new_refund_reason: New Refund Reason
     new_rma_reason: New RMA Reason
-    new_return_authorization: New Return Authorization
+    new_return_authorization: New RMA
     new_shipping_category: New Shipping Category
     new_shipping_method: New Shipping Method
     new_shipment_at_location: New shipment at location
@@ -1290,11 +1313,12 @@ en:
     new_stock_location: New Stock Location
     new_stock_movement: New Stock Movement
     new_stock_transfer: New Stock Transfer
+    new_store_credit: New Store Credit
     new_tax_category: New Tax Category
     new_tax_rate: New Tax Rate
     new_taxon: New Taxon
     new_taxonomy: New Taxonomy
-    new_tracker: New Tracker
+    new_tracker: New Analytics Tracker
     new_user: New User
     new_variant: New Variant
     new_zone: New Zone
@@ -1546,8 +1570,8 @@ en:
     promotion_total_changed_before_complete: "One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again."
     promotion_uses: Promotion uses
     propagate_all_variants: Propagate all variants
-    properties: Properties
-    property: Property
+    properties: Property Types
+    property: Property Type
     prototype: Prototype
     prototypes: Prototypes
     provider: Provider
@@ -1598,10 +1622,9 @@ en:
     resume: resume
     resumed: Resumed
     return: return
-    return_authorization: Return Authorization
-    return_reasons: Return Reasons
-    return_authorization_updated: Return authorization updated
-    return_authorizations: Return Authorizations
+    return_authorization: Return Merchandise Authorization
+    return_authorizations: Return Merchandise Authorizations
+    return_authorization_updated: Return merchandise authorization updated
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
     return_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed
     return_item_order_not_completed: Return item's order must be completed
@@ -1622,6 +1645,7 @@ en:
         total_refunded: ! 'Total refunded: %{total}'
     return_number: Return Number
     return_quantity: Return Quantity
+    return_reasons: Return Reasons
     returned: Returned
     review: Review
     risk: Risk
@@ -1741,7 +1765,7 @@ en:
     stock_location_info: Stock location info
     stock_locations: Stock Locations
     stock_locations_need_a_default_country: You must create a default country before creating a stock location.
-    stock_management: Stock Management
+    stock_management: Product Stock
     stock_management_requires_a_stock_location: Please create a stock location in order to manage stock.
     stock_movements: Stock Movements
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}

data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb

@@ -1,7 +1,7 @@
 class UpdateNameFieldsOnSpreeCreditCards < ActiveRecord::Migration
   def up
     if ActiveRecord::Base.connection.adapter_name.downcase.include? "mysql"
-      execute "UPDATE spree_credit_cards SET name = CONCAT(first_name, ' ', last_name)"
+      execute "UPDATE spree_credit_cards SET name = CONCAT_WS(' ', first_name, last_name)"
     else
       execute "UPDATE spree_credit_cards SET name = first_name || ' ' || last_name"
     end

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,8 +3,20 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
     # or below. For those upgrading this should populate the Order#shipment_total
     # for legacy orders
-    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
-      order.update_column(:shipment_total, order.shipments.sum(:cost))
-    end
+    execute <<-EOS.squish
+      UPDATE spree_orders
+      SET shipment_total =
+        COALESCE(
+          (
+            SELECT SUM(spree_shipments.cost)
+            FROM spree_shipments
+            WHERE spree_shipments.order_id = spree_orders.id
+          ),
+          0
+        )
+      WHERE
+        spree_orders.completed_at IS NOT NULL
+        AND spree_orders.shipment_total = 0
+    EOS
   end
 end

data/db/migrate/20160527070401_rename_shipment_address_field.rb

@@ -0,0 +1,7 @@
+class RenameShipmentAddressField < ActiveRecord::Migration
+  def change
+    change_table :spree_shipments do |t|
+      t.rename :address_id, :deprecated_address_id
+    end
+  end
+end

data/db/migrate/20160616232103_remove_user_id_from_promotion_rules.rb

@@ -0,0 +1,11 @@
+class RemoveUserIdFromPromotionRules < ActiveRecord::Migration
+  def up
+    remove_index :spree_promotion_rules, name: 'index_promotion_rules_on_user_id'
+    remove_column :spree_promotion_rules, :user_id
+  end
+
+  def down
+    add_column :spree_promotion_rules, :user_id, :integer
+    add_index :spree_promotion_rules, [:user_id], name: 'index_promotion_rules_on_user_id'
+  end
+end

data/db/migrate/20160718205341_add_payment_id_index_to_spree_refunds.rb

@@ -0,0 +1,5 @@
+class AddPaymentIdIndexToSpreeRefunds < ActiveRecord::Migration
+  def change
+    add_index(:spree_refunds, :payment_id)
+  end
+end

data/db/migrate/20160718205859_add_reimbursement_id_index_to_spree_refunds.rb

@@ -0,0 +1,5 @@
+class AddReimbursementIdIndexToSpreeRefunds < ActiveRecord::Migration
+  def change
+    add_index(:spree_refunds, :reimbursement_id)
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -124,7 +124,7 @@ end
       core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
 
       if core_gems.include?(lib_name)
-        '../../../../Gemfile'
+        '../../../../../Gemfile'
       else
         '../../../../Gemfile'
       end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -52,7 +52,7 @@ production:
 <% unless db_host.blank? %>
   host: <%= db_host %>
 <% end %>
-<% else %>
+<% when 'sqlite', '', nil %>
 development:
   adapter: sqlite3
   database: db/spree_development.sqlite3
@@ -62,4 +62,6 @@ test:
 production:
   adapter: sqlite3
   database: db/spree_production.sqlite3
+<% else %>
+  <% raise "Invalid DB specified: #{ENV['DB']}" %>
 <% end %>

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -29,6 +29,8 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
   ActionMailer::Base.default :from => "spree@example.com"
 
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
+  # Raise on deprecation warnings
+  if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
+    Spree::Deprecation.behavior = :raise
+  end
 end

data/lib/generators/spree/install/install_generator.rb

@@ -108,24 +108,19 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
 
     def install_migrations
       say_status :copying, "migrations"
-      silence_stream(STDOUT) do
-        silence_warnings { rake 'railties:install:migrations' }
-      end
+      `rake railties:install:migrations`
     end
 
     def create_database
       say_status :creating, "database"
-      silence_stream(STDOUT) do
-        silence_stream(STDERR) do
-          silence_warnings { rake 'db:create' }
-        end
-      end
+      rake 'db:create'
     end
 
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
-        quietly { rake 'db:migrate' }
+
+        rake 'db:migrate VERBOSE=false'
       else
         say_status :skipping, "migrations (don't forget to run rake db:migrate)"
       end
@@ -139,12 +134,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
         rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
         rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
 
-        cmd = lambda { rake("db:seed #{rake_options.join(' ')}") }
-        if options[:auto_accept] || (options[:admin_email] && options[:admin_password])
-          quietly(&cmd)
-        else
-          cmd.call
-        end
+        rake("db:seed #{rake_options.join(' ')}")
       else
         say_status :skipping, "seed data (you can always run rake db:seed)"
       end
@@ -153,7 +143,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def load_sample_data
       if @load_sample_data
         say_status :loading, "sample data"
-        quietly { rake 'spree_sample:load' }
+        rake 'spree_sample:load'
       else
         say_status :skipping, "sample data (you can always run rake spree_sample:load)"
       end

data/lib/spree/core/controller_helpers/auth.rb

@@ -12,7 +12,7 @@ module Spree
         #   @return [Proc] action to take when access denied error is raised.
 
         included do
-          before_filter :set_guest_token
+          before_action :set_guest_token
           helper_method :try_spree_current_user
 
           class_attribute :unauthorized_redirect

data/lib/spree/core/controller_helpers/common.rb

@@ -10,7 +10,7 @@ module Spree
 
           layout :get_layout
 
-          before_filter :set_user_language
+          before_action :set_user_language
         end
 
         protected