solidus_core 1.0.7 → 1.1.0.beta1

data/app/models/spree/payment_method.rb

@@ -4,12 +4,12 @@ module Spree
     DISPLAY = [:both, :front_end, :back_end]
     default_scope -> { where(deleted_at: nil) }
 
-    scope :production, -> { where(environment: 'production') }
-
     validates :name, presence: true
 
     has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
     has_many :credit_cards, class_name: "Spree::CreditCard"
+    has_many :store_payment_methods, inverse_of: :payment_method
+    has_many :payment_methods, through: :store_payment_methods
 
     include Spree::Preferences::StaticallyConfigurable
 
@@ -28,16 +28,16 @@ module Spree
       raise ::NotImplementedError, "You must implement payment_source_class method for #{self.class}."
     end
 
-    def self.available(display_on = 'both')
+    def self.available(display_on = 'both', store: nil)
       all.select do |p|
         p.active &&
         (p.display_on == display_on.to_s || p.display_on.blank?) &&
-        (p.environment == Rails.env || p.environment.blank?)
+        (store.nil? || store.payment_methods.empty? || store.payment_methods.include?(p))
       end
     end
 
     def self.active?
-      where(type: self.to_s, environment: Rails.env, active: true).count > 0
+      where(type: self.to_s, active: true).count > 0
     end
 
     def method_type

data/app/models/spree/permission_sets/default_customer.rb

@@ -0,0 +1,31 @@
+module Spree
+  module PermissionSets
+    class DefaultCustomer < PermissionSets::Base
+      def activate!
+        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], 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
+    end
+  end
+end

data/app/models/spree/permission_sets/order_display.rb

@@ -9,6 +9,10 @@ module Spree
         can [:display, :admin], Spree::LineItem
         can [:display, :admin], Spree::ReturnAuthorization
         can [:display, :admin], Spree::CustomerReturn
+        can [:display, :admin], Spree::OrderCancellations
+        can [:display, :admin], Spree::Reimbursement
+        can [:display, :admin], Spree::ReturnItem
+        can [:display, :admin], Spree::Refund
       end
     end
   end

data/app/models/spree/permission_sets/order_management.rb

@@ -11,6 +11,9 @@ module Spree
         can :manage, Spree::ReturnAuthorization
         can :manage, Spree::CustomerReturn
         can :manage, Spree::OrderCancellations
+        can :manage, Spree::Reimbursement
+        can :manage, Spree::ReturnItem
+        can :manage, Spree::Refund
       end
     end
   end

data/app/models/spree/permission_sets/promotion_display.rb

@@ -2,10 +2,11 @@ module Spree
   module PermissionSets
     class PromotionDisplay < PermissionSets::Base
       def activate!
-        can [:display, :admin], Spree::Promotion
+        can [:display, :admin, :edit], Spree::Promotion
         can [:display, :admin], Spree::PromotionRule
         can [:display, :admin], Spree::PromotionAction
         can [:display, :admin], Spree::PromotionCategory
+        can [:display, :admin], Spree::PromotionCode
       end
     end
   end

data/app/models/spree/permission_sets/restricted_stock_display.rb

@@ -0,0 +1,16 @@
+module Spree
+  module PermissionSets
+    class RestrictedStockDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::StockItem, stock_location_id: location_ids
+        can :display, Spree::StockLocation, id: location_ids
+      end
+
+      private
+
+      def location_ids
+        @ids ||= user.stock_locations.pluck(:id)
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/restricted_stock_management.rb

@@ -0,0 +1,16 @@
+module Spree
+  module PermissionSets
+    class RestrictedStockManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::StockItem, stock_location_id: location_ids
+        can :display, Spree::StockLocation, id: location_ids
+      end
+
+      private
+
+      def location_ids
+        @ids ||= user.stock_locations.pluck(:id)
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/restricted_stock_transfer_display.rb

@@ -0,0 +1,17 @@
+module Spree
+  module PermissionSets
+    class RestrictedStockTransferDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::StockTransfer, source_location_id: location_ids
+        can [:display, :admin], Spree::StockTransfer, destination_location_id: location_ids
+        can :display, Spree::StockLocation, id: location_ids
+      end
+
+      private
+
+      def location_ids
+        @ids ||= user.stock_locations.pluck(:id)
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/restricted_stock_transfer_management.rb

@@ -0,0 +1,51 @@
+module Spree
+  module PermissionSets
+    # This is a permission set that offers an alternative to {StockManagement}.
+    #
+    # Instead of allowing management access for all stock transfers and items, only allow
+    # the management of stock transfers for locations the user is associated with.
+    #
+    # Users can be associated with stock locations via the admin user interface.
+    #
+    # The logic here is unfortunately rather complex and boils down to:
+    # - A user has read only access to all stock locations (including inactive ones)
+    # - A user can see all stock transfers for their associated stock locations regardless of the
+    #   fact that they may not be associated with both the destination and the source, as long as
+    #   they are associated with at least one of the two.
+    # - A user can manage stock transfers only if they are associated with both the destination and the source,
+    #   or if the user is associated with the source, and the transfer has not yet been assigned a destination.
+    #
+    # @see Spree::PermissionSets::Base
+    class RestrictedStockTransferManagement < PermissionSets::Base
+      def activate!
+        if user.stock_locations.any?
+          can :display, Spree::StockLocation, id: location_ids
+          can [:admin, :create], Spree::StockTransfer
+          can :display, Spree::StockTransfer, source_location_id: location_ids
+          can :display, Spree::StockTransfer, destination_location_id: location_ids
+          can :manage, Spree::StockTransfer,
+            source_location_id: location_ids,
+            destination_location_id: destination_location_ids
+
+          can :transfer, Spree::StockLocation, id: location_ids
+
+          can :manage, Spree::TransferItem, stock_transfer: {
+            source_location_id: location_ids,
+            destination_location_id: destination_location_ids
+          }
+        end
+      end
+
+      private
+
+      def location_ids
+        # either source_location_id or destination_location_id can be nil.
+        @ids ||= user.stock_locations.pluck(:id)
+      end
+
+      def destination_location_ids
+        location_ids + [nil]
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/stock_display.rb

@@ -3,7 +3,7 @@ module Spree
     class StockDisplay < PermissionSets::Base
       def activate!
         can [:display, :admin], Spree::StockItem
-        can [:display, :admin], Spree::StockTransfer
+        can :display, Spree::StockLocation
       end
     end
   end

data/app/models/spree/permission_sets/stock_management.rb

@@ -3,8 +3,7 @@ module Spree
     class StockManagement < PermissionSets::Base
       def activate!
         can :manage, Spree::StockItem
-        can :manage, Spree::StockTransfer
-        can :manage, Spree::TransferItem
+        can :display, Spree::StockLocation
       end
     end
   end

data/app/models/spree/permission_sets/stock_transfer_display.rb

@@ -0,0 +1,10 @@
+module Spree
+  module PermissionSets
+    class StockTransferDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::StockTransfer
+        can :display, Spree::StockLocation
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/stock_transfer_management.rb

@@ -0,0 +1,11 @@
+module Spree
+  module PermissionSets
+    class StockTransferManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::StockTransfer
+        can :manage, Spree::TransferItem
+        can :display, Spree::StockLocation
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/super_user.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class SuperUser < PermissionSets::Base
+      def activate!
+        can :manage, :all
+      end
+    end
+  end
+end

data/app/models/spree/product.rb

@@ -15,12 +15,18 @@ module Spree
 
     has_many :product_option_types, dependent: :destroy, inverse_of: :product
     has_many :option_types, through: :product_option_types
+
     has_many :product_properties, dependent: :destroy, inverse_of: :product
     has_many :properties, through: :product_properties
+    has_many :variant_property_rules
+    has_many :variant_property_rule_values, through: :variant_property_rules, source: :values
+    has_many :variant_property_rule_conditions, through: :variant_property_rules, source: :conditions
 
     has_many :classifications, dependent: :delete_all, inverse_of: :product
-    has_many :taxons, through: :classifications
-    has_and_belongs_to_many :promotion_rules, join_table: :spree_products_promotion_rules
+    has_many :taxons, through: :classifications, before_remove: :remove_taxon
+
+    has_many :product_promotion_rules
+    has_many :promotion_rules, through: :product_promotion_rules
 
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products
@@ -31,26 +37,33 @@ module Spree
       class_name: 'Spree::Variant'
 
     has_many :variants,
-      -> { where(is_master: false).order("#{::Spree::Variant.quoted_table_name}.position ASC") },
+      -> { where(is_master: false).order(:position) },
       inverse_of: :product,
       class_name: 'Spree::Variant'
 
     has_many :variants_including_master,
-      -> { order("#{::Spree::Variant.quoted_table_name}.position ASC") },
+      -> { order(:position) },
       inverse_of: :product,
       class_name: 'Spree::Variant',
       dependent: :destroy
 
-    has_many :prices, -> { order('spree_variants.position, spree_variants.id, currency') }, through: :variants
+    has_many :prices, -> { order(Spree::Variant.arel_table[:position].asc, Spree::Variant.arel_table[:id].asc, :currency) }, through: :variants
 
     has_many :stock_items, through: :variants_including_master
 
     has_many :line_items, through: :variants_including_master
     has_many :orders, through: :line_items
 
-    delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in
+    def find_or_build_master
+      master || build_master
+    end
+
+    MASTER_ATTRIBUTES = [:sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :cost_currency, :price_in, :amount_in, :cost_price]
+    MASTER_ATTRIBUTES.each do |attr|
+      delegate :"#{attr}", :"#{attr}=", to: :find_or_build_master
+    end
 
-    delegate_belongs_to :master, :cost_price
+    delegate :display_amount, :display_price, :has_default_price?, to: :find_or_build_master
 
     delegate :images, to: :master, prefix: true
     alias_method :images, :master_images
@@ -82,6 +95,7 @@ module Spree
 
     attr_accessor :option_values_hash
 
+    accepts_nested_attributes_for :variant_property_rules, allow_destroy: true
     accepts_nested_attributes_for :product_properties, allow_destroy: true, reject_if: lambda { |pp| pp[:property_name].blank? }
 
     alias :options :product_option_types
@@ -96,11 +110,7 @@ module Spree
 
     # @return [Spree::TaxCategory] tax category for this product, or the default tax category
     def tax_category
-      if self[:tax_category_id].nil?
-        TaxCategory.where(is_default: true).first
-      else
-        TaxCategory.find(self[:tax_category_id])
-      end
+      super || TaxCategory.find_by(is_default: true)
     end
 
     # Overrides the prototype_id setter in order to ensure it is cast to an
@@ -120,9 +130,10 @@ module Spree
     # @return [Array] the option_values
     def ensure_option_types_exist_for_values_hash
       return if option_values_hash.nil?
-      option_values_hash.keys.map(&:to_i).each do |id|
-        self.option_type_ids << id unless option_type_ids.include?(id)
-        product_option_types.create(option_type_id: id) unless product_option_types.pluck(:option_type_id).include?(id)
+      required_option_type_ids = option_values_hash.keys.map(&:to_i)
+      missing_option_type_ids = required_option_type_ids - option_type_ids
+      missing_option_type_ids.each do |id|
+        product_option_types.create(option_type_id: id)
       end
     end
 
@@ -168,11 +179,10 @@ module Spree
     # @param values [Array{String}] strings to search through fields for
     # @return [ActiveRecord::Relation] scope with WHERE clause for search applied
     def self.like_any(fields, values)
-      where fields.map { |field|
-        values.map { |value|
-          arel_table[field].matches("%#{value}%")
-        }.inject(:or)
-      }.inject(:or)
+      conditions = fields.product(values).map do |(field, value)|
+        arel_table[field].matches("%#{value}%")
+      end
+      where conditions.inject(:or)
     end
 
     # @param current_currency [String] currency to filter variants by; defaults to Spree's default
@@ -183,6 +193,24 @@ module Spree
       end
     end
 
+    # Groups all of the option values that are associated to the product's variants, grouped by
+    # option type.
+    #
+    # @param variant_scope [ActiveRecord_Associations_CollectionProxy] scope to filter the variants
+    # used to determine the applied option_types
+    # @return [Hash<Spree::OptionType, Array<Spree::OptionValue>>] all option types and option values
+    # associated with the products variants grouped by option type
+    def variant_option_values_by_option_type(variant_scope = nil)
+      option_value_ids = Spree::OptionValuesVariant.joins(:variant)
+        .where(spree_variants: { product_id: self.id})
+        .merge(variant_scope)
+        .distinct.pluck(:option_value_id)
+      Spree::OptionValue.where(id: option_value_ids).
+        includes(:option_type).
+        order("#{Spree::OptionType.table_name}.position, #{Spree::OptionValue.table_name}.position").
+        group_by(&:option_type)
+    end
+
     # @return [Boolean] true if there are no option values
     def empty_option_values?
       options.empty? || options.any? do |opt|
@@ -204,11 +232,7 @@ module Spree
     def set_property(property_name, property_value)
       ActiveRecord::Base.transaction do
         # Works around spree_i18n #301
-        property = if Property.exists?(name: property_name)
-          Property.where(name: property_name).first
-        else
-          Property.create(name: property_name, presentation: property_name)
-        end
+        property = Property.create_with(presentation: property_name).find_or_create_by(name: property_name)
         product_property = ProductProperty.where(product: self, property: property).first_or_initialize
         product_property.value = property_value
         product_property.save!
@@ -237,7 +261,7 @@ module Spree
     #
     # @return [Spree::Variant] the master variant
     def master
-      super || variants_including_master.with_deleted.where(is_master: true).first
+      super || variants_including_master.with_deleted.find_by(is_master: true)
     end
 
     # Image that can be used for the product.
@@ -249,6 +273,16 @@ module Spree
       images.first || variant_images.first || Spree::Image.new
     end
 
+    # Finds the variant property rule that matches the provided option value ids.
+    #
+    # @param [Array<Integer>] list of option value ids
+    # @return [Spree::VariantPropertyRule] the matching variant property rule
+    def find_variant_property_rule(option_value_ids)
+      variant_property_rules.find do |rule|
+        rule.matches_option_value_ids?(option_value_ids)
+      end
+    end
+
     private
 
     def add_associations_from_prototype
@@ -265,7 +299,7 @@ module Spree
       if variants_including_master.loaded?
         variants_including_master.any? { |v| !v.should_track_inventory? }
       else
-        !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).any?
+        !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).exists?
       end
     end
 
@@ -276,7 +310,7 @@ module Spree
       values = values.inject(values.shift) { |memo, value| memo.product(value).map(&:flatten) }
 
       values.each do |ids|
-        variant = variants.create(
+        variants.create(
           option_value_ids: ids,
           price: master.price
         )
@@ -353,6 +387,10 @@ module Spree
       Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
     end
 
+    def remove_taxon(taxon)
+      removed_classifications = classifications.where(taxon: taxon)
+      removed_classifications.each &:remove_from_list
+    end
   end
 end