solidus_core 2.10.3 → 2.11.4

data/app/models/spree/variant_property_rule.rb

@@ -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/wallet/add_payment_sources_to_wallet.rb

@@ -24,16 +24,21 @@ class Spree::Wallet::AddPaymentSourcesToWallet
       # 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/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

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
@@ -174,6 +177,7 @@ en:
         cost_price: Cost Price
         depth: Depth
         description: Description
+        discontinue_on: Discontinue on
         height: Height
         master_price: Master Price
         meta_description: Meta Description
@@ -316,6 +320,8 @@ en:
         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
@@ -356,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
@@ -468,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:
@@ -475,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:
@@ -688,7 +699,7 @@ en:
         one: RMA Reason
         other: RMA Reasons
       spree/role:
-        one: Roles
+        one: Role
         other: Roles
       spree/shipment:
         one: Shipment
@@ -783,6 +794,7 @@ en:
       refund: Refund
       remove: Remove
       save: Save
+      send_email: Send Email
       ship: Ship
       split: Split
       update: Update
@@ -799,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
@@ -840,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:
@@ -876,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
@@ -1391,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'
@@ -1423,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
@@ -1496,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:
@@ -1566,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
@@ -1957,7 +1995,7 @@ en:
     select_a_stock_location: Select a stock location
     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
@@ -1965,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

data/db/default/spree/countries.rb

@@ -5,7 +5,7 @@ require 'carmen'
 # Insert Countries into the spree_countries table, checking to ensure that no
 # duplicates are created, using as few SQL statements as possible (2)
 
-connection = ApplicationRecord.connection
+connection = Spree::Base.connection
 
 country_mapper = ->(country) do
   name            = connection.quote country.name

data/db/default/spree/states.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
+def create_states(subregions, country)
+  subregions.each do |subregion|
+    Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
+      name: subregion.name
+    )
+  end
+end
+
 ActiveRecord::Base.transaction do
   Spree::Country.all.each do |country|
     carmen_country = Carmen::Country.coded(country.iso)
     next unless carmen_country.subregions?
 
-    carmen_country.subregions.each do |subregion|
-      Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
-        name: subregion.name
-      )
+    if Spree::Config[:countries_that_use_nested_subregions].include? country.iso
+      create_states(carmen_country.subregions.flat_map(&:subregions), country)
+    else
+      create_states(carmen_country.subregions, country)
     end
   end
 end

data/db/default/spree/store_credit.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-Spree::StoreCreditCategory.find_or_create_by!(name: I18n.t('spree.store_credit_category.default'))
 
 Spree::PaymentMethod.create_with(
   name: "Store Credit",
@@ -18,6 +17,7 @@ Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree::
 Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
 Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: 'Spree::ReimbursementType::OriginalPayment')
 
-Spree::StoreCreditCategory.find_or_create_by!(name: 'Gift Card')
+Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::GIFT_CARD)
+Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::REIMBURSEMENT)
 
 Spree::StoreCreditReason.find_or_create_by!(name: 'Credit Given In Error')

data/db/migrate/20180416083007_add_apply_to_all_to_variant_property_rule.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddApplyToAllToVariantPropertyRule < ActiveRecord::Migration[5.1]
+  def up
+    add_column :spree_variant_property_rules, :apply_to_all, :boolean, default: false, null: false
+    change_column :spree_variant_property_rules, :apply_to_all, :boolean, default: true
+  end
+
+  def down
+    remove_column :spree_variant_property_rules, :apply_to_all
+  end
+end

data/db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddDefaultBillngFlagToUserAddresses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_user_addresses, :default_billing, :boolean, default: false
+  end
+end

data/db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddBccEmailToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_stores, :bcc_email, :string
+  end
+end

data/db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDiscontinueOnToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_products, :discontinue_on, :datetime
+  end
+end

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

@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Solidus
+  # @private
+  class InstallGenerator < Rails::Generators::Base
+    CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
+
+    PAYMENT_METHODS = {
+      'paypal' => 'solidus_paypal_commerce_platform',
+      'none' => nil,
+    }
+
+    class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
+    class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
+    class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
+    class_option :auto_accept, type: :boolean
+    class_option :user_class, type: :string
+    class_option :admin_email, type: :string
+    class_option :admin_password, type: :string
+    class_option :lib_name, type: :string, default: 'spree'
+    class_option :with_authentication, type: :boolean, default: true
+    class_option :enforce_available_locales, type: :boolean, default: nil
+    class_option :payment_method,
+                 type: :string,
+                 enum: PAYMENT_METHODS.keys,
+                 default: PAYMENT_METHODS.keys.first,
+                 desc: "Indicates which payment method to install."
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('../templates', "../../#{__FILE__}")
+      paths << File.expand_path('../templates', "../#{__FILE__}")
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def prepare_options
+      @run_migrations = options[:migrate]
+      @load_seed_data = options[:seed]
+      @load_sample_data = options[:sample]
+
+      unless @run_migrations
+         @load_seed_data = false
+         @load_sample_data = false
+      end
+    end
+
+    def add_files
+      template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
+    end
+
+    def additional_tweaks
+      return unless File.exist? 'public/robots.txt'
+
+      append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
+        User-agent: *
+        Disallow: /checkout
+        Disallow: /cart
+        Disallow: /orders
+        Disallow: /user
+        Disallow: /account
+        Disallow: /api
+        Disallow: /password
+      ROBOTS
+    end
+
+    def setup_assets
+      @lib_name = 'spree'
+
+      empty_directory 'app/assets/images'
+
+      %w{javascripts stylesheets images}.each do |path|
+        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
+      end
+
+      if defined? Spree::Frontend || Rails.env.test?
+        template "vendor/assets/javascripts/spree/frontend/all.js"
+        template "vendor/assets/stylesheets/spree/frontend/all.css"
+      end
+
+      if defined? Spree::Backend || Rails.env.test?
+        template "vendor/assets/javascripts/spree/backend/all.js"
+        template "vendor/assets/stylesheets/spree/backend/all.css"
+      end
+    end
+
+    def create_overrides_directory
+      empty_directory "app/overrides"
+    end
+
+    def configure_application
+      application <<-RUBY
+    # Load application's model / class decorators
+    initializer 'spree.decorators' do |app|
+      config.to_prepare do
+        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
+          require_dependency(path)
+        end
+      end
+    end
+      RUBY
+
+      if !options[:enforce_available_locales].nil?
+        application <<-RUBY
+    # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
+    I18n.enforce_available_locales = #{options[:enforce_available_locales]}
+        RUBY
+      end
+    end
+
+    def plugin_install_preparation
+      @plugins_to_be_installed = []
+      @plugin_generators_to_run = []
+    end
+
+    def install_auth_plugin
+      if options[:with_authentication] && (options[:auto_accept] || !no?("
+        Solidus has a default authentication extension that uses Devise.
+        You can find more info at https://github.com/solidusio/solidus_auth_devise.
+
+        Would you like to install it? (y/n)"))
+
+        @plugins_to_be_installed << 'solidus_auth_devise'
+        @plugin_generators_to_run << 'solidus:auth:install'
+      end
+    end
+
+    def install_payment_method
+      name = options[:payment_method]
+
+      unless options[:auto_accept]
+        available_names = PAYMENT_METHODS.keys
+
+        name = ask("
+  You can select a payment method to be included in the installation process.
+  Please select a payment method name:", limited_to: available_names, default: available_names.first)
+      end
+
+      gem_name = PAYMENT_METHODS.fetch(name)
+
+      if gem_name
+        @plugins_to_be_installed << gem_name
+        @plugin_generators_to_run << "#{gem_name}:install"
+      end
+    end
+
+    def include_seed_data
+      append_file "db/seeds.rb", <<-RUBY.strip_heredoc
+
+        Spree::Core::Engine.load_seed if defined?(Spree::Core)
+        Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+      RUBY
+    end
+
+    def install_migrations
+      say_status :copying, "migrations"
+      `rake railties:install:migrations`
+    end
+
+    def create_database
+      say_status :creating, "database"
+      rake 'db:create'
+    end
+
+    def run_bundle_install_if_needed_by_plugins
+      @plugins_to_be_installed.each do |plugin_name|
+        gem plugin_name
+      end
+
+      bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
+      run "spring stop"
+
+      @plugin_generators_to_run.each do |plugin_generator_name|
+        generate "#{plugin_generator_name} --skip_migrations=false"
+      end
+    end
+
+    def run_migrations
+      if @run_migrations
+        say_status :running, "migrations"
+
+        rake 'db:migrate VERBOSE=false'
+      else
+        say_status :skipping, "migrations (don't forget to run rake db:migrate)"
+      end
+    end
+
+    def populate_seed_data
+      if @load_seed_data
+        say_status :loading,  "seed data"
+        rake_options = []
+        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
+        rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
+        rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+
+        rake("db:seed #{rake_options.join(' ')}")
+      else
+        say_status :skipping, "seed data (you can always run rake db:seed)"
+      end
+    end
+
+    def load_sample_data
+      if @load_sample_data
+        say_status :loading, "sample data"
+        rake 'spree_sample:load'
+      else
+        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
+      end
+    end
+
+    def install_routes
+      routes_file_path = File.join('config', 'routes.rb')
+      unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
+        insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
+          <<-RUBY
+  # This line mounts Solidus's routes at the root of your application.
+  # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
+  # If you would like to change where this engine is mounted, simply change the :at option to something different.
+  #
+  # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
+  #{CORE_MOUNT_ROUTE}, at: '/'
+
+          RUBY
+        end
+      end
+
+      unless options[:quiet]
+        puts "*" * 50
+        puts "We added the following line to your application's config/routes.rb file:"
+        puts " "
+        puts "    #{CORE_MOUNT_ROUTE}, at: '/'"
+      end
+    end
+
+    def complete
+      unless options[:quiet]
+        puts "*" * 50
+        puts "Solidus has been installed successfully. You're all ready to go!"
+        puts " "
+        puts "Enjoy!"
+      end
+    end
+
+    private
+
+    def bundle_cleanly(&block)
+      Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+    end
+  end
+end