solidus_core 2.8.6 → 2.9.0.rc.1

data/app/models/spree/zone.rb

@@ -42,7 +42,7 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
-    self.whitelisted_ransackable_attributes = ['description']
+    self.whitelisted_ransackable_attributes = %w[name description]
 
     # Returns all zones that contain any of the zone members of the zone passed
     # in. This also includes any country zones that contain the state of the

data/app/views/spree/order_mailer/inventory_cancellation_email.text.erb

@@ -1,9 +1,9 @@
-<%= t('order_mailer.inventory_cancellation.dear_customer') %>
+<%= t('spree.order_mailer.inventory_cancellation.dear_customer') %>
 
-<%= t('order_mailer.inventory_cancellation.instructions') %>
+<%= t('spree.order_mailer.inventory_cancellation.instructions') %>
 
 ============================================================
-<%= t('order_mailer.inventory_cancellation.order_summary_canceled') %>
+<%= t('spree.order_mailer.inventory_cancellation.order_summary_canceled') %>
 ============================================================
 <% @inventory_units.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%>

data/config/locales/en.yml

@@ -97,6 +97,7 @@ en:
         total: Total price
       spree/log_entry:
         details: Message
+        created_at: Date/Time
       spree/option_type:
         name: Name
         presentation: Presentation
@@ -147,6 +148,9 @@ en:
         number: Identifier
         response_code: Transaction ID
         state: State
+      spree/payment_capture_event:
+        created_at: Date/Time
+        amount: Amount
       spree/payment_method:
         active: Active
         auto_capture: Auto Capture
@@ -318,7 +322,6 @@ en:
         country_id: Country
         default: Default
         fulfillable: Fulfillable
-        internal_name: Internal Name
         name: Name
         phone: Phone
         propagate_all_variants: Propagate All Variants
@@ -332,6 +335,7 @@ en:
       spree/store:
         available_locales: Locales Available in the Storefront
         cart_tax_country_iso: Tax Country for Empty Carts
+        code: Slug
         default: Default
         default_currency: Default Currency
         mail_from_address: Mail From Address
@@ -487,7 +491,10 @@ en:
         spree/wallet_payment_source:
           attributes:
             payment_source:
-              has_to_be_payment_source_class: has to be a Spree::PaymentSource
+              has_to_be_payment_source_class: is not a valid payment source
+              not_owned_by_user: does not belong to the user associated with the order
+            user_id:
+              payment_source_already_exists: already has this payment source in their wallet
     models:
       spree/address:
         one: Address
@@ -723,49 +730,6 @@ en:
       user:
         one: User
         other: Users
-  devise:
-    confirmations:
-      confirmed: Your account was successfully confirmed. You are now signed in.
-      send_instructions: You will receive an email with instructions about how to
-        confirm your account in a few minutes.
-    failure:
-      inactive: Your account was not activated yet.
-      invalid: Invalid email or password.
-      invalid_token: Invalid authentication token.
-      locked: Your account is locked.
-      timeout: Your session expired, please sign in again to continue.
-      unauthenticated: You need to sign in or sign up before continuing.
-      unconfirmed: You have to confirm your account before continuing.
-    mailer:
-      confirmation_instructions:
-        subject: Confirmation Instructions
-      reset_password_instructions:
-        subject: Reset Password Instructions
-      unlock_instructions:
-        subject: Unlock Instructions
-    oauth_callbacks:
-      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.
-      unlocked: Your account was successfully unlocked. You are now signed in.
-    user_passwords:
-      user:
-        cannot_be_blank: Your password cannot be blank.
-        send_instructions: You will receive an email with instructions about how to
-          reset your password in a few minutes.
-        updated: Your password was changed successfully. You are now signed in.
-    user_registrations:
-      destroyed: Bye! Your account was successfully cancelled. We hope to see you
-        again soon.
-      inactive_signed_up: You have signed up successfully. However, we could not sign
-        you in because your account is %{reason}.
-      signed_up: Welcome! You have signed up successfully.
-      updated: You updated your account successfully.
-    user_sessions:
-      signed_in: Signed in successfully.
-      signed_out: Signed out successfully.
   errors:
     messages:
       already_confirmed: was already confirmed
@@ -846,6 +810,9 @@ en:
     adjustment_type: Adjustment type
     adjustments: Adjustments
     admin:
+      api:
+        key_cleared: Key cleared
+        key_generated: Key generated
       images:
         index:
           choose_files: Choose files to upload
@@ -883,6 +850,11 @@ en:
           expires_at_placeholder: Never
           general: General
           starts_at_placeholder: Immediately
+      promotion_status:
+        active: Active
+        expired: Expired
+        inactive: Inactive
+        not_started: Not started
       stock_locations:
         form:
           address: Address
@@ -1410,15 +1382,17 @@ en:
         fulfillable: 'When unchecked, this indicates that items in this location don''t
           require actual fulfilment. Stock will not be checked when shipping and emails
           will not be sent.<br/> Default: Checked'
-        propagate_all_variants: 'When checked, this will create a stock item for in
-          this stock location.<br/> Default: Checked'
+        propagate_all_variants: 'When checked, this will create a stock item for each variant
+          in this stock location.<br/> Default: Checked'
         restock_inventory: 'When checked, returned inventory can be added back to
           this location''s stock levels.<br/> Default: checked'
       spree/store:
         available_locales: This determines which locales are available for your customers
           to choose from in the storefront.
-        cart_tax_country_iso: 'This determines which country is used for taxes on
-          carts (orders which don''t yet have an address).<br/> Default: None.'
+        cart_tax_country_iso: "This determines which country is used for taxes on carts
+          (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_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
@@ -1470,7 +1444,6 @@ en:
       quantity.
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
-    internal_name: Internal Name
     invalid_exchange_variant: Invalid exchange variant.
     invalid_payment_method_type: Invalid payment method type.
     invalid_promotion_action: Invalid promotion action.
@@ -1800,6 +1773,8 @@ en:
       product_source:
         group: From product group
         manual: Manually choose
+    product_without_default_price_info: 'This Product has no price in the default currency (%{default_currency}).'
+    product_without_default_price_cta: 'Please, create a Master Price!'
     products: Products
     promotion: Promotion
     promotion_action: Promotion Action
@@ -1984,7 +1959,6 @@ en:
       ready: Ready
       shipped: Shipped
     shipment_transfer_error: There was an error transferring variants
-    shipment_transfer_success: Variants successfully transferred
     shipments: Shipments
     shipped: Shipped
     shipped_at: Shipped At
@@ -2050,7 +2024,6 @@ en:
       order to manage stock.
     stock_movements: Stock Movements
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}
-    stock_not_below_zero: Stock must not be below zero.
     stock_successfully_transferred: Stock was successfully transferred between locations.
     stop: Stop
     store: Store
@@ -2133,7 +2106,7 @@ en:
         message: If you have received this email, then your email settings are correct.
         subject: Test Mail
     test_mode: Test Mode
-    thank_you_for_your_order: Thank you for your business.  Please print out a copy
+    thank_you_for_your_order: Thank you for your business. Please print out a copy
       of this confirmation page for your records.
     there_are_no_items_for_this_order: There are no items for this order. Please add
       an item to the order to continue.

data/db/default/spree/store_credit.rb

@@ -16,6 +16,7 @@ Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: Spree::
 Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree::StoreCreditType::NON_EXPIRING)
 
 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')
 

data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb

@@ -13,7 +13,7 @@ class AddAvailableToUsersAndRemoveDisplayOnFromShippingMethods < ActiveRecord::M
     add_column(:spree_shipping_methods, :display_on, :string)
     execute("UPDATE spree_shipping_methods "\
             "SET display_on='both' "\
-            "WHERE (available_to_users=#{quoted_true}")
+            "WHERE (available_to_users=#{quoted_true})")
     execute("UPDATE spree_shipping_methods "\
             "SET display_on='back_end' "\
             "WHERE (available_to_users=#{quoted_false})")

data/db/migrate/20170608074534_rename_bogus_gateways.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 class RenameBogusGateways < ActiveRecord::Migration[5.0]
+  # This migration was only performing a data migration useful updating to
+  # Solidus v2.3.
+  # Once the update is done, this is no more required to run so we can clean
+  # this file to just be a noop.
+  # For more info on the original content see:
+  # https://github.com/solidusio/solidus/pull/2001
+
   def up
-    require 'solidus/migrations/rename_gateways'
-    say_with_time 'Renaming bogus gateways into payment methods' do
-      Solidus::Migrations::RenameGateways.new.up
-    end
+    # no-op
   end
 
   def down
-    require 'solidus/migrations/rename_gateways'
-    say_with_time 'Renaming bogus payment methods into gateways' do
-      Solidus::Migrations::RenameGateways.new.down
-    end
+    # no-op
   end
 end

data/db/migrate/20190220093635_drop_spree_store_credit_update_reasons.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DropSpreeStoreCreditUpdateReasons < ActiveRecord::Migration[5.1]
+  # This migration should run in a subsequent deploy after 20180710170104
+  # has been already deployed. See also migration 20180710170104.
+
+  # We can't add back the table in a `down` method here: a previous version
+  # of migration 20180710170104 would fail with `table already exists` , as
+  # it handles itself the add/remove of this table and column.
+  def up
+    if table_exists? :spree_store_credit_update_reasons
+      drop_table :spree_store_credit_update_reasons
+    end
+
+    if column_exists? :spree_store_credit_events, :update_reason_id
+      remove_column :spree_store_credit_events, :update_reason_id
+    end
+  end
+end

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

@@ -58,9 +58,6 @@ module Spree
 
     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?

data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt

@@ -18,6 +18,9 @@ Spree.config do |config|
   # any inventory changes.
   # config.inventory_cache_threshold = 3
 
+  # Enable Paperclip adapter for attachments on images and taxons
+  config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
+  config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
 
   # Frontend:
 

data/lib/solidus/migrations/rename_gateways.rb

@@ -12,6 +12,8 @@ module Solidus
       attr_reader :gateway_mapping
 
       def initialize(gateway_mapping = DEFAULT_MAPPING)
+        Spree::Deprecation.warn 'Solidus::Migrations::RenameGateways is deprecated and will be removed with Solidus 3.0.'
+
         @gateway_mapping = gateway_mapping
       end
 

data/lib/spree/app_configuration.rb

@@ -423,6 +423,26 @@ module Spree
     # Enumerable of images adhering to the present_image_class interface
     class_name_attribute :product_gallery_class, default: 'Spree::Gallery::ProductGallery'
 
+    # Allows switching attachment library for Image
+    #
+    # `Spree::Image::PaperclipAttachment`
+    # is the default and provides the classic Paperclip implementation.
+    #
+    # @!attribute [rw] image_attachment_module
+    # @return [Module] a module that can be included into Spree::Image to allow attachments
+    # Enumerable of images adhering to the present_image_class interface
+    class_name_attribute :image_attachment_module, default: 'Spree::Image::PaperclipAttachment'
+
+    # Allows switching attachment library for Taxon
+    #
+    # `Spree::Taxon::PaperclipAttachment`
+    # is the default and provides the classic Paperclip implementation.
+    #
+    # @!attribute [rw] taxon_attachment_module
+    # @return [Module] a module that can be included into Spree::Taxon to allow attachments
+    # Enumerable of taxons adhering to the present_taxon_class interface
+    class_name_attribute :taxon_attachment_module, default: 'Spree::Taxon::PaperclipAttachment'
+
     # Allows providing your own class instance for generating order numbers.
     #
     # @!attribute [rw] order_number_generator
@@ -449,6 +469,10 @@ module Spree
       end
     end
 
+    def events
+      @events_configuration ||= Spree::Event::Configuration.new
+    end
+
     def environment
       @environment ||= Spree::Core::Environment.new(self).tap do |env|
         env.calculators.shipping_methods = %w[

data/lib/spree/core.rb

@@ -63,6 +63,7 @@ require 'spree/core/environment'
 require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/migration_helpers'
+require 'spree/event'
 require 'spree/core/engine'
 
 require 'spree/i18n'

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

@@ -14,10 +14,7 @@ module Spree
         end
 
         def current_pricing_options
-          Spree::Config.pricing_options_class.new(
-            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency],
-            country_iso: current_store.try!(:cart_tax_country_iso).presence
-          )
+          Spree::Config.pricing_options_class.from_context(self)
         end
 
         def current_currency

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

@@ -31,30 +31,16 @@ module Spree
         end
 
         def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes
-        end
-
-        def permitted_checkout_address_attributes
-          permitted_attributes.checkout_address_attributes
-        end
-
-        def permitted_checkout_delivery_attributes
-          permitted_attributes.checkout_delivery_attributes
-        end
-
-        def permitted_checkout_payment_attributes
-          permitted_attributes.checkout_payment_attributes
-        end
-
-        def permitted_checkout_confirm_attributes
-          permitted_attributes.checkout_confirm_attributes
+          permitted_attributes.checkout_attributes + [
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes,
+            payments_attributes: permitted_payment_attributes,
+            shipments_attributes: permitted_shipment_attributes
+          ]
         end
 
         def permitted_order_attributes
-          permitted_checkout_address_attributes +
-          permitted_checkout_delivery_attributes +
-          permitted_checkout_payment_attributes +
-          permitted_checkout_confirm_attributes + [
+          permitted_checkout_attributes + [
             line_items_attributes: permitted_line_item_attributes
           ]
         end

data/lib/spree/core/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spree/config'
+require 'spree/event/processors/mailer_processor'
 
 module Spree
   module Core
@@ -44,6 +45,10 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
+      initializer 'spree.core.subscribe_event_mailer_processor' do
+        Spree::Event::Processors::MailerProcessor.subscribe!
+      end
+
       # Load in mailer previews for apps to use in development.
       # We need to make sure we call `Preview.all` before requiring our
       # previews, otherwise any previews the app attempts to add need to be

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

@@ -133,9 +133,7 @@ module Spree
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
             payment.state = p[:state] || p[:status] || 'completed'
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
-            source_attributes = p[:source] || p[:source_attributes]
-            payment.source = create_source_payment_from_params(source_attributes, payment) if source_attributes
-
+            payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
           end
         end

data/lib/spree/core/stock_configuration.rb

@@ -18,6 +18,11 @@ module Spree
         @estimator_class.constantize
       end
 
+      def location_filter_class
+        @location_filter_class ||= '::Spree::Stock::LocationFilter::Active'
+        @location_filter_class.constantize
+      end
+
       def location_sorter_class
         @location_sorter_class ||= '::Spree::Stock::LocationSorter::Unsorted'
         @location_sorter_class.constantize

data/lib/spree/core/version.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Spree
+  VERSION = "2.9.0.rc.1"
+
   def self.solidus_version
-    "2.8.6"
+    VERSION
   end
 
   def self.solidus_gem_version