solidus_core 2.0.3 → 2.1.0.beta1

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -27,7 +27,7 @@ module Spree
             order: order,
             source: self,
             promotion_code: options[:promotion_code],
-            label: "#{Spree.t(:promotion)} (#{promotion.name})"
+            label: Spree.t('adjustment_labels.order', promotion: Spree::Promotion.model_name.human, promotion_name: promotion.name)
           )
           true
         end
@@ -39,6 +39,17 @@ module Spree
           [(calculable.item_total + calculable.ship_total), amount].min * -1
         end
 
+        # Removes any adjustments generated by this action from the order.
+        # @param order [Spree::Order] the order to remove the action from.
+        # @return [void]
+        def remove_from(order)
+          order.adjustments.each do |adjustment|
+            if adjustment.source == self
+              order.adjustments.destroy(adjustment)
+            end
+          end
+        end
+
         private
 
         # Tells us if there if the specified promotion is already associated with the line item

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -35,6 +35,20 @@ module Spree
           [adjustable.amount, promotion_amount].min * -1
         end
 
+        # Removes any adjustments generated by this action from the order's
+        #  line items.
+        # @param order [Spree::Order] the order to remove the action from.
+        # @return [void]
+        def remove_from(order)
+          order.line_items.each do |line_item|
+            line_item.adjustments.each do |adjustment|
+              if adjustment.source == self
+                line_item.adjustments.destroy(adjustment)
+              end
+            end
+          end
+        end
+
         private
 
         def create_adjustment(adjustable, order, promotion_code)
@@ -45,7 +59,7 @@ module Spree
             amount: amount,
             order: order,
             promotion_code: promotion_code,
-            label: "#{Spree.t(:promotion)} (#{promotion.name})"
+            label: Spree.t('adjustment_labels.line_item', promotion: Spree::Promotion.model_name.human, promotion_name: promotion.name)
           )
           true
         end

data/app/models/spree/promotion/actions/create_quantity_adjustments.rb

@@ -1,7 +1,5 @@
 module Spree::Promotion::Actions
   class CreateQuantityAdjustments < CreateItemAdjustments
-    include Spree::CalculatedAdjustments
-
     preference :group_size, :integer, default: 1
 
     has_many :line_item_actions, foreign_key: :action_id, dependent: :destroy
@@ -80,7 +78,7 @@ module Spree::Promotion::Actions
     private
 
     def actionable_line_items(order)
-      order.line_items.reload.select do |item|
+      order.line_items.select do |item|
         promotion.line_item_actionable? order, item
       end
     end
@@ -121,6 +119,10 @@ module Spree::Promotion::Actions
         @line_item.price
       end
 
+      def order
+        @line_item.order
+      end
+
       def currency
         @line_item.currency
       end

data/app/models/spree/promotion/actions/free_shipping.rb

@@ -30,6 +30,20 @@ module Spree
           shipment.cost * -1
         end
 
+        # Removes any adjustments generated by this action from the order's
+        #  shipments.
+        # @param order [Spree::Order] the order to remove the action from.
+        # @return [void]
+        def remove_from(order)
+          order.shipments.each do |shipment|
+            shipment.adjustments.each do |adjustment|
+              if adjustment.source == self
+                shipment.adjustments.destroy(adjustment)
+              end
+            end
+          end
+        end
+
         private
 
         def promotion_credit_exists?(shipment)

data/app/models/spree/promotion/rules/taxon.rb

@@ -6,12 +6,11 @@ module Spree
           dependent: :destroy
         has_many :taxons, through: :promotion_rule_taxons, class_name: 'Spree::Taxon'
 
-        MATCH_POLICIES = %w(any all)
+        MATCH_POLICIES = %w(any all none)
 
         validates_inclusion_of :preferred_match_policy, in: MATCH_POLICIES
 
         preference :match_policy, :string, default: MATCH_POLICIES.first
-
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)
         end
@@ -28,6 +27,10 @@ module Spree
             unless taxons.any?{ |taxon| order_taxons.include? taxon }
               eligibility_errors.add(:base, eligibility_error_message(:no_matching_taxons))
             end
+          when 'none'
+            unless taxons.none?{ |taxon| order_taxons.include? taxon }
+              eligibility_errors.add(:base, eligibility_error_message(:has_excluded_taxon))
+            end
           else
             # Change this to an exception in a future version of Solidus
             warn_invalid_match_policy(assume: 'any')
@@ -43,6 +46,8 @@ module Spree
           case preferred_match_policy
           when 'any', 'all'
             taxon_product_ids.include?(line_item.variant.product_id)
+          when 'none'
+            taxon_product_ids.exclude? line_item.variant.product_id
           else
             # Change this to an exception in a future version of Solidus
             warn_invalid_match_policy(assume: 'any')

data/app/models/spree/promotion/rules/user_role.rb

@@ -0,0 +1,43 @@
+module Spree
+  class Promotion
+    module Rules
+      class UserRole < PromotionRule
+        preference :role_ids, :array, default: []
+
+        MATCH_POLICIES = %w(any all)
+        preference :match_policy, default: MATCH_POLICIES.first
+
+        def applicable?(promotable)
+          promotable.is_a?(Spree::Order)
+        end
+
+        def eligible?(order, _options = {})
+          return false unless order.user
+          if all_match_policy?
+            match_all_roles?(order)
+          else
+            match_any_roles?(order)
+          end
+        end
+
+        private
+
+        def all_match_policy?
+          preferred_match_policy == 'all' && preferred_role_ids.present?
+        end
+
+        def user_roles(order)
+          order.user.spree_roles.where(id: preferred_role_ids)
+        end
+
+        def match_all_roles?(order)
+          user_roles(order).count == preferred_role_ids.count
+        end
+
+        def match_any_roles?(order)
+          user_roles(order).exists?
+        end
+      end
+    end
+  end
+end

data/app/models/spree/promotion_action.rb

@@ -6,9 +6,9 @@ module Spree
   class PromotionAction < Spree::Base
     acts_as_paranoid
 
-    belongs_to :promotion, class_name: 'Spree::Promotion'
+    belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_actions
 
-    scope :of_type, ->(t) { where(type: t) }
+    scope :of_type, ->(t) { where(type: t.to_s) }
 
     # Updates the state of the order or performs some other action depending on
     # the subclass options will contain the payload from the event that
@@ -19,5 +19,22 @@ module Spree
     def perform(_options = {})
       raise 'perform should be implemented in a sub-class of PromotionAction'
     end
+
+    # Removes the action from an order
+    #
+    # @note This method should be overriden in subclassses.
+    #
+    # @param order [Spree::Order] the order to remove the action from
+    # @return [void]
+    def remove_from(order)
+      Spree::Deprecation.warn("#{self.class.name.inspect} does not define #remove_from. The default behavior may be incorrect and will be removed in a future version of Solidus.", caller)
+      [order, *order.line_items, *order.shipments].each do |item|
+        item.adjustments.each do |adjustment|
+          if adjustment.source == self
+            item.adjustments.destroy(adjustment)
+          end
+        end
+      end
+    end
   end
 end

data/app/models/spree/promotion_handler/coupon.rb

@@ -94,10 +94,7 @@ module Spree
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        # Check for applied line items.
-        created_line_items = promotion.actions.detect { |a| a.type == 'Spree::Promotion::Actions::CreateLineItems' }
-
-        if (discount && discount.eligible) || created_line_items
+        if discount && discount.eligible
           order.update_totals
           order.persist_totals
           set_success_code :coupon_code_applied

data/app/models/spree/promotion_handler/free_shipping.rb

@@ -2,19 +2,21 @@ module Spree
   module PromotionHandler
     # Used for activating promotions with shipping rules
     class FreeShipping
-      attr_reader :order, :order_promo_ids
+      attr_reader :order
       attr_accessor :error, :success
 
       def initialize(order)
         @order = order
-        @order_promo_ids = order.promotions.pluck(:id)
       end
 
       def activate
         promotions.each do |promotion|
-          next if promotion.codes.any? && !order_promo_ids.include?(promotion.id)
-
-          if promotion.eligible?(order)
+          if order_promotion = existing_order_promotion(promotion)
+            promotion.activate(
+              order: order,
+              promotion_code: order_promotion.promotion_code,
+            )
+          elsif promotion.apply_automatically?
             promotion.activate(order: order)
           end
         end
@@ -23,20 +25,23 @@ module Spree
       private
 
       def promotions
-        promo_table = Promotion.arel_table
-        code_table  = PromotionCode.arel_table
+        Spree::Promotion.
+          active.
+          joins(:promotion_actions).
+          merge(
+            Spree::PromotionAction.of_type(
+              Spree::Promotion::Actions::FreeShipping
+            )
+          ).
+          distinct
+      end
 
-        promotion_code_join = promo_table.join(code_table, Arel::Nodes::OuterJoin).on(
-          promo_table[:id].eq(code_table[:promotion_id])
-        ).join_sources
+      def existing_order_promotion(promotion)
+        @lookup ||= order.order_promotions.map do |order_promotion|
+          [order_promotion.promotion_id, order_promotion]
+        end.to_h
 
-        Spree::Promotion.active.
-          joins(promotion_code_join).
-          where({
-            id: Spree::Promotion::Actions::FreeShipping.pluck(:promotion_id), # This would probably be more efficient by joining instead
-            spree_promotion_codes: { id: nil },
-            path: nil
-          })
+        @lookup[promotion.id]
       end
     end
   end

data/app/models/spree/promotion_rule_role.rb

@@ -0,0 +1,6 @@
+module Spree
+  class PromotionRuleRole < ActiveRecord::Base
+    belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
+    belongs_to :role, class_name: 'Spree::Role'
+  end
+end

data/app/models/spree/property.rb

@@ -1,8 +1,5 @@
 module Spree
   class Property < Spree::Base
-    has_many :property_prototypes
-    has_many :prototypes, through: :property_prototypes
-
     has_many :product_properties, dependent: :delete_all, inverse_of: :property
     has_many :products, through: :product_properties
 

data/app/models/spree/return_authorization.rb

@@ -1,4 +1,6 @@
 module Spree
+  # Models the return of Inventory Units to a Stock Location for an Order.
+  #
   class ReturnAuthorization < Spree::Base
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 

data/app/models/spree/shipment.rb

@@ -1,11 +1,13 @@
 module Spree
+  # An order's planned shipments including tracking and cost.
+  #
   class Shipment < Spree::Base
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
 
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
-    has_many :shipping_rates, -> { order(:cost) }, dependent: :delete_all
+    has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
     has_many :cartons, -> { uniq }, through: :inventory_units
@@ -280,11 +282,9 @@ module Spree
     def update_amounts
       if selected_shipping_rate
         self.cost = selected_shipping_rate.cost
-        self.adjustment_total = adjustments.additional.map(&:update!).compact.sum
         if changed?
           update_columns(
             cost: cost,
-            adjustment_total: adjustment_total,
             updated_at: Time.current
           )
         end
@@ -296,25 +296,9 @@ module Spree
       if update_attributes params
         if params.key? :selected_shipping_rate_id
           # Changing the selected Shipping Rate won't update the cost (for now)
-          # so we persist the Shipment#cost before calculating order shipment
-          # total and updating payment state (given a change in shipment cost
-          # might change the Order#payment_state)
+          # so we persist the Shipment#cost before running `order.update!`
           update_amounts
-
-          order.updater.update_shipment_total
-          order.updater.update_payment_state
-
-          # Update shipment state only after order total is updated because it
-          # (via Order#paid?) affects the shipment state (YAY)
-          update_columns(
-            state: determine_state(order),
-            updated_at: Time.current
-          )
-
-          # And then it's time to update shipment states and finally persist
-          # order changes
-          order.updater.update_shipment_state
-          order.updater.persist_totals
+          order.update!
         end
 
         true

data/app/models/spree/shipping_method.rb

@@ -1,8 +1,14 @@
 module Spree
+  # Represents a means of having a shipment delivered, such as FedEx or UPS.
+  #
   class ShippingMethod < Spree::Base
     acts_as_paranoid
     include Spree::CalculatedAdjustments
-    DISPLAY = [:both, :front_end, :back_end]
+    DISPLAY = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
+      [:both, :front_end, :back_end],
+      "Spree::ShippingMethod::DISPLAY is deprecated",
+      Spree::Deprecation
+    )
 
     has_many :shipping_method_categories, dependent: :destroy
     has_many :shipping_categories, through: :shipping_method_categories
@@ -77,10 +83,25 @@ module Spree
       tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
     end
 
+    def display_on
+      if available_to_users?
+        "both"
+      else
+        "back_end"
+      end
+    end
+    deprecate display_on: :available_to_users?, deprecator: Spree::Deprecation
+
+    def display_on=(value)
+      self.available_to_users = (value != "back_end")
+    end
+    deprecate 'display_on=': :available_to_users=, deprecator: Spree::Deprecation
+
     # Some shipping methods are only meant to be set via backend
     def frontend?
-      display_on != "back_end"
+      available_to_users?
     end
+    deprecate frontend?: :available_to_users?, deprecator: Spree::Deprecation
 
     private
 

data/app/models/spree/shipping_rate.rb

@@ -1,4 +1,7 @@
 module Spree
+  # Records the costs of different shipping methods for a shipment and which
+  # method has been selected to deliver the shipment.
+  #
   class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment'
     belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates

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

@@ -16,7 +16,7 @@ module Spree
         raise OrderRequired if package.shipment.order.nil?
 
         rates = calculate_shipping_rates(package)
-        rates.select! { |rate| rate.shipping_method.frontend? } if frontend_only
+        rates.select! { |rate| rate.shipping_method.available_to_users? } if frontend_only
         choose_default_shipping_rate(rates)
         Spree::Config.shipping_rate_sorter_class.new(rates).sort
       end

data/app/models/spree/stock_location.rb

@@ -1,4 +1,7 @@
 module Spree
+  # Records the name and addresses from which stock items are fulfilled in
+  # cartons.
+  #
   class StockLocation < Spree::Base
     class InvalidMovementError < StandardError; end