solidus_core 2.1.1 → 2.2.0.beta1

data/config/locales/en.yml

@@ -29,6 +29,8 @@ en:
         code: Code
         name: Name
         state: State
+      spree/calculator/flat_rate:
+        preferred_amount: Amount
       spree/calculator/tiered_flat_rate:
         preferred_base_amount: Base Amount
         preferred_tiers: Tiers
@@ -166,12 +168,12 @@ en:
         code: Code
         description: Description
         event_name: Event Name
-        expires_at: Expiration
+        expires_at: Expiration date
         name: Name
         path: Path
         per_code_usage_limit: Per Code Usage Limit
         promotion_uses: Promotion Uses
-        starts_at: Starts
+        starts_at: Start date
         usage_limit: Overall Usage Limit
       spree/promotion_category:
         name: Name
@@ -468,6 +470,12 @@ en:
       spree/promotion_category:
         one: Promotion Category
         other: Promotion Categories
+      spree/promotion_code_batch:
+        one: Promotion Code Batch
+        other: Promotion Code Batches
+      spree/promotion_code:
+        one: Promotion Code
+        other: Promotion Codes
       spree/property:
         one: Property Type
         other: Property Types
@@ -517,6 +525,9 @@ en:
       spree/stock_transfer:
         one: Stock Transfer
         other: Stock Transfers
+      spree/store:
+        one: Store
+        other: Stores
       spree/store_credit:
         one: Store Credit
         other: Store Credits
@@ -621,6 +632,10 @@ en:
           attributes:
             user_id:
               default_address_exists: "already has a default address"
+        spree/wallet_payment_source:
+          attributes:
+            payment_source:
+              has_to_be_payment_source_class: "has to be a Spree::PaymentSource"
 
   devise:
     confirmations:
@@ -642,7 +657,7 @@ en:
       unlock_instructions:
         subject: Unlock Instructions
     oauth_callbacks:
-      failure: Could not authorize you from %{kind} because "%{reason}".
+      failure: "Could not authorize you from %{kind} because %{reason}."
       success: Successfully authorized from %{kind} account.
     unlocks:
       send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
@@ -688,14 +703,13 @@ en:
       list: List
       listing: Listing
       new: New
-      refund: Refund
       receive: Receive
+      refund: Refund
       remove: Remove
       save: Save
-      ship: ship
-      update: Update
+      ship: Ship
       split: Split
-      ship: ship
+      update: Update
     activate: Activate
     active: Active
     add: Add
@@ -703,6 +717,7 @@ en:
     add_action_of_type: Add action of type
     add_country: Add Country
     add_coupon_code: Add Coupon Code
+    add_line_item: Add Item
     add_new_header: Add New Header
     add_new_style: Add New Style
     add_one: Add One
@@ -743,8 +758,8 @@ en:
     adjustment_total: Adjustment Total
     adjustments: Adjustments
     admin:
-      general_settings:
-        edit:
+      stores:
+        form:
           no_cart_tax_country: "No taxes on carts without address"
       images:
         index:
@@ -770,6 +785,17 @@ en:
         form:
           starts_at_placeholder: Immediately
           expires_at_placeholder: Never
+          activation: Activation
+          general: General
+        activations_new:
+          auto: Apply to all orders
+          multiple_codes: Multiple promotion codes
+          path: URL Path
+          single_code: Single promotion code
+        activations_edit:
+          auto: All orders will attempt to use this promotion
+          single_code_html: "This promotion uses the promotion code: <code>%{code}</code>"
+          multiple_codes_html: "This promotion uses %{count} promotion codes"
       store_credits:
         add: "Add store credit"
         amount_authorized: "Amount Authorized"
@@ -816,7 +842,6 @@ en:
         checkout: Refunds and Returns
         configuration: Configuration
         display_order: Display Order
-        general: Store
         option_types: Option Types
         orders: Orders
         overview: Overview
@@ -832,6 +857,7 @@ en:
         stock: Stock
         stock_items: Store Stock
         stock_transfers: Stock Transfers
+        stores: Stores
         taxes: Taxes
         taxonomies: Taxonomies
         taxons: Taxons
@@ -1168,7 +1194,6 @@ en:
     exceptions:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
     exchange_for: Exchange for
-    expedited_exchanges_warning: "Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days."
     excl: excl.
     expected: Expected
     expected_items: Expected Items
@@ -1280,7 +1305,7 @@ en:
     inventory: Inventory
     inventory_adjustment: Inventory Adjustment
     inventory_canceled: Inventory canceled
-    inventory_error_flash_for_insufficient_quantity: An item in your cart has become unavailable.
+    inventory_error_flash_for_insufficient_quantity: "#{names} became unavailable."
     inventory_not_available: Inventory not available for %{item}.
     inventory_state: Inventory State
     inventory_states:
@@ -1376,6 +1401,7 @@ en:
     new_product: New Product
     new_promotion: New Promotion
     new_promotion_category: New Promotion Category
+    new_promotion_code_batch: New Promotion Code Batch
     new_property: New Property Type
     new_refund: New Refund
     new_refund_reason: New Refund Reason
@@ -1389,6 +1415,7 @@ en:
     new_stock_movement: New Stock Movement
     new_stock_transfer: New Stock Transfer
     new_store_credit: New Store Credit
+    new_store: New Store
     new_tax_category: New Tax Category
     new_tax_rate: New Tax Rate
     new_taxon: New Taxon
@@ -1599,6 +1626,17 @@ en:
         description: Makes all shipments for the order free
         name: Free shipping
     promotion_actions: Actions
+    promotion_code_batch_mailer:
+      promotion_code_batch_finished:
+        subject: Promotion code batch finished
+        message: "All %{number_of_codes} codes have been created for promotion: "
+      promotion_code_batch_errored:
+        subject: Promotion code batch errored
+        message: "Promotion code batch errored (%{error}) for promotion: "
+    promotion_code_batches:
+      errored: "Errored: %{error}"
+      finished: "All %{number_of_codes} codes have been created."
+      processing: "Processing: %{number_of_codes_processed} / %{number_of_codes}"
     promotion_form:
       match_policies:
         all: Match all of these rules

data/db/default/spree/store_credit.rb

@@ -4,7 +4,8 @@ Spree::PaymentMethod.create_with(
   name: "Store Credit",
   description: "Store credit",
   active: true,
-  display_on: 'none'
+  available_to_admin: false,
+  available_to_users: false
 ).find_or_create_by!(
   type: "Spree::PaymentMethod::StoreCredit"
 )

data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb

@@ -1,12 +1,10 @@
 class AddDepthToSpreeTaxons < ActiveRecord::Migration[4.2]
   def up
-    if !Spree::Taxon.column_names.include?('depth')
-      add_column :spree_taxons, :depth, :integer
+    add_column :spree_taxons, :depth, :integer
 
-      say_with_time 'Update depth on all taxons' do
-        Spree::Taxon.reset_column_information
-        Spree::Taxon.all.each(&:save)
-      end
+    say_with_time 'Update depth on all taxons' do
+      Spree::Taxon.reset_column_information
+      Spree::Taxon.all.each(&:save)
     end
   end
 

data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb

@@ -0,0 +1,23 @@
+class CreateSpreeWalletPaymentSources < ActiveRecord::Migration[4.2]
+  def change
+    create_table :spree_wallet_payment_sources do |t|
+      t.references(
+        :user,
+        foreign_key: { to_table: Spree.user_class.table_name },
+        index: true,
+        null: false,
+      )
+      t.references :payment_source, polymorphic: true, null: false
+      t.boolean :default, default: false, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index(
+      :spree_wallet_payment_sources,
+      [:user_id, :payment_source_id, :payment_source_type],
+      unique: true,
+      name: 'index_spree_wallet_payment_sources_on_source_and_user',
+    )
+  end
+end

data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb

@@ -0,0 +1,26 @@
+class MigrateCreditCardsToWalletPaymentSources < ActiveRecord::Migration[4.2]
+  class CreditCard < ActiveRecord::Base
+    self.table_name = 'spree_credit_cards'
+  end
+  class WalletPaymentSource < ActiveRecord::Base
+    self.table_name = 'spree_wallet_payment_sources'
+  end
+
+  def up
+    credit_cards = CreditCard.
+      where.not(gateway_customer_profile_id: nil).
+      where.not(user_id: nil)
+
+    credit_cards.find_each do |credit_card|
+      WalletPaymentSource.find_or_create_by!(
+        user_id: credit_card.user_id,
+        payment_source: credit_card
+      ) do |wallet_source|
+        wallet_source.default = credit_card.default
+      end
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20161017102621_create_spree_promotion_code_batch.rb

@@ -0,0 +1,36 @@
+class CreateSpreePromotionCodeBatch < ActiveRecord::Migration[5.0]
+  def change
+    create_table :spree_promotion_code_batches do |t|
+      t.references :promotion, null: false, index: true
+      t.string :base_code, null: false
+      t.integer :number_of_codes, null: false
+      t.string :email
+      t.string :error
+      t.string :state, default: "pending"
+      t.timestamps
+    end
+
+    add_foreign_key(
+      :spree_promotion_code_batches,
+      :spree_promotions,
+      column: :promotion_id
+    )
+
+    add_column(
+      :spree_promotion_codes,
+      :promotion_code_batch_id,
+      :integer
+    )
+
+    add_foreign_key(
+      :spree_promotion_codes,
+      :spree_promotion_code_batches,
+      column: :promotion_code_batch_id
+    )
+
+    add_index(
+      :spree_promotion_codes,
+      :promotion_code_batch_id
+    )
+  end
+end

data/db/migrate/20161129035810_add_index_to_spree_payments_number.rb

@@ -0,0 +1,5 @@
+class AddIndexToSpreePaymentsNumber < ActiveRecord::Migration[5.0]
+  def change
+    add_index 'spree_payments', ['number'], unique: true
+  end
+end

data/db/migrate/20170223235001_remove_spree_store_credits_column.rb

@@ -0,0 +1,5 @@
+class RemoveSpreeStoreCreditsColumn < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :spree_store_credits, :spree_store_credits, :datetime
+  end
+end

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

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups(:assets => %w(development test)))
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
 require '<%= lib_name %>'
 

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

@@ -27,7 +27,7 @@ Dummy::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  ActionMailer::Base.default :from => "spree@example.com"
+  ActionMailer::Base.default from: "spree@example.com"
 
   # Raise on deprecation warnings
   if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?

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

@@ -149,23 +149,24 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
       end
     end
 
-    def notify_about_routes
+    def install_routes
       insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
-        %{
+        <<-ROUTES
   # This line mounts Spree'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 Spree relies on it being the default of "spree"
-  mount Spree::Core::Engine, :at => '/'
-        }
+  mount Spree::Core::Engine, at: '/'
+
+        ROUTES
       end
 
       unless options[:quiet]
         puts "*" * 50
         puts "We added the following line to your application's config/routes.rb file:"
         puts " "
-        puts "    mount Spree::Core::Engine, :at => '/'"
+        puts "    mount Spree::Core::Engine, at: '/'"
       end
     end
 

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

@@ -116,6 +116,60 @@ module Spree
       params
     end
 
+    # This method handles the awkwardness of how the html forms are currently
+    # set up for frontend.
+    #
+    # This method expects a params hash in the format of:
+    #
+    #  {
+    #    order: {
+    #      wallet_payment_source_id: '123',
+    #      ...other params...
+    #    },
+    #    cvc_confirm: '456', # optional
+    #    ...other params...
+    #  }
+    #
+    # And this method modifies the params into the format of:
+    #
+    #  {
+    #    order: {
+    #      payments_attributes: [
+    #        {
+    #          source_attributes: {
+    #            wallet_payment_source_id: '123',
+    #            verification_value: '456',
+    #          },
+    #        },
+    #      ]
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    def move_wallet_payment_source_id_into_payments_attributes(params)
+      return params if params[:order].blank?
+
+      wallet_payment_source_id = params[:order][:wallet_payment_source_id].presence
+      cvc_confirm = params[:cvc_confirm].presence
+
+      return params if wallet_payment_source_id.nil?
+
+      params[:order][:payments_attributes] = [
+        {
+          source_attributes: {
+            wallet_payment_source_id: wallet_payment_source_id,
+            verification_value: cvc_confirm
+          }
+        }
+      ]
+
+      params[:order].delete(:wallet_payment_source_id)
+      params.delete(:cvc_confirm)
+
+      params
+    end
+
     # This is a strange thing to do since an order can have multiple payments
     # but we always assume that it only has a single payment and that its
     # amount should be the current order total.  Also, this is pretty much

data/lib/spree/core/engine.rb

@@ -4,10 +4,6 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree'
 
-      rake_tasks do
-        load File.join(root, "lib", "tasks", "exchanges.rake")
-      end
-
       config.generators do |g|
         g.test_framework :rspec
       end
@@ -108,13 +104,14 @@ module Spree
         ]
       end
 
-      # filter sensitive information during logging
+      # Filter sensitive information during logging
       initializer "spree.params.filter", before: :load_config_initializers do |app|
         app.config.filter_parameters += [
-          :password,
-          :password_confirmation,
-          :number,
-          :verification_value]
+          %r{^password$},
+          %r{^password_confirmation$},
+          %r{^number$}, # Credit Card number
+          %r{^verification_value$} # Credit Card verification value
+        ]
       end
 
       initializer "spree.core.checking_migrations", before: :load_config_initializers do |_app|

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.1.1"
+    "2.2.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -80,7 +80,6 @@ require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/unreturned_item_charger'
 require 'spree/core/role_configuration'
 require 'spree/core/stock_configuration'
 require 'spree/permission_sets'

data/lib/spree/money.rb

@@ -6,6 +6,8 @@ module Spree
   # Spree::Money is a relatively thin wrapper around Monetize which handles
   # formatting via Spree::Config.
   class Money
+    include Comparable
+    DifferentCurrencyError = Class.new(StandardError)
     RUBY_NUMERIC_STRING = /\A-?\d+(\.\d+)?\z/
 
     class <<self
@@ -92,6 +94,22 @@ module Spree
       to_s
     end
 
+    def <=>(other)
+      if !other.respond_to?(:money)
+        raise TypeError, "Can't compare #{other.class} to Spree::Money"
+      end
+      if self.currency != other.currency
+        # By default, ::Money will try to run a conversion on `other.money` and
+        # try a comparison on that. We do not want any currency conversion to
+        # take place so we'll catch this here and raise an error.
+        raise(
+          DifferentCurrencyError,
+          "Can't compare #{self.currency} with #{other.currency}"
+        )
+      end
+      @money <=> other.money
+    end
+
     # Delegates comparison to the internal ruby money instance.
     #
     # @see http://www.rubydoc.info/gems/money/Money/Arithmetic#%3D%3D-instance_method

data/lib/spree/permission_sets/default_customer.rb

@@ -7,7 +7,7 @@ module Spree
         can :display, OptionValue
         can :create, Order
         can [:read, :update], Order do |order, token|
-          order.user == user || order.guest_token && token == order.guest_token
+          order.user == user || (order.guest_token.present? && token == order.guest_token)
         end
         can :create, ReturnAuthorization do |return_authorization|
           return_authorization.order.user == user

data/lib/spree/permitted_attributes.rb

@@ -88,7 +88,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id
+      :existing_card_id, :wallet_payment_source_id
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]

data/lib/spree/testing_support/authorization_helpers.rb

@@ -60,4 +60,5 @@ end
 RSpec.configure do |config|
   config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :request
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -20,6 +20,12 @@ module CapybaraExt
   end
 
   def fill_in_quantity(table_column, selector, quantity)
+    Spree::Deprecation.warn <<-WARN.strip_heredoc
+      fill_in_quantity is deprecated. Instead use:
+        within(#{table_column.inspect}) do
+          fill_in #{selector.inspect}, with: #{quantity.inspect}
+        end
+    WARN
     within(table_column) do
       fill_in selector, with: quantity
     end
@@ -100,6 +106,13 @@ module CapybaraExt
   end
 
   def wait_for_ajax
+
+    Spree::Deprecation.warn <<-WARN.squish, caller
+      wait_for_ajax has been deprecated.
+      Please refer to the capybara documentation on how to properly wait for asyncronous behavior:
+      https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends
+    WARN
+
     counter = 0
     while page.evaluate_script("typeof($) === 'undefined' || $.active > 0")
       counter += 1

data/lib/spree/testing_support/factories/order_factory.rb

@@ -76,6 +76,9 @@ FactoryGirl.define do
 
         after(:create) do |order|
           order.refresh_shipment_rates
+          order.shipments.each do |shipment|
+            shipment.inventory_units.update_all state: 'on_hand', pending: false
+          end
           order.update_column(:completed_at, Time.current)
         end
 
@@ -96,7 +99,6 @@ FactoryGirl.define do
           after(:create) do |order, evaluator|
             create(evaluator.payment_type, amount: order.total, order: order, state: 'completed')
             order.shipments.each do |shipment|
-              shipment.inventory_units.update_all state: 'on_hand'
               shipment.update_column('state', 'ready')
             end
             order.reload
@@ -119,6 +121,8 @@ FactoryGirl.define do
                   shipped_at: Time.current
                 )
               end
+              # We need to update the shipment_state after all callbacks have run
+              order.update_columns(shipment_state: 'shipped')
               order.reload
             end
           end

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -6,7 +6,7 @@ require 'spree/testing_support/factories/store_credit_factory'
 FactoryGirl.define do
   factory :payment, aliases: [:credit_card_payment], class: Spree::Payment do
     association(:payment_method, factory: :credit_card_payment_method)
-    source { create(:credit_card, user: order.user) }
+    source { create(:credit_card, user: order.user, address: order.bill_address) }
     order
     state 'checkout'
     response_code '12345'

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -1,7 +1,6 @@
 require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/stock_location_factory'
 require 'spree/testing_support/factories/shipping_method_factory'
-require 'spree/testing_support/factories/stock_location_factory'
 
 FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do

data/solidus_core.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffaker', '~> 2.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'highline', '~> 1.7' # Necessary for the install generator
-  s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
+  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
   s.add_dependency 'monetize', '~> 1.1'
-  s.add_dependency 'paperclip', '~> 4.2'
+  s.add_dependency 'paperclip', ['>= 4.2', '< 6']
   s.add_dependency 'paranoia', '~> 2.2.0.pre'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'rails', '~> 5.0.0'
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machines-activerecord', '~> 0.4'
   s.add_dependency 'stringex', '~> 1.5.1'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
-  s.add_dependency 'twitter_cldr', '~> 3.0'
+  s.add_dependency 'twitter_cldr', '>= 3.0', '< 5'
 
   s.add_development_dependency 'email_spec', '~> 1.6'
 end