spree_core 3.4.6 → 3.5.0.rc1

data/app/models/spree/stock_transfer.rb

@@ -4,7 +4,7 @@ module Spree
 
     has_many :stock_movements, as: :originator
 
-    belongs_to :source_location, class_name: 'StockLocation'
+    belongs_to :source_location, class_name: 'StockLocation', optional: true
     belongs_to :destination_location, class_name: 'StockLocation'
 
     validates :number, uniqueness: true
@@ -36,6 +36,7 @@ module Spree
       end
     end
 
+    # receive inventory from external vendor
     def receive(destination_location, variants)
       transfer(nil, destination_location, variants)
     end

data/app/models/spree/store_credit_category.rb

@@ -2,6 +2,8 @@ module Spree
   class StoreCreditCategory < Spree::Base
     validates :name, presence: true
 
+    before_destroy :validate_not_used
+
     GIFT_CARD_CATEGORY_NAME = 'Gift Card'.freeze
     DEFAULT_NON_EXPIRING_TYPES = [GIFT_CARD_CATEGORY_NAME]
 
@@ -13,6 +15,17 @@ module Spree
       DEFAULT_NON_EXPIRING_TYPES | Spree::Config[:non_expiring_credit_types]
     end
 
+    def store_credit_category_used?
+      Spree::StoreCredit.exists?(category_id: id)
+    end
+
+    def validate_not_used
+      if store_credit_category_used?
+        errors.add(:base, :cannot_destroy_if_used_in_store_credit)
+        throw(:abort)
+      end
+    end
+
     class << self
       def default_reimbursement_category(_options = {})
         Spree::StoreCreditCategory.first

data/app/models/spree/taxon.rb

@@ -21,6 +21,7 @@ module Spree
 
     validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], allow_blank: true }
     validates :permalink, uniqueness: { case_sensitive: false }
+    validate :check_for_root, on: :create
     with_options length: { maximum: 255 }, allow_blank: true do
       validates :meta_keywords
       validates :meta_description
@@ -93,5 +94,11 @@ module Spree
       # Have taxonomy touch happen in #touch_ancestors_and_taxonomy rather than association option in order for imports to override.
       taxonomy.try!(:touch)
     end
+
+    def check_for_root
+      if taxonomy.try(:root).present? && parent_id == nil
+        errors.add(:root_conflict, 'this taxonomy already has a root taxon')
+      end
+    end
   end
 end

data/app/models/spree/variant.rb

@@ -67,7 +67,7 @@ module Spree
 
     scope :not_deleted, -> { where("#{Variant.quoted_table_name}.deleted_at IS NULL") }
 
-    scope :for_currency_and_available_price_amount, ->(currency) do
+    scope :for_currency_and_available_price_amount, ->(currency = nil) do
       currency ||= Spree::Config[:currency]
       joins(:prices).where('spree_prices.currency = ?', currency).where('spree_prices.amount IS NOT NULL').distinct
     end

data/app/validators/email_validator.rb

@@ -0,0 +1,7 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ /\A[^@\s]+@[^@\s]+\z/
+      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+    end
+  end
+end

data/config/locales/en.yml

@@ -92,6 +92,7 @@ en:
         description: Description
         event_name: Event Name
         expires_at: Expires At
+        generate_code: Generate coupon code
         name: Name
         path: Path
         starts_at: Starts At
@@ -350,6 +351,10 @@ en:
               greater_than_zero_restrict_delete: is greater than zero. Can not delete store credit.
             amount_authorized:
               exceeds_total_credits: Exceeds total credits.
+        spree/store_credit_category:
+          attributes:
+            base:
+              cannot_destroy_if_used_in_store_credit: Cannot delete store credit categories once they are used in store credit.
         spree/variant:
           attributes:
             base:
@@ -507,18 +512,9 @@ en:
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
     all_items_have_been_returned: All items have been returned
-    already_signed_up_for_analytics: You have already signed up for Spree Analytics
     alt_text: Alternative Text
     alternative_phone: Alternative Phone
     amount: Amount
-    analytics_desc_header_1: Spree Analytics
-    analytics_desc_header_2: Live analytics integrated into your Spree dashboard
-    analytics_desc_list_1: Get live sales information as it happens
-    analytics_desc_list_2: Requires only a free Spree account to activate
-    analytics_desc_list_3: Absolutely no code to install
-    analytics_desc_list_4: It's completely free!
-    analytics_engine: Analytics Engine
-    analytics_trackers: Analytics Trackers
     and: and
     approve: approve
     approver: Approver
@@ -605,7 +601,6 @@ en:
     continue_shopping: Continue shopping
     cost_currency: Cost Currency
     cost_price: Cost Price
-    could_not_connect_to_jirafe: Could not connect to Jirafe to sync data. This will be automatically retried later.
     could_not_create_customer_return: Could not create customer return
     could_not_create_stock_movement: There was a problem saving this stock movement. Please try again.
     count_on_hand: Count On Hand
@@ -655,16 +650,6 @@ en:
     customer_search: Customer Search
     cut: Cut
     cvv_response: CVV Response
-    dash:
-      jirafe:
-        app_id: App ID
-        app_token: App Token
-        currently_unavailable: Jirafe is currently unavailable. Spree will automatically connect to Jirafe once it is available.
-        explanation: The fields below may already be populated if you chose to register with Jirafe from the admin dashboard.
-        header: Jirafe Analytics Settings
-        site_id: Site ID
-        token: Token
-      jirafe_settings_updated: Jirafe Settings have been updated.
     date: Date
     date_completed: Date Completed
     date_picker:
@@ -773,8 +758,7 @@ en:
     gateway_error: Gateway Error
     general: General
     general_settings: General Settings
-    google_analytics: Google Analytics
-    google_analytics_id: Analytics ID
+    generate_code: Generate coupon code
     guest_checkout: Guest Checkout
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
@@ -838,7 +822,6 @@ en:
     items_in_rmas: Items in Return Authorizations
     items_to_be_reimbursed: Items to be reimbursed
     items_reimbursed: Items reimbursed
-    jirafe: Jirafe
     join_slack: Join Slack
     last_name: Last Name
     last_name_begins_with: Last Name Begins With
@@ -868,6 +851,7 @@ en:
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
     master_price: Master Price
+    master_sku: Master SKU
     match_choices:
       all: All
       none: None
@@ -953,10 +937,10 @@ en:
     notice_messages:
       product_cloned: Product has been cloned
       product_deleted: Product has been deleted
-      product_not_cloned: Product could not be cloned
-      product_not_deleted: Product could not be deleted
+      product_not_cloned: "Product could not be cloned. Reason: %{error}"
+      product_not_deleted: "Product could not be deleted. Reason: %{error}"
       variant_deleted: Variant has been deleted
-      variant_not_deleted: Variant could not be deleted
+      variant_not_deleted: "Variant could not be deleted. Reason: %{error}"
     num_orders: "# Orders"
     number: Number
     on_hand: On Hand
@@ -1065,6 +1049,7 @@ en:
     pre_tax_total: Pre-Tax Total
     preferred_reimbursement_type: Preferred Reimbursement Type
     presentation: Presentation
+    preview_product: Preview Product
     previous: Previous
     previous_state_missing: "n/a"
     price: Price
@@ -1088,6 +1073,8 @@ en:
     products: Products
     promotion: Promotion
     promotionable: Promotable
+    promotion_cloned: Promotion has been cloned
+    promotion_not_cloned: "Promotion has not been cloned. Reason: %{error}"
     promotion_action: Promotion Action
     promotion_action_types:
       create_adjustment:
@@ -1392,6 +1379,7 @@ en:
         unable_to_delete: Unable to delete store credit
         unable_to_fund: Unable to pay for order using store credits
         unable_to_update: Unable to update store credit
+    store_credits: Store Credits
     store_credit_categories: Store Credit Categories
     store_credit_payment_method:
       unable_to_void: "Unable to void code: %{auth_code}"
@@ -1404,6 +1392,10 @@ en:
       unable_to_find_for_action: "Could not find store credit for auth code: %{auth_code} for action: %{action}"
       user_has_no_store_credits: "User does not have any available store credit"
       select_one_store_credit: "Select store credit to go towards remaining balance"
+    store_default: Default store
+    store_set_default_button: Set as default
+    store_not_set_as_default: Couldn't set store %{store} as a default store
+    store_set_as_default: Store %{store} is now a default store
     street_address: Street Address
     street_address_2: Street Address (cont'd)
     subtotal: Subtotal
@@ -1412,7 +1404,6 @@ en:
     successfully_created: ! '%{resource} has been successfully created!'
     successfully_refunded: ! '%{resource} has been successfully refunded!'
     successfully_removed: ! '%{resource} has been successfully removed!'
-    successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
     successfully_updated: ! '%{resource} has been successfully updated!'
     summary: Summary
     tax: Tax

data/db/default/spree/states.rb

@@ -1,29 +1,11 @@
-connection = ApplicationRecord.connection
-state_inserts = []
-
-state_values = -> do
-  Spree::Country.where(states_required: true).each do |country|
-    carmen_country = Carmen::Country.named(country.name)
-    next if !carmen_country
-    carmen_country.subregions.each do |subregion|
-      name       = connection.quote subregion.name
-      abbr       = connection.quote subregion.code
-      country_id = connection.quote country.id
-
-      state_inserts << [name, abbr, country_id].join(", ")
-    end
+Spree::Country.where(states_required: true).each do |country|
+  carmen_country = Carmen::Country.named(country.name)
+  next if !carmen_country
+  carmen_country.subregions.each do |subregion|
+    country.states.where(
+      name: subregion.name,
+      abbr: subregion.code,
+      country_id: country.id
+    ).first_or_create
   end
-
-  state_inserts.map { |x| "(#{x})" }
-end
-
-columns = ["name", "abbr", "country_id"].map do |column|
-  connection.quote_column_name column
-end.join(', ')
-
-state_values.call.each_slice(500) do |state_values_batch|
-  connection.execute <<-SQL
-    INSERT INTO spree_states (#{columns})
-    VALUES #{state_values_batch.join(", ")};
-  SQL
 end

data/db/migrate/20150128032538_remove_environment_from_tracker.rb

@@ -1,4 +1,6 @@
 class RemoveEnvironmentFromTracker < ActiveRecord::Migration[4.2]
+  class Spree::Tracker < Spree::Base; end
+
   def up
     Spree::Tracker.where('environment != ?', Rails.env).update_all(active: false)
     remove_column :spree_trackers, :environment

data/db/migrate/20171004223836_remove_icon_from_taxons.rb

@@ -0,0 +1,8 @@
+class RemoveIconFromTaxons < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :spree_taxons, :icon_file_name
+    remove_column :spree_taxons, :icon_content_type
+    remove_column :spree_taxons, :icon_file_size
+    remove_column :spree_taxons, :icon_updated_at
+  end
+end

data/db/migrate/20180222133746_add_unique_index_on_spree_promotions_code.rb

@@ -0,0 +1,6 @@
+class AddUniqueIndexOnSpreePromotionsCode < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :spree_promotions, :code
+    add_index :spree_promotions, :code, unique: true
+  end
+end

data/lib/generators/spree/dummy_model/dummy_model_generator.rb

@@ -0,0 +1,23 @@
+module Spree
+  class DummyModelGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+    include Rails::Generators::Migration
+
+    desc 'Set up Dummy Model which is used for tests'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    def generate
+      migration_template 'migration.rb.tt', 'db/migrate/create_spree_dummy_models.rb'
+      template 'model.rb.tt', 'app/models/spree/dummy_model.rb'
+    end
+
+    def self.next_migration_number(dirname)
+      format('%.3d', (current_migration_number(dirname) + 1))
+    end
+  end
+end

data/lib/generators/spree/dummy_model/templates/migration.rb.tt

@@ -0,0 +1,10 @@
+class CreateSpreeDummyModels < ActiveRecord::Migration[5.1]
+  def change
+    create_table :spree_dummy_models do |t|
+      t.string :name
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/spree/dummy_model/templates/model.rb.tt

@@ -0,0 +1,6 @@
+module Spree
+  class Spree::DummyModel < ApplicationRecord
+    acts_as_list
+    validates :name, presence: true
+  end
+end

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

@@ -26,7 +26,7 @@ module Spree
 
         def set_guest_token
           if cookies.signed[:guest_token].blank?
-            cookies.permanent.signed[:guest_token] = generate_guest_token
+            cookies.permanent.signed[:guest_token] = { value: generate_guest_token, httponly: true }
           end
         end
 

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

@@ -41,6 +41,10 @@ module Spree
           end
 
           def render_404(_exception = nil)
+            ActiveSupport::Deprecation.warn(<<-EOS, caller)
+              #render_404 will be removed in Spree 3.6
+              You should switch to 404 handled by rails
+            EOS
             respond_to do |type|
               type.html { render status: :not_found, file: "#{::Rails.root}/public/404", formats: [:html], layout: nil }
               type.all  { head :not_found }

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

@@ -29,19 +29,20 @@ module Spree
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
 
-          return @current_order if @current_order
+          if @current_order
+            @current_order.last_ip_address = ip_address
+            return @current_order
+          end
 
           @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.create!(current_order_params)
             @current_order.associate_user! try_spree_current_user if try_spree_current_user
-          end
-
-          if @current_order
             @current_order.last_ip_address = ip_address
-            return @current_order
           end
+
+          @current_order
         end
 
         def associate_user

data/lib/spree/core/engine.rb

@@ -1,6 +1,9 @@
 module Spree
   module Core
     class Engine < ::Rails::Engine
+      Environment = Struct.new(:calculators, :preferences, :payment_methods, :adjusters, :stock_splitters, :promotions)
+      SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
+      PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
       engine_name 'spree'
 
@@ -9,8 +12,8 @@ module Spree
       end
 
       initializer 'spree.environment', before: :load_config_initializers do |app|
-        app.config.spree = Spree::Core::Environment.new
-        Spree::Config = app.config.spree.preferences # legacy access
+        app.config.spree = Environment.new(SpreeCalculators.new, Spree::AppConfiguration.new)
+        Spree::Config = app.config.spree.preferences
       end
 
       initializer 'spree.register.calculators' do |app|
@@ -27,7 +30,7 @@ module Spree
         ]
       end
 
-      initializer 'spree.register.stock_splitters' do |app|
+      initializer 'spree.register.stock_splitters', before: :load_config_initializers do |app|
         app.config.spree.stock_splitters = [
           Spree::Stock::Splitter::ShippingCategory,
           Spree::Stock::Splitter::Backordered
@@ -53,13 +56,11 @@ module Spree
       # We need to define promotions rules here so extensions and existing apps
       # can add their custom classes on their initializer files
       initializer 'spree.promo.environment' do |app|
-        app.config.spree.add_class('promotions')
-        app.config.spree.promotions = Spree::Promo::Environment.new
+        app.config.spree.promotions = PromoEnvironment.new
         app.config.spree.promotions.rules = []
       end
 
       initializer 'spree.promo.register.promotion.calculators' do |app|
-        app.config.spree.calculators.add_class('promotion_actions_create_adjustments')
         app.config.spree.calculators.promotion_actions_create_adjustments = [
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
@@ -68,7 +69,6 @@ module Spree
           Spree::Calculator::TieredFlatRate
         ]
 
-        app.config.spree.calculators.add_class('promotion_actions_create_item_adjustments')
         app.config.spree.calculators.promotion_actions_create_item_adjustments = [
           Spree::Calculator::PercentOnLineItem,
           Spree::Calculator::FlatRate,
@@ -116,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Ensure spree locale paths are present before decorators
-        I18n.load_path.unshift(*(Dir.glob(
+        # Load spree locales before decorators
+        I18n.load_path += Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        ) - I18n.load_path))
+        )
 
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|