solidus_core 2.9.6 → 2.11.0

data/app/models/spree/user_last_url_storer.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Spree
+  # This service object is responsible for storing the current path into
+  # into `session[:spree_user_return_to]` for redirects after successful
+  # user/admin authentication.
+  class UserLastUrlStorer
+    # Lists all the rules that will be evaluated before storing the
+    # current path value into the session.
+    #
+    # @return [Spree::Core::ClassConstantizer::Set] a set of rules
+    #  that, when matched, will prevent session[:spree_user_return_to]
+    #  to be set
+    #
+    # @example This method can be used also to add more rules
+    #  Spree::UserLastUrlStorer.rules << 'CustomRule'
+    #
+    # @example it can be used also for removing unwanted rules
+    #  Spree::UserLastUrlStorer.rules.delete('CustomRule')
+    #
+    def self.rules
+      Spree::Config.user_last_url_storer_rules
+    end
+
+    # @param controller [ApplicationController] an instance of ApplicationController
+    #  or its subclasses. The controller will be passed to each rule for matching.
+    def initialize(controller)
+      @controller = controller
+    end
+
+    # Stores into session[:spree_user_return_to] the request full path for
+    # future redirects (to be used after successful authentication). When
+    # there is a rule match then the request full path is not stored.
+    def store_location
+      return if self.class.rules.any? { |rule| rule.match? controller }
+
+      session[:spree_user_return_to] = request.fullpath.gsub('//', '/')
+    end
+
+    private
+
+    attr_reader :controller
+
+    delegate :session, :request, to: :controller
+  end
+end

data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Spree
+  class UserLastUrlStorer
+    module Rules
+      # This is the basic rule that ships with Solidus that avoids storing in
+      # session the current path for login/loout/signup routes, avoiding possibly
+      # infinte redirects.
+      module AuthenticationRule
+        AUTHENTICATION_ROUTES = %w[spree_signup_path spree_login_path spree_logout_path]
+
+        extend self
+
+        def match?(controller)
+          full_path = controller.request.fullpath
+          disallowed_urls(controller).include?(full_path)
+        end
+
+        private
+
+        def disallowed_urls(controller)
+          @disallowed_urls ||= {}
+          @disallowed_urls[controller.controller_name] ||= begin
+            [].tap do |disallowed_urls|
+              AUTHENTICATION_ROUTES.each do |route|
+                if controller.respond_to?(route)
+                  disallowed_urls << controller.send(route)
+                end
+              end
+            end.map! { |url| url[/\/\w+$/] }
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/user_stock_location.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class UserStockLocation < Spree::Base
-    belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations
-    belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations
+    belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations, optional: true
+    belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations, optional: true
   end
 end

data/app/models/spree/variant.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   # == Master Variant
   #
@@ -20,11 +18,7 @@ module Spree
   class Variant < Spree::Base
     acts_as_list scope: :product
 
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     after_discard do
       stock_items.discard_all
@@ -36,11 +30,11 @@ module Spree
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
-    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
+    belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
-    delegate :name, :description, :slug, :available_on, :shipping_category_id,
-             :meta_description, :meta_keywords, :shipping_category,
+    delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
+             :shipping_category_id, :meta_description, :meta_keywords, :shipping_category,
              to: :product
     delegate :tax_category, to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
@@ -80,7 +74,7 @@ module Spree
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates_uniqueness_of :sku, allow_blank: true, if: :enforce_unique_sku?
+    validates_uniqueness_of :sku, allow_blank: true, case_sensitive: true, if: :enforce_unique_sku?
 
     after_create :create_stock_items
     after_create :set_position
@@ -250,12 +244,12 @@ module Spree
       # no option values on master
       return if is_master
 
-      option_type = Spree::OptionType.where(name: opt_name).first_or_initialize do |o|
-        o.presentation = opt_name
-        o.save!
+      option_type = Spree::OptionType.where(name: opt_name).first_or_initialize do |option|
+        option.presentation = opt_name
+        option.save!
       end
 
-      current_value = option_values.detect { |o| o.option_type.name == opt_name }
+      current_value = option_values.detect { |option| option.option_type.name == opt_name }
 
       if current_value
         return if current_value.name == opt_value
@@ -267,9 +261,9 @@ module Spree
         end
       end
 
-      option_value = Spree::OptionValue.where(option_type_id: option_type.id, name: opt_value).first_or_initialize do |o|
-        o.presentation = opt_value
-        o.save!
+      option_value = Spree::OptionValue.where(option_type_id: option_type.id, name: opt_value).first_or_initialize do |option|
+        option.presentation = opt_value
+        option.save!
       end
 
       option_values << option_value
@@ -281,7 +275,7 @@ module Spree
     # @param opt_name [String] the name of the option whose value you want
     # @return [String] the option value
     def option_value(opt_name)
-      option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
+      option_values.detect { |option| option.option_type.name == opt_name }.try(:presentation)
     end
 
     # Returns an instance of the globally configured variant price selector class for this variant.
@@ -391,9 +385,9 @@ module Spree
     #
     # @return [Array<Spree::VariantPropertyRuleValue>] variant_properties
     def variant_properties
-      product.variant_property_rules.map do |rule|
+      product.variant_property_rules.flat_map do |rule|
         rule.values if rule.applies_to_variant?(self)
-      end.flatten.compact
+      end.compact
     end
 
     # The gallery for the variant, which represents all the images
@@ -439,7 +433,7 @@ module Spree
     end
 
     def build_vat_prices
-      VatPriceGenerator.new(self).run
+      Spree::Config.variant_vat_prices_generator_class.new(self).run
     end
 
     def set_position

data/app/models/spree/variant/scopes.rb

@@ -2,41 +2,49 @@
 
 module Spree
   class Variant < Spree::Base
-    # FIXME: WARNING tested only under sqlite and postgresql
-    scope :descend_by_popularity, -> {
-      order(Arel.sql("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC"))
-    }
-
-    class << self
-      # Returns variants that match a given option value
-      #
-      # Example:
-      #
-      # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
-      def has_option(option_type, *option_values)
-        option_types = Spree::OptionType.table_name
-
-        option_type_conditions = case option_type
-                                 when OptionType then { "#{option_types}.name" => option_type.name }
-                                 when String     then { "#{option_types}.name" => option_type }
-        else { "#{option_types}.id" => option_type }
-        end
+    module Scopes
+      def self.prepended(base)
+        base.class_eval do
+          # FIXME: WARNING tested only under sqlite and postgresql
+          scope :descend_by_popularity, -> {
+            order(Arel.sql("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC"))
+          }
+
+          class << self
+            # Returns variants that match a given option value
+            #
+            # Example:
+            #
+            # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
+            def has_option(option_type, *option_values)
+              option_types = Spree::OptionType.table_name
+
+              option_type_conditions = case option_type
+                                       when OptionType then { "#{option_types}.name" => option_type.name }
+                                       when String     then { "#{option_types}.name" => option_type }
+                                       else { "#{option_types}.id" => option_type }
+                                       end
 
-        relation = joins(option_values: :option_type).where(option_type_conditions)
+              relation = joins(option_values: :option_type).where(option_type_conditions)
 
-        option_values.each do |option_value|
-          option_value_conditions = case option_value
-                                    when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
-                                    when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
-          else { "#{Spree::OptionValue.table_name}.id" => option_value }
+              option_values.each do |option_value|
+                option_value_conditions = case option_value
+                                          when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
+                                          when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
+                                          else { "#{Spree::OptionValue.table_name}.id" => option_value }
+                                          end
+                relation = relation.where(option_value_conditions)
+              end
+
+              relation
+            end
+
+            alias_method :has_options, :has_option
           end
-          relation = relation.where(option_value_conditions)
         end
-
-        relation
       end
 
-      alias_method :has_options, :has_option
+      ::Spree::Variant.prepend self
     end
   end
 end

data/app/models/spree/variant_property_rule.rb

@@ -13,7 +13,7 @@
 # targeted by the rule, the properties will automatically apply to the variant.
 module Spree
   class VariantPropertyRule < Spree::Base
-    belongs_to :product, touch: true
+    belongs_to :product, touch: true, optional: true
 
     has_many :values, class_name: 'Spree::VariantPropertyRuleValue', dependent: :destroy
     has_many :properties, through: :values
@@ -38,7 +38,11 @@ module Spree
     # @param variant [Spree::Variant] variant to check
     # @return [Boolean]
     def applies_to_variant?(variant)
-      (option_value_ids & variant.option_value_ids).present?
+      if apply_to_all
+        matches_option_value_ids?(variant.option_value_ids)
+      else
+        (option_value_ids & variant.option_value_ids).present?
+      end
     end
   end
 end

data/app/models/spree/variant_property_rule_condition.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class VariantPropertyRuleCondition < Spree::Base
-    belongs_to :option_value
-    belongs_to :variant_property_rule, touch: true
+    belongs_to :option_value, optional: true
+    belongs_to :variant_property_rule, touch: true, optional: true
 
     validates_uniqueness_of :option_value_id, scope: :variant_property_rule_id
   end

data/app/models/spree/variant_property_rule_value.rb

@@ -6,7 +6,7 @@ module Spree
 
     acts_as_list scope: :variant_property_rule
 
-    belongs_to :property
-    belongs_to :variant_property_rule, touch: true
+    belongs_to :property, optional: true
+    belongs_to :variant_property_rule, touch: true, optional: true
   end
 end

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

@@ -19,21 +19,26 @@ class Spree::Wallet::AddPaymentSourcesToWallet
       sources = payments.map(&:source).
         uniq.
         compact.
-        select { |p| p.try(:reusable?) }
+        select { |payment| payment.try(:reusable?) }
 
       # add valid sources to wallet and optionally set a default
       if sources.any?
         # arbitrarily sort by id for picking a default
-        wallet_payment_sources = sources.sort_by(&:id).map do |source|
+        sources.sort_by(&:id).each do |source|
           order.user.wallet.add(source)
         end
 
-        order.user.wallet.default_wallet_payment_source =
-          wallet_payment_sources.last
+        make_default
       end
     end
   end
 
+  protected
+
+  def make_default
+    order.user.wallet.default_wallet_payment_source = order.user.wallet_payment_sources.last
+  end
+
   private
 
   attr_reader :order

data/app/models/spree/wallet_payment_source.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class WalletPaymentSource < Spree::Base
-    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources
-    belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources
+    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources, optional: true
+    belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources, optional: true
 
     validates_presence_of :user
     validates_presence_of :payment_source

data/app/models/spree/zone.rb

@@ -13,7 +13,7 @@ module Spree
     has_many :shipping_method_zones, dependent: :destroy
     has_many :shipping_methods, through: :shipping_method_zones
 
-    validates :name, presence: true, uniqueness: { allow_blank: true }
+    validates :name, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
     after_save :remove_defunct_members
 
     scope :with_member_ids, ->(state_ids, country_ids) do
@@ -40,7 +40,7 @@ module Spree
     end
 
     alias :members :zone_members
-    accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
+    accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |member| member['zoneable_id'].blank? }
 
     self.whitelisted_ransackable_attributes = %w[name description]
 

data/app/models/spree/zone_member.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class ZoneMember < Spree::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
-    belongs_to :zoneable, polymorphic: true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members, optional: true
+    belongs_to :zoneable, polymorphic: true, optional: true
 
     delegate :name, to: :zoneable, allow_nil: true
   end

data/config/initializers/inflections.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'RMA'
+end

data/config/initializers/money.rb

@@ -3,3 +3,5 @@
 require 'money'
 
 Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
+Money.default_currency = Money::Currency.new(Spree::Config.currency)

data/config/locales/en.yml

@@ -28,6 +28,7 @@ en:
         company: Company
         firstname: First Name
         lastname: Last Name
+        name: Name
         phone: Phone
         zipcode: Zip Code
       spree/adjustment:
@@ -115,7 +116,7 @@ en:
         considered_risky: Risky
         coupon_code: Coupon Code
         created_at: Order Date
-        email: Customer E-Mail
+        email: Customer Email
         included_tax_total: Tax (incl.)
         ip_address: IP Address
         item_total: Item Total
@@ -131,6 +132,7 @@ en:
         city: Billing address city
         firstname: Billing address first name
         lastname: Billing address last name
+        name: Billing address name
         phone: Billing address phone
         state: Billing address state
         zipcode: Billing address zipcode
@@ -139,6 +141,7 @@ en:
         city: Shipping address city
         firstname: Shipping address first name
         lastname: Shipping address last name
+        name: Shipping address name
         phone: Shipping address phone
         state: Shipping address state
         zipcode: Shipping address zipcode
@@ -163,14 +166,18 @@ en:
         type: Type
       spree/price:
         amount: Price
+        country: Country
         currency: Currency
         is_default: Currently Valid
+        price: Price
+        variant: Variant
       spree/product:
         available_on: Available On
         cost_currency: Cost Currency
         cost_price: Cost Price
         depth: Depth
         description: Description
+        discontinue_on: Discontinue on
         height: Height
         master_price: Master Price
         meta_description: Meta Description
@@ -200,6 +207,7 @@ en:
         starts_at: Start
         status: Status
         usage_limit: Usage Limit
+        uses: Uses
       spree/promotion/actions/create_adjustment:
         description: Creates a promotion credit adjustment on the order
       spree/promotion/actions/create_item_adjustments:
@@ -238,7 +246,17 @@ en:
       spree/promotion/rules/user_role:
         description: Order includes User with specified Role(s)
       spree/promotion_category:
+        code: Code
         name: Name
+      spree/promotion_code:
+        value: Value
+      spree/promotion_code_batch:
+        base_code: Base code
+        email: Email
+        join_characters: Join characters
+        number_of_codes: Number of codes
+        status: Status
+        total_codes: Total codes
       spree/property:
         name: Name
         presentation: Presentation
@@ -250,6 +268,7 @@ en:
         active: Active
         code: Code
         name: Name
+        state: State
       spree/reimbursement:
         created_at: Date/Time
         number: Number
@@ -294,12 +313,15 @@ en:
         name: Name
       spree/shipping_method:
         admin_name: Internal Name
+        available_to_users: Available to users
         carrier: Carrier
         code: Code
         display_on: Display
         name: Name
         service_level: Service Level
         tracking_url: Tracking URL
+        stock_locations: Stock Locations
+        available_to_all: Available to all stock locations
       spree/shipping_rate:
         amount: Amount
         label: Label
@@ -326,6 +348,7 @@ en:
         phone: Phone
         propagate_all_variants: Propagate All Variants
         restock_inventory: Restock Inventory
+        state: State
         state_id: State
         zipcode: Zip
       spree/stock_movement:
@@ -339,6 +362,7 @@ en:
         default: Default
         default_currency: Default Currency
         mail_from_address: Mail From Address
+        bcc_email: BCC Email
         meta_description: Meta Description
         meta_keywords: Meta Keywords
         name: Site Name
@@ -358,6 +382,9 @@ en:
         action: Action
         amount_remaining: Total Unused
         user_total_amount: Total Amount
+      spree/store_credit_reason:
+        name: Name
+        state: State
       spree/store_credit_update_reason:
         name: Name
       spree/tax_category:
@@ -372,6 +399,7 @@ en:
         name: Name
         show_rate_in_label: Show Rate in Label
         starts_at: Start Date
+        tax_categories: Tax Categories
       spree/taxon:
         description: Description
         icon: Icon
@@ -447,6 +475,7 @@ en:
           attributes:
             price:
               not_a_number: is not valid
+              does_not_match_order_currency: Line item price currency must match order currency!
         spree/price:
           attributes:
             currency:
@@ -454,8 +483,11 @@ en:
         spree/promotion:
           attributes:
             apply_automatically:
-              disallowed_with_code: Disallowed for promotions with a code
               disallowed_with_path: Disallowed for promotions with a path
+        spree/promotion_code:
+          attributes:
+            base:
+              disallowed_with_apply_automatically: Could not create promotion code on promotion that apply automatically
         spree/refund:
           attributes:
             amount:
@@ -667,7 +699,7 @@ en:
         one: RMA Reason
         other: RMA Reasons
       spree/role:
-        one: Roles
+        one: Role
         other: Roles
       spree/shipment:
         one: Shipment
@@ -762,6 +794,7 @@ en:
       refund: Refund
       remove: Remove
       save: Save
+      send_email: Send Email
       ship: Ship
       split: Split
       update: Update
@@ -778,6 +811,8 @@ en:
     add_option_value: Add Option Value
     add_product: Add Product
     add_product_properties: Add Product Properties
+    add_variant_properties: Add Variant Properties
+    applies_to_all_variant_properties: Applies to all Variant Properties above
     add_rule_of_type: Add rule of type
     add_state: Add State
     add_stock: Add Stock
@@ -819,6 +854,11 @@ en:
           drag_and_drop: or drag and drop them here
           image_process_failed: Server failed to process the image
           upload_images: Upload Images
+      order:
+        events:
+          approve: Approve
+          cancel: Cancel
+          resume: Resume
       payments:
         source_forms:
           storecredit:
@@ -855,6 +895,9 @@ en:
         expired: Expired
         inactive: Inactive
         not_started: Not started
+      shipping_methods:
+        form:
+          stock_locations_placeholder: 'Choose stock locations'
       stock_locations:
         form:
           address: Address
@@ -1065,6 +1108,7 @@ en:
     cannot_create_payment_without_payment_methods_html: You cannot create a payment
       for an order without any payment methods defined. %{link}
     cannot_create_returns: Cannot create returns as this order has no shipped units.
+    cannot_edit_orders: You may only edit your current shopping cart.
     cannot_perform_operation: Cannot perform requested operation
     cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed
       order.
@@ -1350,6 +1394,14 @@ en:
     hidden: hidden
     hide_out_of_stock: Hide out of stock
     hints:
+      spree/calculator:
+        tax_rates: This is used to calculate both sales tax (United States-style taxes)
+          and value-added tax (VAT). Typically this calculator should be the only tax
+          calculator required by your store.
+        shipping_methods: This is used to calculate the shipping rates on a per order or
+          per package rate.
+        promotions: This is used to determine the promotional discount to be applied to an
+          order, an item, or shipping charges.
       spree/price:
         country: 'This determines in what country the price is valid.<br/>Default:
           Any Country'
@@ -1361,17 +1413,25 @@ en:
         available_on: This sets the availability date for the product. If this value
           is not set, or it is set to a date in the future, then the product is not
           available on the storefront.
+        discontinue_on: This sets the discontinue date for the product. If this value
+          is set to a date, then the product is not available on the storefront from
+          that day on anymore.
         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'
+          Default: %{default_tax_category}'
       spree/promotion:
         expires_at: This determines when the promotion expires. <br/> If no value
           is specified, the promotion will never expire.
         starts_at: This determines when the promotion can be applied to orders. <br/>
           If no value is specified, the promotion will be immediately available.
+        promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion
+          because all its rules / actions will be applied automatically to all orders.
+      spree/shipping_method:
+        available_to_all: Uncheck to select specific stock locations this
+          shipping method will be available in.
       spree/stock_location:
         active: 'This determines whether stock from this location can be used when
           building packages.<br/> Default: Checked'
@@ -1393,6 +1453,8 @@ en:
           (orders which don't yet have an address).<br/> Default: None."
         code: 'An identifier for your store. Developers may need this value if you operate
           multiple storefronts.'
+      spree/tax_category:
+        is_default: 'When checked, this tax category will be selected by default when creating new products or variants.'
       spree/tax_rate:
         validity_period: This determines the validity period within which the tax
           rate is valid and will be applied to eligible items. <br /> If no start
@@ -1466,6 +1528,11 @@ en:
     iso_name: Iso Name
     item: Item
     item_description: Item Description
+    items_selected:
+      all: All Items Selected
+      none: No Item Selected
+      one: One Item Selected
+      custom: Items Selected
     item_total: Item Total
     item_total_rule:
       operators:
@@ -1498,6 +1565,7 @@ en:
     log_entries: Log Entries
     logged_in_as: Logged in as
     logged_in_succesfully: Logged in successfully
+    logged_in_successfully: Logged in successfully
     logged_out: You have been logged out.
     login: Login
     login_as_existing: Login as Existing Customer
@@ -1527,6 +1595,7 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     minimal_amount: Minimal Amount
+    minimize_menu: Minimize Menu
     modify_stock_count: Modify (+/-)
     month: Month
     more: More
@@ -1534,6 +1603,7 @@ en:
     my_account: My Account
     my_orders: My Orders
     name: Name
+    name_contains: Name Contains
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
     negative_movement_absent_item: Cannot create negative movement for absent stock
@@ -1923,10 +1993,9 @@ en:
     select: Select
     select_a_reason: Select a reason
     select_a_stock_location: Select a stock location
-    select_stock: Select stock
     selected_quantity_not_available: selected of %{item} is not available.
     send_copy_of_all_mails_to: Send Copy of All Mails To
-    send_mailer: Send Mailer
+    send_mailer: Send Shipment Email
     send_mails_as: Send Mails As
     server: Server
     server_error: The server returned an error
@@ -1934,6 +2003,7 @@ en:
     ship: ship
     ship_address: Ship Address
     ship_address_required: Valid shipping address required
+    bill_address_required: Valid billing address required
     ship_total: Ship Total
     shipment: Shipment
     shipment_adjustments: Shipment adjustments
@@ -2083,6 +2153,7 @@ en:
       (i.e. if the tax rate is 5% then enter 0.05)
     tax_rates: Tax Rates
     taxon: Taxon
+    taxon_attachment_removal_error: There was an error removing the attachment
     taxon_edit: Edit Taxon
     taxon_placeholder: Add a Taxon
     taxon_rule:
@@ -2202,8 +2273,7 @@ en:
     you_cannot_undo_action: You will not be able to undo this action
     you_have_no_orders_yet: You have no orders yet
     your_cart_is_empty: Your cart is empty
-    your_order_is_empty_add_product: Your order is empty, please search for and add
-      a product above
+    your_order_is_empty_add_product: Your order is empty. Please add products first.
     zip: Zip
     zipcode: Zip Code
     zone: Zone