spree_core 3.2.9 → 3.3.0.rc1

data/app/models/spree/option_type.rb

@@ -13,7 +13,7 @@ module Spree
     has_many :prototypes, through: :option_type_prototypes, class_name: 'Spree::Prototype'
 
     with_options presence: true do
-      validates :name, uniqueness: { allow_blank: true }
+      validates :name, uniqueness: { case_sensitive: false, allow_blank: true }
       validates :presentation
     end
 

data/app/models/spree/option_type_prototype.rb

@@ -4,6 +4,6 @@ module Spree
     belongs_to :prototype, class_name: 'Spree::Prototype'
 
     validates :prototype, :option_type, presence: true
-    validates :prototype_id, uniqueness: { scope: :option_type_id }, allow_nil: true
+    validates :prototype_id, uniqueness: { scope: :option_type_id }
   end
 end

data/app/models/spree/option_value.rb

@@ -7,7 +7,7 @@ module Spree
     has_many :variants, through: :option_value_variants, class_name: 'Spree::Variant'
 
     with_options presence: true do
-      validates :name, uniqueness: { scope: :option_type_id, allow_blank: true }
+      validates :name, uniqueness: { scope: :option_type_id }
       validates :presentation
     end
 

data/app/models/spree/option_value_variant.rb

@@ -2,5 +2,8 @@ module Spree
   class OptionValueVariant < Spree::Base
     belongs_to :option_value, class_name: 'Spree::OptionValue'
     belongs_to :variant, class_name: 'Spree::Variant'
+
+    validates :option_value, :variant, presence: true
+    validates :option_value_id, uniqueness: { scope: :variant_id }
   end
 end

data/app/models/spree/order.rb

@@ -6,15 +6,14 @@ module Spree
     PAYMENT_STATES = %w(balance_due credit_owed failed paid void)
     SHIPMENT_STATES = %w(backorder canceled partial pending ready shipped)
 
-    extend FriendlyId
-    friendly_id :number, slug_column: :number, use: :slugged
-
     include Spree::Order::Checkout
     include Spree::Order::CurrencyUpdater
     include Spree::Order::Payments
     include Spree::Order::StoreCredit
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
+    
+    include NumberAsParam
 
     extend Spree::DisplayMoney
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
@@ -46,7 +45,7 @@ module Spree
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
-      go_to_state :payment, if: ->(order) { order.payment_required? }
+      go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
       remove_transition from: :delivery, to: :confirm
@@ -59,21 +58,23 @@ module Spree
     attr_accessor :temporary_address, :temporary_credit_card
 
     if Spree.user_class
-      belongs_to :user, class_name: Spree.user_class.to_s
-      belongs_to :created_by, class_name: Spree.user_class.to_s
-      belongs_to :approver, class_name: Spree.user_class.to_s
-      belongs_to :canceler, class_name: Spree.user_class.to_s
+      belongs_to :user, class_name: Spree.user_class.to_s, optional: true
+      belongs_to :created_by, class_name: Spree.user_class.to_s, optional: true
+      belongs_to :approver, class_name: Spree.user_class.to_s, optional: true
+      belongs_to :canceler, class_name: Spree.user_class.to_s, optional: true
     else
-      belongs_to :user
-      belongs_to :created_by
-      belongs_to :approver
-      belongs_to :canceler
+      belongs_to :user, optional: true
+      belongs_to :created_by, optional: true
+      belongs_to :approver, optional: true
+      belongs_to :canceler, optional: true
     end
 
-    belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
+    belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
+                              optional: true
     alias_attribute :billing_address, :bill_address
 
-    belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
+    belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
+                              optional: true
     alias_attribute :shipping_address, :ship_address
 
     belongs_to :store, class_name: 'Spree::Store'
@@ -87,10 +88,9 @@ module Spree
     end
     has_many :reimbursements, inverse_of: :order
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
-    has_many :shipment_adjustments, through: :shipments, source: :adjustments
     has_many :inventory_units, inverse_of: :order
-    has_many :products, through: :variants
     has_many :variants, through: :line_items
+    has_many :products, through: :variants
     has_many :refunds, through: :payments
     has_many :all_adjustments,
              class_name: 'Spree::Adjustment',
@@ -106,11 +106,12 @@ module Spree
         pluck(:state).uniq
       end
     end
+    has_many :shipment_adjustments, through: :shipments, source: :adjustments
 
     accepts_nested_attributes_for :line_items
     accepts_nested_attributes_for :bill_address
     accepts_nested_attributes_for :ship_address
-    accepts_nested_attributes_for :payments
+    accepts_nested_attributes_for :payments, reject_if: :credit_card_nil_payment?
     accepts_nested_attributes_for :shipments
 
     # Needs to happen before save_permalink is called
@@ -159,13 +160,13 @@ module Spree
     # Use this method in other gems that wish to register their own custom logic
     # that should be called after Order#update
     def self.register_update_hook(hook)
-      self.update_hooks.add(hook)
+      update_hooks.add(hook)
     end
 
     # Use this method in other gems that wish to register their own custom logic
     # that should be called when determining if two line items are equal.
     def self.register_line_item_comparison_hook(hook)
-      self.line_item_comparison_hooks.add(hook)
+      line_item_comparison_hooks.add(hook)
     end
 
     # For compatiblity with Calculator::PriceSack
@@ -241,10 +242,10 @@ module Spree
     end
 
     def clone_billing_address
-      if bill_address and self.ship_address.nil?
+      if bill_address && ship_address.nil?
         self.ship_address = bill_address.clone
       else
-        self.ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
+        ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
       end
       true
     end
@@ -255,7 +256,7 @@ module Spree
     end
 
     def all_inventory_units_returned?
-      inventory_units.all? { |inventory_unit| inventory_unit.returned? }
+      inventory_units.all?(&:returned?)
     end
 
     def contents
@@ -267,8 +268,8 @@ module Spree
       self.user           = user
       self.email          = user.email if override_email
       self.created_by   ||= user
-      self.bill_address ||= user.bill_address.try(:clone)
-      self.ship_address ||= user.ship_address.try(:clone)
+      self.bill_address ||= user.bill_address
+      self.ship_address ||= user.ship_address
 
       changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
 
@@ -283,10 +284,10 @@ module Spree
     end
 
     def find_line_item_by_variant(variant, options = {})
-      line_items.detect { |line_item|
-                    line_item.variant_id == variant.id &&
-                    line_item_options_match(line_item, options)
-                  }
+      line_items.detect do |line_item|
+        line_item.variant_id == variant.id &&
+          line_item_options_match(line_item, options)
+      end
     end
 
     # This method enables extensions to participate in the
@@ -301,9 +302,9 @@ module Spree
     def line_item_options_match(line_item, options)
       return true unless options
 
-      self.line_item_comparison_hooks.all? { |hook|
-        self.send(hook, line_item, options)
-      }
+      line_item_comparison_hooks.all? do |hook|
+        send(hook, line_item, options)
+      end
     end
 
     # Creates new tax charges if there are any applicable rates. If prices already
@@ -323,17 +324,20 @@ module Spree
     def outstanding_balance
       if canceled?
         -1 * payment_total
-      elsif refunds.exists?
-        # If refund has happened add it back to total to prevent balance_due payment state
-        # See: https://github.com/spree/spree/issues/6229 & https://github.com/spree/spree/issues/8136
-        total - (payment_total + refunds.sum(:amount))
+      elsif !reimbursements.includes(:refunds).empty?
+        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
+          sum + reimbursement.refunds.sum(:amount)
+        end
+        # If reimbursement has happened add it back to total to prevent balance_due payment state
+        # See: https://github.com/spree/spree/issues/6229
+        total - (payment_total + reimbursed)
       else
         total - payment_total
       end
     end
 
     def outstanding_balance?
-      self.outstanding_balance != 0
+      outstanding_balance != 0
     end
 
     def name
@@ -343,7 +347,7 @@ module Spree
     end
 
     def can_ship?
-      self.complete? || self.resumed? || self.awaiting_return? || self.returned?
+      complete? || resumed? || awaiting_return? || returned?
     end
 
     def credit_cards
@@ -360,7 +364,7 @@ module Spree
     # Called after transition to complete state when payments will have been processed
     def finalize!
       # lock all adjustments (coupon promotions, etc.)
-      all_adjustments.each{|a| a.close}
+      all_adjustments.each(&:close)
 
       # update payment and shipment(s) states, and save
       updater.update_payment_state
@@ -408,7 +412,7 @@ module Spree
     # Check to see if any line item variants are discontinued.
     # If so add error and restart checkout.
     def ensure_line_item_variants_are_not_discontinued
-      if line_items.any?{ |li| !li.variant || li.variant.discontinued? }
+      if line_items.any? { |li| !li.variant || li.variant.discontinued? }
         restart_checkout_flow
         errors.add(:base, Spree.t(:discontinued_variants_present))
         false
@@ -452,21 +456,25 @@ module Spree
     def state_changed(name)
       state = "#{name}_state"
       if persisted?
-        old_state = self.send("#{state}_was")
-        new_state = self.send(state)
+        old_state = send("#{state}_was")
+        new_state = send(state)
         unless old_state == new_state
-          self.state_changes.create(
+          state_changes.create(
             previous_state: old_state,
             next_state:     new_state,
             name:           name,
-            user_id:        self.user_id
+            user_id:        user_id
           )
         end
       end
     end
 
     def coupon_code=(code)
-      @coupon_code = code.strip.downcase rescue nil
+      @coupon_code = begin
+                       code.strip.downcase
+                     rescue
+                       nil
+                     end
     end
 
     def can_add_coupon?
@@ -479,7 +487,12 @@ module Spree
 
     def create_proposed_shipments
       all_adjustments.shipping.delete_all
-      shipments.destroy_all
+
+      shipment_ids = shipments.map(&:id)
+      StateChange.where(stateful_type: "Spree::Shipment", stateful_id: shipment_ids).delete_all
+      ShippingRate.where(shipment_id: shipment_ids).delete_all
+
+      shipments.delete_all
 
       # Inventory Units which are not associated to any shipment (unshippable)
       # and are not returned or shipped should be deleted
@@ -501,19 +514,19 @@ module Spree
     # to delivery again so that proper updated shipments are created.
     # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
-      if shipments.any? && !self.completed?
-        self.shipments.destroy_all
-        self.update_column(:shipment_total, 0)
+      if shipments.any? && !completed?
+        shipments.destroy_all
+        update_column(:shipment_total, 0)
         restart_checkout_flow
       end
     end
 
     def restart_checkout_flow
-      self.update_columns(
+      update_columns(
         state: 'cart',
         updated_at: Time.current,
       )
-      self.next! if self.line_items.size > 0
+      next! if !line_items.empty?
     end
 
     def refresh_shipment_rates(shipping_method_filter = ShippingMethod::DISPLAY_ON_FRONT_END)
@@ -531,13 +544,13 @@ module Spree
     end
 
     def is_risky?
-      payments.risky.size > 0
+      !payments.risky.empty?
     end
 
     def canceled_by(user)
-      self.transaction do
+      transaction do
         cancel!
-        self.update_columns(
+        update_columns(
           canceler_id: user.id,
           canceled_at: Time.current,
         )
@@ -545,9 +558,9 @@ module Spree
     end
 
     def approved_by(user)
-      self.transaction do
+      transaction do
         approve!
-        self.update_columns(
+        update_columns(
           approver_id: user.id,
           approved_at: Time.current,
         )
@@ -555,7 +568,7 @@ module Spree
     end
 
     def approved?
-      !!self.approved_at
+      !!approved_at
     end
 
     def can_approve?
@@ -576,7 +589,7 @@ module Spree
       update_column(:considered_risky, false)
     end
 
-    def reload(options=nil)
+    def reload(options = nil)
       remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
       super
     end
@@ -604,36 +617,20 @@ module Spree
     end
     alias_method :fully_discounted, :fully_discounted?
 
-    def payments_attributes=(attributes)
-      validate_payments_attributes(attributes)
-      super(attributes)
-    end
-
-    def validate_payments_attributes(attributes)
-      # Ensure the payment methods specified are allowed for this user
-      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods.map(&:id))
-      attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id]
-
-        # raise RecordNotFound unless it is an allowed payment method
-        payment_methods.find(payment_method_id) if payment_method_id
-      end
-    end
-
     private
 
     def link_by_email
-      self.email = user.email if self.user
+      self.email = user.email if user
     end
 
     # Determine if email is required (we don't want validation errors before we hit the checkout)
     def require_email
-      true unless new_record? or ['cart', 'address'].include?(state)
+      true unless new_record? || ['cart', 'address'].include?(state)
     end
 
     def ensure_line_items_present
       unless line_items.present?
-        errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) and return false
+        errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) && (return false)
       end
     end
 
@@ -642,19 +639,19 @@ module Spree
         # After this point, order redirects back to 'address' state and asks user to pick a proper address
         # Therefore, shipments are not necessary at this point.
         shipments.destroy_all
-        errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
+        errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
       end
     end
 
     def after_cancel
-      shipments.each { |shipment| shipment.cancel! }
-      payments.completed.each { |payment| payment.cancel! }
+      shipments.each(&:cancel!)
+      payments.completed.each(&:cancel!)
 
       # Free up authorized store credits
       payments.store_credits.pending.each(&:void!)
 
       send_cancel_email
-      self.update_with_updater!
+      update_with_updater!
     end
 
     def send_cancel_email
@@ -662,7 +659,7 @@ module Spree
     end
 
     def after_resume
-      shipments.each { |shipment| shipment.resume! }
+      shipments.each(&:resume!)
       consider_risk
     end
 
@@ -681,5 +678,9 @@ module Spree
     def collect_payment_methods
       PaymentMethod.available_on_front_end.select { |pm| pm.available_for_order?(self) }
     end
+
+    def credit_card_nil_payment?(attributes)
+      payments.store_credits.present? && attributes[:amount].to_f.zero?
+    end
   end
 end

data/app/models/spree/order/checkout.rb

@@ -15,12 +15,9 @@ module Spree
           self.removed_transitions ||= []
 
           def self.checkout_flow(&block)
-            if block_given?
-              @checkout_flow = block
-              define_state_machine!
-            else
-              @checkout_flow
-            end
+            return @checkout_flow unless block_given?
+            @checkout_flow = block
+            define_state_machine!
           end
 
           def self.define_state_machine!
@@ -46,7 +43,6 @@ module Spree
 
               # Persist the state on the order
               after_transition do |order, transition|
-                order.state = order.state
                 order.state_changes.create(
                   previous_state: transition.from,
                   next_state: transition.to,
@@ -62,7 +58,7 @@ module Spree
 
               event :return do
                 transition to: :returned,
-                           from: [:complete, :awaiting_return, :canceled, :returned, :resumed],
+                           from: [:complete, :awaiting_return, :canceled, :resumed],
                            if: :all_inventory_units_returned?
               end
 
@@ -125,14 +121,9 @@ module Spree
 
           def self.go_to_state(name, options = {})
             self.checkout_steps[name] = options
-            previous_states.each do |state|
-              add_transition({ from: state, to: name }.merge(options))
-            end
-            if options[:if]
-              previous_states << name
-            else
-              self.previous_states = [name]
-            end
+            self.previous_states.each { |state| add_transition({ from: state, to: name }.merge(options)) }
+            return self.previous_states << name if options[:if]
+            self.previous_states = [name]
           end
 
           def self.insert_checkout_step(name, options = {})
@@ -226,7 +217,11 @@ module Spree
               # rails would slice parameters containg ruby objects, apparently
               existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
 
-              attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? } : {}
+              attributes = if @updating_params[:order]
+                             @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? }
+                           else
+                             {}
+                           end
 
               if existing_card_id.present?
                 credit_card = CreditCard.find existing_card_id
@@ -263,34 +258,29 @@ module Spree
           end
 
           def clone_billing
-            if !bill_address_id && user.bill_address.try(:valid?)
-              self.bill_address = user.bill_address.try(:clone)
-            end
+            return unless !bill_address_id && user.bill_address.try(:valid?)
+            self.bill_address = user.bill_address.try(:clone)
           end
 
           def clone_shipping
-            if !ship_address_id && user.ship_address.try(:valid?)
-              self.ship_address = user.ship_address.try(:clone)
-            end
+            return unless !ship_address_id && user.ship_address.try(:valid?)
+            self.ship_address = user.ship_address.try(:clone)
           end
 
           def persist_user_address!
-            if !temporary_address && user && user.respond_to?(:persist_order_address) && bill_address_id
-              user.persist_order_address(self)
-            end
+            return unless !temporary_address && user && user.respond_to?(:persist_order_address) && bill_address_id
+            user.persist_order_address(self)
           end
 
           def persist_user_credit_card
-            if !temporary_credit_card && user_id && valid_credit_cards.present?
-              valid_credit_cards.first.update(user_id: user_id, default: true)
-            end
+            return unless !temporary_credit_card && user_id && valid_credit_cards.present?
+            valid_credit_cards.first.update(user_id: user_id, default: true)
           end
 
           def assign_default_credit_card
-            if payments.from_credit_card.size == 0 && user_has_valid_default_card? && payment_required?
-              cc = user.default_credit_card
-              payments.create!(payment_method_id: cc.payment_method_id, source: cc, amount: total)
-            end
+            return unless payments.from_credit_card.size.empty? && user_has_valid_default_card? && payment_required?
+            cc = user.default_credit_card
+            payments.create!(payment_method_id: cc.payment_method_id, source: cc, amount: total)
           end
 
           def user_has_valid_default_card?