solidus_core 1.0.7 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38685bcc1d7ee47ba79564d398c99a21dd0d480
-  data.tar.gz: 7397b8dc2aa601f44baef214fd09939ed87d5d1d
+  metadata.gz: e28b0ee86c1ba03353662094d58504d304637094
+  data.tar.gz: fe5c696d0f48fc4e4e587fe205a7d806588e2304
 SHA512:
-  metadata.gz: 59cad15903b2db9b9168b62aae5da114d58bf2550abdd21f1bf583f32d60430eb4f373289bf7301013b0dd7ccb75039c10118daed54a134816e833c25858bf67
-  data.tar.gz: 180d7e3848e58b98e1e17e7ffaa29b8339f915f07cd1f8f06c57c9859526015c068cd7eb96c66d708625a91d77d0dffcc6fdfe5352bce99ed90bf8938cd6c0e7
+  metadata.gz: 85cac5bfcff4dc8b64841eb1474f185d9238b6d6c630817f46ffb8d02858005c8c1e9457c7a84222b505137f618b3072dcaff3a5b0efb3245604644ea4dc2fdf
+  data.tar.gz: 753061a48745dc0a1596bf0c6bab75b8e65c0bb5ee23091271e561d71e363dd9f52e3c8fe14011d91e9e3a3ab12190b4c9c5225e521452d264e568d1161b3c21

data/app/controllers/spree/base_controller.rb

@@ -5,11 +5,10 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::RespondWith
   include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::PaymentParameters
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
 
   respond_to :html
 end
-
-require 'spree/i18n/initializer'

data/app/helpers/spree/base_helper.rb

@@ -13,11 +13,11 @@ module Spree
     end
 
     def link_to_cart(text = nil)
-      text = text ? h(text) : Spree.t('cart')
+      text = text ? h(text) : Spree.t(:cart)
       css_class = nil
 
       if simple_current_order.nil? or simple_current_order.item_count.zero?
-        text = "#{text}: (#{Spree.t('empty')})"
+        text = "#{text}: (#{Spree.t(:empty)})"
         css_class = 'empty'
       else
         text = "#{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
@@ -107,14 +107,13 @@ module Spree
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
       return '' if max_level < 1 || root_taxon.children.empty?
       content_tag :ul, class: 'taxons-list' do
-        taxons = root_taxon.children.map do |taxon|
+        root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
           content_tag :li, class: css_class do
            link_to(taxon.name, seo_url(taxon)) +
            taxons_tree(taxon, current_taxon, max_level - 1)
           end
-        end
-        safe_join(taxons, "\n")
+        end.join("\n").html_safe
       end
     end
 

data/app/helpers/spree/products_helper.rb

@@ -52,14 +52,6 @@ module Spree
       end
     end
 
-    # Deprecated and may be removed from future releases; use
-    # line_item_description_text(line_item.description) instead.
-    def line_item_description(variant)
-      ActiveSupport::Deprecation.warn "line_item_description(variant) is deprecated and may be removed from future releases, use line_item_description_text(line_item.description) instead.", caller
-
-      line_item_description_text(variant.product.description)
-    end
-
     # Filters and truncates the given description.
     #
     # @param description_text [String] the text to filter

data/app/mailers/spree/carton_mailer.rb

@@ -2,11 +2,23 @@ module Spree
   class CartonMailer < BaseMailer
     # Send an email to customers to notify that an individual carton has been
     # shipped.
-    def shipped_email(carton_id, resend: false)
-      @carton = Spree::Carton.find(carton_id)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@carton.order_numbers.join(', ')}"
-      mail(to: @carton.order_emails, from: from_address(Spree::Store.current), subject: subject)
+    def shipped_email(options, deprecated_options={})
+      if options.is_a?(Integer)
+        ActiveSupport::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"
+        @carton = Carton.find(options)
+        @order = @carton.orders.first # assume first order
+        @manifest = @carton.manifest # use the entire manifest, since we don't know the precise order
+        options = deprecated_options
+      else
+        @order = options.fetch(:order)
+        @carton = options.fetch(:carton)
+        @manifest = @carton.manifest_for_order(@order)
+      end
+      options =  {resend: false}.merge(options)
+      @store = @order.store
+      subject = (options[:resend] ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject += "#{@store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address(@store), subject: subject)
     end
   end
 end

data/app/mailers/spree/order_mailer.rb

@@ -2,29 +2,37 @@ module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
       @order = find_order(order)
+      @store = @order.store
       subject = build_subject(Spree.t('order_mailer.confirm_email.subject'), resend)
 
-      mail(to: @order.email, from: from_address(@order.store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject: subject)
     end
 
     def cancel_email(order, resend = false)
       @order = find_order(order)
+      @store = @order.store
       subject = build_subject(Spree.t('order_mailer.cancel_email.subject'), resend)
 
-      mail(to: @order.email, from: from_address(@order.store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject: subject)
     end
 
     def inventory_cancellation_email(order, inventory_units, resend = false)
       @order, @inventory_units = find_order(order), inventory_units
+      @store = @order.store
       subject = build_subject(Spree.t('order_mailer.inventory_cancellation.subject'), resend)
 
-      mail(to: @order.email, from: from_address(@order.store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject: subject)
     end
 
     private
 
     def find_order(order)
-      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      if order.respond_to?(:id)
+        order
+      else
+        ActiveSupport::Deprecation.warn("Calling OrderMailer with an id is deprecated. Pass the Spree::Order object instead.")
+        Spree::Order.find(order)
+      end
     end
 
     def build_subject(subject_text, resend)

data/app/models/concerns/spree/adjustment_source.rb

@@ -4,20 +4,19 @@ module Spree
 
     included do
       def deals_with_adjustments_for_deleted_source
-        adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
+        adjustment_scope = self.adjustments.joins(:order)
 
         # For incomplete orders, remove the adjustment completely.
-        adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
+        adjustment_scope.where(spree_orders: { completed_at: nil }).destroy_all
 
         # For complete orders, the source will be invalid.
         # Therefore we nullify the source_id, leaving the adjustment in place.
         # This would mean that the order's total is not altered at all.
-        adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
-          adjustment.update_columns(
-            source_id: nil,
-            updated_at: Time.now,
-          )
-        end
+        attrs = {
+          source_id: nil,
+          updated_at: Time.now
+        }
+        adjustment_scope.where.not(spree_orders: { completed_at: nil }).update_all(attrs)
       end
     end
   end

data/app/models/concerns/spree/default_price.rb

@@ -4,11 +4,17 @@ module Spree
 
     included do
       has_one :default_price,
-        -> { where currency: Spree::Config[:currency] },
+        -> { where currency: Spree::Config[:currency], is_default: true },
         class_name: 'Spree::Price',
         dependent: :destroy
 
-      delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
+      def find_or_build_default_price
+        default_price || build_default_price
+      end
+
+      delegate :display_price, :display_amount,
+                :price, :price=, :currency, :currency=,
+                to: :find_or_build_default_price
 
       after_save :save_default_price
 

data/app/models/concerns/spree/named_type.rb

@@ -4,7 +4,7 @@ module Spree
 
     included do
       scope :active, -> { where(active: true) }
-      default_scope -> { order("LOWER(#{self.table_name}.name)") }
+      default_scope -> { order(arel_table[:name].lower) }
 
       validates :name, presence: true, uniqueness: { case_sensitive: false }
     end

data/app/models/concerns/spree/ordered_property_value_list.rb

@@ -0,0 +1,28 @@
+module Spree
+  module OrderedPropertyValueList
+    extend ActiveSupport::Concern
+
+    included do
+      acts_as_list
+
+      validates :property, presence: true
+      validates_with Spree::Validations::DbMaximumLengthValidator, field: :value
+
+      default_scope -> { order(:position) }
+
+      # virtual attributes for use with AJAX autocompletion
+      def property_name
+        property.name if property
+      end
+
+      def property_name=(name)
+        unless name.blank?
+          unless property = Property.find_by(name: name)
+            property = Property.create(name: name, presentation: name)
+          end
+          self.property = property
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/user_address_book.rb

@@ -0,0 +1,125 @@
+module Spree
+  module UserAddressBook
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :user_addresses, -> { active }, {foreign_key: "user_id", class_name: "Spree::UserAddress"} do
+
+        def find_first_by_address_values(address_attrs)
+          detect { |ua| ua.address == Address.new(address_attrs) }
+        end
+
+        # @note this method enforces only one default address per user
+        def mark_default(user_address)
+          # the checks of persisted? allow us to build a User and associate Addresses at once
+          ActiveRecord::Base.transaction do
+            (self - [user_address]).each do |ua| #update_all would be nice, but it bypasses ActiveRecord callbacks
+              ua.persisted? ? ua.update!(default: false) : ua.default = false
+            end
+            user_address.persisted? ? user_address.update!(default: true, archived: false) : user_address.default = true
+          end
+        end
+      end
+
+      has_many :addresses, through: :user_addresses
+
+      # bill_address is only minimally used now, but we can't get rid of it without a major version release
+      belongs_to :bill_address, class_name: 'Spree::Address'
+
+      def bill_address=(address)
+        # stow a copy in our address book too
+        address = save_in_address_book(address.attributes) if address
+        super(address)
+      end
+
+      def bill_address_attributes=(attributes)
+        self.bill_address = Address.immutable_merge(bill_address, attributes)
+      end
+
+      def default_address
+        user_addresses.default.first.try(:address)
+      end
+
+      def default_address=(address)
+        save_in_address_book(address.attributes, true) if address
+      end
+
+      def default_address_attributes=(attributes)
+        # see "Nested Attributes Examples" section of http://apidock.com/rails/ActionView/Helpers/FormHelper/fields_for
+        # this #{fieldname}_attributes= method works with fields_for in the views
+        # even without declaring accepts_nested_attributes_for
+        self.default_address = Address.immutable_merge(default_address, attributes)
+      end
+
+      alias_method :ship_address, :default_address
+      alias_method :ship_address_attributes=, :default_address_attributes=
+
+      def ship_address=(address)
+        be_default = Spree::Config.automatic_default_address
+        save_in_address_book(address.attributes, be_default)
+      end
+
+      def persist_order_address(order)
+        if Spree::Config.automatic_default_address
+          save_in_address_book(order.ship_address.attributes, true)
+          save_in_address_book(order.bill_address.attributes, order.ship_address.nil?)
+        else
+          save_in_address_book(order.ship_address.attributes)
+          save_in_address_book(order.bill_address.attributes)
+        end
+      end
+
+      # Add an address to the user's list of saved addresses for future autofill
+      # @param address_attributes HashWithIndifferentAccess of attributes that will be
+      # treated as value equality to de-dup among existing Addresses
+      # @param default set whether or not this address will show up from
+      # #default_address or not
+      def save_in_address_book(address_attributes, default = false)
+        return nil unless address_attributes.present?
+        address_attributes = address_attributes.with_indifferent_access
+
+        new_address = Address.factory(address_attributes)
+        return new_address unless new_address.valid?
+
+        first_one = user_addresses.empty?
+
+        if address_attributes[:id].present? && new_address.id != address_attributes[:id]
+          remove_from_address_book(address_attributes[:id])
+        end
+
+        user_address = prepare_user_address(new_address)
+        user_addresses.mark_default(user_address) if (default || first_one)
+
+        if persisted?
+          user_address.save!
+          user_addresses.reset #ensures proper ordering
+        end
+
+        user_address.address
+      end
+
+      def mark_default_address(address)
+        user_addresses.mark_default(user_addresses.find_by(address: address))
+      end
+
+      def remove_from_address_book(address_id)
+        user_address = user_addresses.find_by(address_id: address_id)
+        if user_address
+          user_address.update_attributes(archived: true, default: false)
+        else
+          false
+        end
+      end
+
+      private
+
+      def prepare_user_address(new_address)
+        user_address = user_addresses.all_historical.find_first_by_address_values(new_address.attributes)
+        user_address ||= user_addresses.build
+        user_address.address = new_address
+        user_address.archived = false
+        user_address
+      end
+    end
+  end
+end

data/app/models/concerns/spree/user_api_authentication.rb

@@ -1,7 +1,7 @@
 module Spree
   module UserApiAuthentication
     def generate_spree_api_key!
-      self.spree_api_key = SecureRandom.hex(24)
+      generate_spree_api_key
       save!
     end
 
@@ -10,8 +10,12 @@ module Spree
     end
 
     def clear_spree_api_key!
-      self.spree_api_key = nil
+      clear_spree_api_key
       save!
     end
+
+    def clear_spree_api_key
+      self.spree_api_key = nil
+    end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -4,13 +4,13 @@ module Spree
 
     include Spree::UserApiAuthentication
     include Spree::UserReporting
-    include Spree::UserAddress
+    include Spree::UserAddressBook
     include Spree::UserPaymentSource
 
     included do
       extend Spree::DisplayMoney
 
-      has_many :role_users, foreign_key: "user_id", class_name: "Spree::RoleUser"
+      has_many :role_users, foreign_key: "user_id", class_name: "Spree::RoleUser", dependent: :destroy
       has_many :spree_roles, through: :role_users, source: :role
 
       has_many :user_stock_locations, foreign_key: "user_id", class_name: "Spree::UserStockLocation"
@@ -23,11 +23,8 @@ module Spree
       has_many :store_credit_events, through: :store_credits
       money_methods :total_available_store_credit
 
-      belongs_to :ship_address, class_name: 'Spree::Address'
-      belongs_to :bill_address, class_name: 'Spree::Address'
-
       def self.ransackable_associations(auth_object=nil)
-        %w[bill_address ship_address]
+        %w[addresses]
       end
 
       def self.ransackable_attributes(auth_object=nil)
@@ -46,6 +43,8 @@ module Spree
       self_orders = self.orders
       self_orders = self_orders.where(frontend_viewable: true) if only_frontend_viewable
       self_orders = self_orders.where(store: store) if store
+      self_orders = self_orders.where('updated_at > ?', Spree::Config.completable_order_updated_cutoff_days.days.ago) if Spree::Config.completable_order_updated_cutoff_days
+      self_orders = self_orders.where('created_at > ?', Spree::Config.completable_order_created_cutoff_days.days.ago) if Spree::Config.completable_order_created_cutoff_days
       last_order = self_orders.order(:created_at).last
       last_order unless last_order.try!(:completed?)
     end

data/app/models/spree/ability.rb

@@ -28,9 +28,8 @@ module Spree
       @user = current_user || Spree.user_class.new
 
       alias_actions
-      grant_default_permissions
-      register_extension_abilities
       activate_permission_sets
+      register_extension_abilities
     end
 
     private
@@ -47,42 +46,6 @@ module Spree
       alias_action :index, :read, to: :display
     end
 
-    def grant_default_permissions
-      # if the user is a "super user" give them full permissions, otherwise give them the permissions
-      # required to checkout and use the frontend.
-      if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
-        can :manage, :all
-      else
-        grant_generic_user_permissions
-      end
-    end
-
-    def grant_generic_user_permissions
-      can :display, Country
-      can :display, OptionType
-      can :display, OptionValue
-      can :create, Order
-      can [:read, :update], Order do |order, token|
-        order.user == user || order.guest_token && token == order.guest_token
-      end
-      can :create, ReturnAuthorization do |return_authorization|
-        return_authorization.order.user == user
-      end
-      can [:display, :update], CreditCard, user_id: user.id
-      can :display, Product
-      can :display, ProductProperty
-      can :display, Property
-      can :create, Spree.user_class
-      can [:read, :update, :destroy], Spree.user_class, id: user.id
-      can :display, State
-      can :display, StockItem, stock_location: { active: true }
-      can :display, StockLocation, active: true
-      can :display, Taxon
-      can :display, Taxonomy
-      can [:display, :view_out_of_stock], Variant
-      can :display, Zone
-    end
-
     # Before, this was the only way to extend this ability. Permission sets have been added since.
     # It is recommended to use them instead for extension purposes if possible.
     def register_extension_abilities