solidus_core 2.1.1 → 2.2.0.beta1

data/app/models/spree/stock/availability_validator.rb

@@ -2,24 +2,9 @@ module Spree
   module Stock
     class AvailabilityValidator < ActiveModel::Validator
       def validate(line_item)
-        units_by_shipment = line_item.inventory_units.group_by(&:shipment)
-
-        if units_by_shipment.blank?
-          ensure_in_stock(line_item, line_item.quantity)
+        if is_valid?(line_item)
+          true
         else
-          units_by_shipment.each do |shipment, inventory_units|
-            ensure_in_stock(line_item, inventory_units.size, shipment.stock_location)
-          end
-        end
-
-        line_item.errors[:quantity].empty?
-      end
-
-      private
-
-      def ensure_in_stock(line_item, quantity, stock_location = nil)
-        quantifier = Stock::Quantifier.new(line_item.variant, stock_location)
-        unless quantifier.can_supply?(quantity)
           variant = line_item.variant
           display_name = variant.name.to_s
           display_name += %{ (#{variant.options_text})} unless variant.options_text.blank?
@@ -28,6 +13,20 @@ module Spree
             :selected_quantity_not_available,
             item: display_name.inspect
           )
+          false
+        end
+      end
+
+      private
+
+      def is_valid?(line_item)
+        if line_item.inventory_units.empty?
+          Stock::Quantifier.new(line_item.variant).can_supply?(line_item.quantity)
+        else
+          quantity_by_stock_location_id = line_item.inventory_units.pending.joins(:shipment).group(:stock_location_id).count
+          quantity_by_stock_location_id.all? do |stock_location_id, quantity|
+            Stock::Quantifier.new(line_item.variant, stock_location_id).can_supply?(quantity)
+          end
         end
       end
     end

data/app/models/spree/stock/coordinator.rb

@@ -80,10 +80,10 @@ module Spree
       # minimum required ActiveRecord objects.
       def stock_location_variant_ids
         # associate the variant ids we're interested in with stock location ids
-        location_variant_ids = StockItem.
+        location_variant_ids = Spree::StockItem.
           where(variant_id: unallocated_variant_ids).
           joins(:stock_location).
-          merge(StockLocation.active).
+          merge(Spree::StockLocation.active).
           pluck(:stock_location_id, :variant_id)
 
         # load activerecord objects for the stock location ids and turn them
@@ -92,7 +92,7 @@ module Spree
         #     <stock location id> => <stock location>,
         #     ...,
         #   }
-        location_lookup = StockLocation.
+        location_lookup = Spree::StockLocation.
           where(id: location_variant_ids.map(&:first).uniq).
           map { |l| [l.id, l] }.
           to_h

data/app/models/spree/stock/package.rb

@@ -101,7 +101,7 @@ module Spree
       # @return [Array<Spree::ShippingCategory>] the shipping categories of the
       #   variants in this package
       def shipping_categories
-        ShippingCategory.where(id: shipping_category_ids)
+        Spree::ShippingCategory.where(id: shipping_category_ids)
       end
 
       # @return [ActiveRecord::Relation] the [Spree::ShippingMethod]s available

data/app/models/spree/stock/quantifier.rb

@@ -3,15 +3,16 @@ module Spree
     class Quantifier
       attr_reader :stock_items
 
+      # @param [Variant] variant The variant to check inventory for.
+      # @param [StockLocation, Integer] stock_location The stock_location to check inventory in. If unspecified it will check inventory in all available StockLocations
       def initialize(variant, stock_location = nil)
         @variant = variant
-        where_args = { variant_id: @variant }
+        @stock_items = Spree::StockItem.where(variant_id: variant)
         if stock_location
-          where_args[:stock_location] = stock_location
+          @stock_items.where!(stock_location: stock_location)
         else
-          where_args[Spree::StockLocation.table_name] = { active: true }
+          @stock_items.joins!(:stock_location).merge!(Spree::StockLocation.active)
         end
-        @stock_items = Spree::StockItem.joins(:stock_location).where(where_args)
       end
 
       # Returns the total number of inventory units on hand for the variant.

data/app/models/spree/stock_location.rb

@@ -110,12 +110,12 @@ module Spree
     private
 
     def create_stock_items
-      Variant.find_each { |variant| propagate_variant(variant) }
+      Spree::Variant.find_each { |variant| propagate_variant(variant) }
     end
 
     def ensure_one_default
       if default
-        StockLocation.where(default: true).where.not(id: id).each do |stock_location|
+        Spree::StockLocation.where(default: true).where.not(id: id).each do |stock_location|
           stock_location.default = false
           stock_location.save!
         end

data/app/models/spree/store.rb

@@ -39,8 +39,8 @@ module Spree
 
     def ensure_default_exists_and_is_unique
       if default
-        Store.where.not(id: id).update_all(default: false)
-      elsif Store.where(default: true).count == 0
+        Spree::Store.where.not(id: id).update_all(default: false)
+      elsif Spree::Store.where(default: true).count == 0
         self.default = true
       end
     end

data/app/models/spree/store_credit.rb

@@ -1,4 +1,4 @@
-class Spree::StoreCredit < Spree::Base
+class Spree::StoreCredit < Spree::PaymentSource
   acts_as_paranoid
 
   VOID_ACTION       = 'void'

data/app/models/spree/tax/tax_helpers.rb

@@ -17,9 +17,9 @@ module Spree
       #
       # For further discussion, see https://github.com/spree/spree/issues/4397 and https://github.com/spree/spree/issues/4327.
       def applicable_rates(order)
-        order_zone_tax_categories = rates_for_order(order).map(&:tax_category)
+        order_zone_tax_category_ids = rates_for_order(order).map(&:tax_category_id)
         default_rates_with_unmatched_tax_category = rates_for_default_zone.to_a.delete_if do |default_rate|
-          order_zone_tax_categories.include?(default_rate.tax_category)
+          order_zone_tax_category_ids.include?(default_rate.tax_category_id)
         end
 
         (rates_for_order(order) + default_rates_with_unmatched_tax_category).uniq
@@ -38,7 +38,7 @@ module Spree
       end
 
       def rates_for_item(item)
-        applicable_rates(item.order).select { |rate| rate.tax_category == item.tax_category }
+        applicable_rates(item.order).select { |rate| rate.tax_category_id == item.tax_category_id }
       end
     end
   end

data/app/models/spree/tax_rate.rb

@@ -62,7 +62,13 @@ module Spree
     # Under no circumstances should negative adjustments be applied for the Spanish tax rates.
     #
     # Those rates should never come into play at all and only the French rates should apply.
-    scope :for_zone, ->(zone) { where(zone_id: Spree::Zone.with_shared_members(zone).pluck(:id)) }
+    scope :for_zone, ->(zone) do
+      if zone
+        where(zone_id: Spree::Zone.with_shared_members(zone).pluck(:id))
+      else
+        none
+      end
+    end
     scope :included_in_price, -> { where(included_in_price: true) }
 
     # Creates necessary tax adjustments for the order.

data/app/models/spree/taxonomy.rb

@@ -20,7 +20,7 @@ module Spree
           updated_at: Time.current
         )
       else
-        self.root = Taxon.create!(taxonomy_id: id, name: name)
+        self.root = Spree::Taxon.create!(taxonomy_id: id, name: name)
       end
     end
   end

data/app/models/spree/variant/scopes.rb

@@ -2,7 +2,7 @@ module Spree
   class Variant < Spree::Base
     # FIXME: WARNING tested only under sqlite and postgresql
     scope :descend_by_popularity, -> {
-      order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC")
+      order("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC")
     }
 
     class << self
@@ -12,7 +12,7 @@ module Spree
       #
       # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
       def has_option(option_type, *option_values)
-        option_types = OptionType.table_name
+        option_types = Spree::OptionType.table_name
 
         option_type_conditions = case option_type
                                  when OptionType then { "#{option_types}.name" => option_type.name }
@@ -24,9 +24,9 @@ module Spree
 
         option_values.each do |option_value|
           option_value_conditions = case option_value
-                                    when OptionValue then { "#{OptionValue.table_name}.name" => option_value.name }
-                                    when String      then { "#{OptionValue.table_name}.name" => option_value }
-          else { "#{OptionValue.table_name}.id" => option_value }
+                                    when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
+                                    when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
+          else { "#{Spree::OptionValue.table_name}.id" => option_value }
           end
           relation = relation.where(option_value_conditions)
         end

data/app/models/spree/variant/vat_price_generator.rb

@@ -28,10 +28,7 @@ module Spree
           # Don't re-create the default price
           next if variant.default_price && variant.default_price.country_iso == country_iso
 
-          foreign_price = variant.prices.find_or_initialize_by(
-            country_iso: country_iso,
-            currency: variant.default_price.currency,
-          )
+          foreign_price = find_or_initialize_price_by(country_iso, variant.default_price.currency)
 
           foreign_price.amount = variant.default_price.net_amount * (1 + vat_for_country_iso(country_iso))
         end
@@ -39,6 +36,12 @@ module Spree
 
       private
 
+      def find_or_initialize_price_by(country_iso, currency)
+        variant.prices.detect do |price|
+          price.country_iso == country_iso && price.currency == currency
+        end || variant.prices.build(country_iso: country_iso, currency: currency)
+      end
+
       # nil is added to the array so we always have an export price.
       def country_isos_requiring_price
         return [nil] unless variant.tax_category
@@ -51,7 +54,7 @@ module Spree
       end
 
       def variant_vat_rates
-        @variant_vat_rates ||= variant.tax_category.tax_rates.where(included_in_price: true)
+        @variant_vat_rates ||= variant.tax_category.tax_rates.included_in_price
       end
     end
   end

data/app/models/spree/variant.rb

@@ -69,6 +69,7 @@ module Spree
     after_create :set_position
     after_create :set_master_out_of_stock, unless: :is_master?
 
+    after_save :clear_in_stock_cache
     after_touch :clear_in_stock_cache
 
     after_real_destroy :destroy_option_values_variants

data/app/models/spree/wallet/add_payment_sources_to_wallet.rb

@@ -7,19 +7,28 @@ class Spree::Wallet::AddPaymentSourcesToWallet
   end
 
   # This is called after an order transistions to complete and should save the
-  # order's payment source/s in the user's "wallet" for future use.
+  # order's payment source in the user's "wallet" for future use.
   #
   # @return [void]
   def add_to_wallet
-    if !order.temporary_credit_card &&
-       order.user_id &&
-       order.valid_credit_cards.present?
-      # arbitrarily pick the first one for the default
-      default_cc = order.valid_credit_cards.first
-      # TODO: target for refactoring -- why is order checkout responsible for the user -> credit_card relationship?
-      default_cc.user_id = order.user_id
-      default_cc.default = true
-      default_cc.save
+    if !order.temporary_payment_source && order.user
+      # select valid sources
+      payments = order.payments.valid
+      sources = payments.map(&:source).
+        uniq.
+        compact.
+        select { |p| p.try(:reusable?) }
+
+      # 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|
+          order.user.wallet.add(source)
+        end
+
+        order.user.wallet.default_wallet_payment_source =
+          wallet_payment_sources.last
+      end
     end
   end
 

data/app/models/spree/wallet/default_payment_builder.rb

@@ -1,5 +1,6 @@
 # This class is responsible for building a default payment on an order, using a
-# payment source that is already in the user's "wallet".
+# payment source that is already in the user's "wallet" and is marked
+# as being the default payment source.
 class Spree::Wallet::DefaultPaymentBuilder
   def initialize(order)
     @order = order
@@ -10,12 +11,11 @@ class Spree::Wallet::DefaultPaymentBuilder
   #
   # @return [Payment] the unsaved payment to be added, or nil if none.
   def build
-    credit_card = order.user.try!(:default_credit_card)
-
-    if credit_card.try!(:valid?) && order.payments.from_credit_card.count == 0
+    default = order.user.try!(:wallet).try!(:default_wallet_payment_source)
+    if default && order.payments.where(source_type: default.payment_source_type).none?
       Spree::Payment.new(
-        payment_method_id: credit_card.payment_method_id,
-        source: credit_card,
+        payment_method: default.payment_source.payment_method,
+        source: default.payment_source,
       )
     end
   end

data/app/models/spree/wallet.rb

@@ -0,0 +1,71 @@
+# Interface for accessing and updating a user's active "wallet". A Wallet
+# is the *active* list of *reusable* payment sources that a user would like to
+# choose from when placing orders.
+#
+# A Wallet is composed of WalletPaymentSources. A WalletPaymentSource is a join table that
+# links a PaymentSource (e.g. a CreditCard) to a User. One of a user's
+# WalletPaymentSources may be the 'default' WalletPaymentSource.
+class Spree::Wallet
+  class Unauthorized < StandardError; end
+
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+
+  # Returns an array of the WalletPaymentSources in this wallet.
+  #
+  # @return [Array<WalletPaymentSource>]
+  def wallet_payment_sources
+    user.wallet_payment_sources.to_a
+  end
+
+  # Add a PaymentSource to the wallet.
+  #
+  # @param payment_source [PaymentSource] The payment source to add to the wallet
+  # @return [WalletPaymentSource] the generated WalletPaymentSource
+  def add(payment_source)
+    user.wallet_payment_sources.find_or_create_by!(payment_source: payment_source)
+  end
+
+  # Remove a PaymentSource from the wallet.
+  #
+  # @param payment_source [PaymentSource] The payment source to remove from the wallet
+  # @raise [ActiveRecord::RecordNotFound] if the source is not in the wallet.
+  # @return [WalletPaymentSource] the destroyed WalletPaymentSource
+  def remove(payment_source)
+    user.wallet_payment_sources.find_by!(payment_source: payment_source).destroy!
+  end
+
+  # Find a WalletPaymentSource in the wallet by id.
+  #
+  # @param wallet_payment_source_id [Integer] The id of the WalletPaymentSource.
+  # @return [WalletPaymentSource]
+  def find(wallet_payment_source_id)
+    user.wallet_payment_sources.find_by(id: wallet_payment_source_id)
+  end
+
+  # Find the default WalletPaymentSource for this wallet, if any.
+  # @return [WalletPaymentSource]
+  def default_wallet_payment_source
+    user.wallet_payment_sources.find_by(default: true)
+  end
+
+  # Change the default WalletPaymentSource for this wallet.
+  # @param source [WalletPaymentSource] The payment source to set as the default.
+  #   It must be in the wallet already. Pass nil to clear the default.
+  # @return [void]
+  def default_wallet_payment_source=(wallet_payment_source)
+    if wallet_payment_source && !find(wallet_payment_source.id)
+      raise Unauthorized, "wallet_payment_source #{wallet_payment_source.id} does not belong to wallet of user #{user.id}"
+    end
+
+    wallet_payment_source.transaction do
+      # Unset old default
+      default_wallet_payment_source.try!(:update!, default: false)
+      # Set new default
+      wallet_payment_source.try!(:update!, default: true)
+    end
+  end
+end

data/app/models/spree/wallet_payment_source.rb

@@ -0,0 +1,17 @@
+class Spree::WalletPaymentSource < ActiveRecord::Base
+  belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources
+  belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources
+
+  validates_presence_of :user
+  validates_presence_of :payment_source
+
+  validate :check_for_payment_source_class
+
+  private
+
+  def check_for_payment_source_class
+    if !payment_source.is_a?(Spree::PaymentSource)
+      errors.add(:payment_source, :has_to_be_payment_source_class)
+    end
+  end
+end

data/app/models/spree/zone.rb

@@ -185,7 +185,7 @@ module Spree
     def set_zone_members(ids, type)
       zone_members.destroy_all
       ids.reject(&:blank?).map do |id|
-        member = ZoneMember.new
+        member = Spree::ZoneMember.new
         member.zoneable_type = type
         member.zoneable_id = id
         members << member

data/app/views/spree/carton_mailer/shipped_email.text.erb

@@ -10,7 +10,7 @@
 <% end %>
 ============================================================
 
-<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @carton.tracking)     if @carton.tracking %>
+<%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @carton.tracking)     if @carton.tracking %>
 <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @carton.tracking_url) if @carton.tracking_url %>
 
 <%= Spree.t('shipment_mailer.shipped_email.thanks') %>

data/app/views/spree/promotion_code_batch_mailer/promotion_code_batch_errored.text.erb

@@ -0,0 +1,2 @@
+<%= Spree.t("promotion_code_batch_mailer.promotion_code_batch_errored.message", error: @promotion_code_batch.error) %>
+<%= @promotion_code_batch.promotion.name %>

data/app/views/spree/promotion_code_batch_mailer/promotion_code_batch_finished.text.erb

@@ -0,0 +1,2 @@
+<%= Spree.t("promotion_code_batch_mailer.promotion_code_batch_finished.message", number_of_codes: 10) %>
+<%= @promotion_code_batch.promotion.name %>

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -31,13 +31,6 @@
               </td>
             </tr>
           <% end %>
-          <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-            <tr>
-              <td colspan="3">
-                <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
-              </td>
-            </tr>
-          <% end %>
         </table>
       <% end %>
     </td>

data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb

@@ -14,9 +14,4 @@
 <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
 <%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %> -> <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.name) %> <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? %>
 <% end %>
-
-
-<% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-<%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
-<% end %>
 <% end %>

data/app/views/spree/shared/_error_messages.html.erb

@@ -1,6 +1,6 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation" data-hook>
-    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
+    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.count) %>:</h2>
     <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>
      <% target.errors.full_messages.each do |msg| %>

data/app/views/spree/shipment_mailer/shipped_email.html.erb

@@ -20,7 +20,7 @@
         <% end %>
       </table>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
+        <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking)     if @shipment.tracking %>
       </p>
       <p>
         <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( logo/solidus_logo.png noimage/*.png )
+Rails.application.config.assets.precompile << 'solidus_core_manifest.js'

data/config/initializers/friendly_id.rb

@@ -82,7 +82,7 @@ FriendlyId.defaults do |config|
   #
   # config.use Module.new {
   #   def normalize_friendly_id(text)
-  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #     text.to_slug.normalize! transliterations: [:russian, :latin]
   #   end
   # }
 end