solidus_core 2.0.0.beta1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db4e0e9709867fb934de7f6250cf594afbc087c6
-  data.tar.gz: 13f9c0f6043e15d1411234d0a341b80242ba58fb
+  metadata.gz: fbdfb658bce9038100b17820c195754a991baaa5
+  data.tar.gz: 08313688df1befda337af2e52baab5149c510940
 SHA512:
-  metadata.gz: d1b74e57ddb5daa0c9066ee20766af6bfc5d825fefb21f52c007eb79484599c6590e0acfb445de074b91c7e3de419ad26b4593937842f7601237cad14379426d
-  data.tar.gz: 6fe815393c2fbee2d930fc52157e1679c2e8b4b228f3d99ea13a5b54d67161cb4e8aa7affbc1ee0a55e39bdae8be67fe0949c4df9514210d6c8c1eeb45069af7
+  metadata.gz: f76f20c1fc3ca55a230b8cee008b4a6ffd1c228b07dcb9cc2ab317bd53d995a8a6cb262c39ef54db1bc2e587b68b3ba9b223cbf81a7eb951ecc7a5a89b5b7a7c
+  data.tar.gz: 6233bcf5c299863d50f6e9f983b6b928af5cd596368a0c86ad956b62f0acc8583a54e61a806891954c91d736499d5799d79721b956ed6e051b78e340a39cefca

data/app/models/spree/adjustment.rb

@@ -26,6 +26,11 @@ module Spree
     validates :amount, numericality: true
     validates :promotion_code, presence: true, if: :require_promotion_code?
 
+    # We need to use `after_commit` here because otherwise it's too early to
+    # tell if any repair is needed.
+    after_commit :repair_adjustments_associations_on_create, on: [:create]
+    after_commit :repair_adjustments_associations_on_destroy, on: [:destroy]
+
     scope :not_finalized, -> { where(finalized: false) }
     scope :open, -> do
       Spree::Deprecation.warn "Adjustment.open is deprecated. Instead use Adjustment.not_finalized", caller
@@ -177,5 +182,19 @@ module Spree
     def require_promotion_code?
       promotion? && source.promotion.codes.any?
     end
+
+    def repair_adjustments_associations_on_create
+      if adjustable.adjustments.loaded? && !adjustable.adjustments.include?(self)
+        Spree::Deprecation.warn("Adjustment was not added to #{adjustable.class}. Add adjustments via `adjustable.adjustments.create!`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
+        adjustable.adjustments.proxy_association.add_to_target(self)
+      end
+    end
+
+    def repair_adjustments_associations_on_destroy
+      if adjustable.adjustments.loaded? && adjustable.adjustments.include?(self)
+        Spree::Deprecation.warn("Adjustment was not removed from #{adjustable.class}. Remove adjustments via `adjustable.adjustments.destroy`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
+        adjustable.adjustments.proxy_association.target.delete(self)
+      end
+    end
   end
 end

data/app/models/spree/item_adjustments.rb

@@ -83,11 +83,7 @@ module Spree
     private
 
     def adjustments
-      # This is done intentionally to avoid loading the association. If the
-      # association is loaded, the records may become stale due to code
-      # elsewhere in spree. When that is remedied, this should be changed to
-      # just item.adjustments
-      @adjustments ||= item.adjustments.all.to_a
+      @adjustments ||= item.adjustments.to_a
     end
   end
 end

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

@@ -43,10 +43,6 @@ module Spree
           break if payment_total >= total
 
           payment.public_send(method)
-
-          if payment.completed?
-            self.payment_total += payment.amount
-          end
         end
       rescue Core::GatewayError => e
         result = !!Spree::Config[:allow_checkout_on_gateway_error]

data/app/models/spree/order.rb

@@ -47,7 +47,7 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
     has_many :state_changes, as: :stateful
     has_many :line_items, -> { order(:created_at, :id) }, dependent: :destroy, inverse_of: :order
-    has_many :payments, dependent: :destroy
+    has_many :payments, dependent: :destroy, inverse_of: :order
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
     has_many :reimbursements, inverse_of: :order
     has_many :adjustments, -> { order(:created_at) }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
@@ -503,7 +503,6 @@ module Spree
       elsif shipments.any? { |s| !s.pending? }
         raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_shipments_not_pending))
       else
-        adjustments.shipping.destroy_all
         shipments.destroy_all
         self.shipments = Spree::Config.stock.coordinator_class.new(self).shipments
       end
@@ -511,9 +510,7 @@ module Spree
 
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
-      shipments.each { |shipment| ItemAdjustments.new(shipment).update }
-      updater.update_shipment_total
-      persist_totals
+      update!
     end
 
     # Clean shipments and make order back to address state

data/app/models/spree/order_capturing.rb

@@ -21,22 +21,15 @@ class Spree::OrderCapturing
     Spree::OrderMutex.with_lock!(@order) do
       uncaptured_amount = @order.display_total.cents
 
-      begin
-        sorted_payments(@order).each do |payment|
-          amount = [uncaptured_amount, payment.money.cents].min
-
-          if amount > 0
-            payment.capture!(amount)
-            uncaptured_amount -= amount
-          elsif Spree::OrderCapturing.void_unused_payments
-            payment.void_transaction!
-          end
+      sorted_payments(@order).each do |payment|
+        amount = [uncaptured_amount, payment.money.cents].min
+
+        if amount > 0
+          payment.capture!(amount)
+          uncaptured_amount -= amount
+        elsif Spree::OrderCapturing.void_unused_payments
+          payment.void_transaction!
         end
-      ensure
-        # FIXME: Adding the inverse_of on the payments relation for orders -should- fix this,
-        # however it only appears to make it worse (calling with changes three times instead of once.
-        # Warrants an investigation. Reloading for now.
-        @order.reload.update!
       end
     end
   end

data/app/models/spree/order_contents.rb

@@ -119,7 +119,6 @@ module Spree
       shipment = options[:shipment]
       shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
-      ItemAdjustments.new(line_item).update
       reload_totals
       line_item
     end

data/app/models/spree/order_updater.rb

@@ -80,11 +80,11 @@ module Spree
 
       all_items = line_items + shipments
 
-      order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.eligible.sum(:amount)
+      order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.select(&:eligible?).sum(&:amount)
       order.included_tax_total = all_items.sum(&:included_tax_total)
       order.additional_tax_total = all_items.sum(&:additional_tax_total)
 
-      order.promo_total = all_items.sum(&:promo_total) + adjustments.promotion.eligible.sum(:amount)
+      order.promo_total = all_items.sum(&:promo_total) + adjustments.select(&:eligible?).select(&:promotion?).sum(&:amount)
 
       update_order_total
     end

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

@@ -22,10 +22,9 @@ module Spree
           return if promotion_credit_exists?(order)
 
           amount = compute_amount(order)
-          Spree::Adjustment.create!(
+          order.adjustments.create!(
             amount: amount,
             order: order,
-            adjustable: order,
             source: self,
             promotion_code: options[:promotion_code],
             label: "#{Spree.t(:promotion)} (#{promotion.name})"

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

@@ -40,9 +40,9 @@ module Spree
         def create_adjustment(adjustable, order, promotion_code)
           amount = compute_amount(adjustable)
           return if amount == 0
-          adjustments.create!(
+          adjustable.adjustments.create!(
+            source: self,
             amount: amount,
-            adjustable: adjustable,
             order: order,
             promotion_code: promotion_code,
             label: "#{Spree.t(:promotion)} (#{promotion.name})"

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

@@ -15,7 +15,6 @@ module Spree
         @rates_for_order_zone = options[:rates_for_order_zone]
         @rates_for_default_zone = options[:rates_for_default_zone]
         @order_tax_zone = options[:order_tax_zone]
-        @skip_destroy_adjustments = options[:skip_destroy_adjustments]
       end
 
       # Deletes all existing tax adjustments and creates new adjustments for all
@@ -27,8 +26,8 @@ module Spree
       # @return [Array<Spree::Adjustment>] newly created adjustments
       def adjust!
         return unless order_tax_zone(order)
-        # Using .destroy_all to make sure callbacks fire
-        item.adjustments.tax.destroy_all unless @skip_destroy_adjustments
+
+        item.adjustments.destroy(item.adjustments.select(&:tax?))
 
         rates_for_item(item).map { |rate| rate.adjust(order_tax_zone(order), item) }
       end

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

@@ -16,8 +16,6 @@ module Spree
       def adjust!
         return unless order_tax_zone(order)
 
-        order.all_adjustments.tax.destroy_all
-
         (order.line_items + order.shipments).each do |item|
           ItemAdjuster.new(item, order_wide_options).adjust!
         end
@@ -30,7 +28,6 @@ module Spree
           rates_for_order_zone: rates_for_order_zone(order),
           rates_for_default_zone: rates_for_default_zone,
           order_tax_zone: order_tax_zone(order),
-          skip_destroy_adjustments: true
         }
       end
     end

data/app/models/spree/tax_rate.rb

@@ -85,13 +85,13 @@ module Spree
 
       included = included_in_price && amount > 0
 
-      adjustments.create!({
-        adjustable: item,
+      item.adjustments.create!(
+        source: self,
         amount: amount,
         order_id: item.order_id,
         label: adjustment_label(amount),
         included: included
-      })
+      )
     end
 
     # This method is used by Adjustment#update to recalculate the cost.

data/app/models/spree/unit_cancel.rb

@@ -16,8 +16,8 @@ class Spree::UnitCancel < Spree::Base
 
     amount = compute_amount(inventory_unit.line_item)
 
-    create_adjustment!(
-      adjustable: inventory_unit.line_item,
+    self.adjustment = inventory_unit.line_item.adjustments.create!(
+      source: self,
       amount: amount,
       order: inventory_unit.order,
       label: "#{Spree.t(:cancellation)} - #{reason}",

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "2.0.0.beta1"
+    "2.0.0.rc1"
   end
 
   def self.solidus_gem_version

data/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -12,22 +12,27 @@ FactoryGirl.define do
     label 'Shipping'
     association(:source, factory: :tax_rate)
     eligible true
-  end
 
-  factory :tax_adjustment, class: Spree::Adjustment do
-    order { adjustable.order }
-    association(:adjustable, factory: :line_item)
-    amount 10.0
-    label 'VAT 5%'
-    association(:source, factory: :tax_rate)
-    eligible true
+    after(:build) do |adjustment|
+      adjustments = adjustment.adjustable.adjustments
+      if adjustments.loaded? && !adjustments.include?(adjustment)
+        adjustments.proxy_association.add_to_target(adjustment)
+      end
+    end
+
+    factory :tax_adjustment, class: Spree::Adjustment do
+      order { adjustable.order }
+      association(:adjustable, factory: :line_item)
+      amount 10.0
+      label 'VAT 5%'
 
-    after(:create) do |adjustment|
-      # Set correct tax category, so that adjustment amount is not 0
-      if adjustment.adjustable.is_a?(Spree::LineItem)
-        adjustment.source.tax_category = adjustment.adjustable.tax_category
-        adjustment.source.save
-        adjustment.update!
+      after(:create) do |adjustment|
+        # Set correct tax category, so that adjustment amount is not 0
+        if adjustment.adjustable.is_a?(Spree::LineItem)
+          adjustment.source.tax_category = adjustment.adjustable.tax_category
+          adjustment.source.save
+          adjustment.update!
+        end
       end
     end
   end

data/spec/lib/tasks/order_capturing_spec.rb

@@ -18,7 +18,7 @@ describe "order_capturing:capture_payments" do
 
   context "with a mix of canceled and shipped inventory" do
     before do
-      Spree::OrderCancellations.new(order).short_ship([order.inventory_units.first])
+      Spree::OrderCancellations.new(order).short_ship([order.line_items.first.inventory_units.first])
       order.shipping.ship_shipment(order.shipments.first)
       order.update_attributes!(payment_state: 'balance_due')
     end

data/spec/models/spree/item_adjustments_spec.rb

@@ -272,6 +272,9 @@ module Spree
     context "multiple updates" do
       let(:adjustment) { create(:tax_adjustment, amount: -10) }
       let(:item) { adjustment.adjustable }
+      # we need to get this from the line item so that we're modifying the same
+      # tax rate that is cached by line_item.adjustments
+      let(:source) { item.adjustments.to_a.first.source }
 
       def update
         described_class.new(item).update
@@ -283,18 +286,17 @@ module Spree
       end
 
       it "persists each change" do
-        adjustment.source.update_attributes!(amount: 0.1)
+        source.update_attributes!(amount: 0.1)
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 1)
 
-        adjustment.source.update_attributes!(amount: 0.20)
-        item.reload
+        source.update_attributes!(amount: 0.20)
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 2)
 
-        adjustment.source.update_attributes!(amount: 0.10)
+        source.update_attributes!(amount: 0.10)
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 1)

data/spec/models/spree/order/payment_spec.rb

@@ -6,49 +6,53 @@ module Spree
     let(:updater) { Spree::OrderUpdater.new(order) }
 
     context "processing payments" do
+      let(:order) { create(:order_with_line_items, shipment_cost: 0, line_items_price: 100) }
       before do
         # So that Payment#purchase! is called during processing
         Spree::Config[:auto_capture] = true
-
-        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
-        allow(order).to receive_messages total: 100
       end
 
       it 'processes all checkout payments' do
-        payment_1 = create(:payment, amount: 50)
-        payment_2 = create(:payment, amount: 50)
-        allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2])
+        payment_1 = create(:payment, order: order, amount: 50)
+        payment_2 = create(:payment, order: order, amount: 50)
 
         order.process_payments!
         updater.update_payment_state
+
         expect(order.payment_state).to eq('paid')
+        expect(order.payment_total).to eq(100)
 
-        expect(payment_1).to be_completed
-        expect(payment_2).to be_completed
+        expect(payment_1.reload).to be_completed
+        expect(payment_2.reload).to be_completed
       end
 
       it 'does not go over total for order' do
-        payment_1 = create(:payment, amount: 50)
-        payment_2 = create(:payment, amount: 50)
-        payment_3 = create(:payment, amount: 50)
-        allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2, payment_3])
+        payment_1 = create(:payment, order: order, amount: 50)
+        payment_2 = create(:payment, order: order, amount: 50)
+        payment_3 = create(:payment, order: order, amount: 50)
 
         order.process_payments!
         updater.update_payment_state
+
         expect(order.payment_state).to eq('paid')
+        expect(order.payment_total).to eq(100)
 
-        expect(payment_1).to be_completed
-        expect(payment_2).to be_completed
-        expect(payment_3).to be_checkout
+        expect(payment_1.reload).to be_completed
+        expect(payment_2.reload).to be_completed
+        expect(payment_3.reload).to be_checkout
       end
 
       it "does not use failed payments" do
-        payment_1 = create(:payment, amount: 50)
-        payment_2 = create(:payment, amount: 50, state: 'failed')
+        create(:payment, order: order, amount: 50)
+        create(:payment, order: order, amount: 50, state: 'failed')
+        order.payments.reload
 
-        expect(payment_2).not_to receive(:process!)
+        expect(order.payments[0]).to receive(:process!).and_call_original
+        expect(order.payments[1]).not_to receive(:process!)
 
         order.process_payments!
+
+        expect(order.payment_total).to eq(50)
       end
     end
 

data/spec/models/spree/order_cancellations_spec.rb

@@ -139,9 +139,9 @@ describe Spree::OrderCancellations do
         order.contents.add(line_item.variant)
 
         # make the total $1.67 so it divides unevenly
-        Spree::Adjustment.tax.create!(
+        line_item.adjustments.create!(
+          source_type: 'Spree::TaxRate',
           order: order,
-          adjustable: line_item,
           amount: 0.01,
           label: 'some fake tax',
           finalized: true

data/spec/models/spree/order_capturing_spec.rb

@@ -4,8 +4,8 @@ describe Spree::OrderCapturing do
   describe '#capture_payments' do
     subject { Spree::OrderCapturing.new(order, payment_methods).capture_payments }
 
-    # Regression for the order.update! in the ensure block.
-    # See the comment there.
+    # Regression for https://github.com/solidusio/solidus/pull/407
+    # See also https://github.com/solidusio/solidus/pull/1406
     context "updating the order" do
       let(:order) { create :completed_order_with_totals }
       let(:payment_methods) { [] }

data/spec/models/spree/order_spec.rb

@@ -591,16 +591,12 @@ describe Spree::Order, type: :model do
 
   context "#apply_free_shipping_promotions" do
     it "calls out to the FreeShipping promotion handler" do
-      shipment = double('Shipment')
-      allow(order).to receive_messages shipments: [shipment]
-      expect(Spree::PromotionHandler::FreeShipping).to receive(:new).and_return(handler = double)
-      expect(handler).to receive(:activate)
+      expect_any_instance_of(Spree::PromotionHandler::FreeShipping).to(
+        receive(:activate)
+      ).and_call_original
 
-      expect(Spree::ItemAdjustments).to receive(:new).with(shipment).and_return(adjuster = double)
-      expect(adjuster).to receive(:update)
+      expect(order.updater).to receive(:update).and_call_original
 
-      expect(order.updater).to receive(:update_shipment_total)
-      expect(order.updater).to receive(:persist_totals)
       order.apply_free_shipping_promotions
     end
   end

data/spec/models/spree/tax/item_adjuster_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Spree::Tax::ItemAdjuster do
   subject(:adjuster) { described_class.new(item) }
-  let(:order) { Spree::Order.new }
+  let(:order) { create(:order) }
   let(:item) { Spree::LineItem.new(order: order) }
 
   before do
@@ -64,7 +64,6 @@ RSpec.describe Spree::Tax::ItemAdjuster do
           before { allow(item).to receive(:tax_category).and_return(item_tax_category) }
 
           it 'creates an adjustment for every matching rate' do
-            expect(rate_1).to receive_message_chain(:adjustments, :create!)
             expect(adjuster.adjust!.length).to eq(1)
           end
         end

data/spec/models/spree/tax/order_adjuster_spec.rb

@@ -31,7 +31,6 @@ RSpec.describe Spree::Tax::OrderAdjuster do
                                               rates_for_order_zone: rates_for_order_zone,
                                               rates_for_default_zone: [],
                                               order_tax_zone: zone,
-                                              skip_destroy_adjustments: true
                                             ).and_return(item_adjuster)
       expect(Spree::Tax::ItemAdjuster).to receive(:new).
                                             with(
@@ -39,7 +38,6 @@ RSpec.describe Spree::Tax::OrderAdjuster do
                                               rates_for_order_zone: rates_for_order_zone,
                                               rates_for_default_zone: [],
                                               order_tax_zone: zone,
-                                              skip_destroy_adjustments: true
                                             ).and_return(item_adjuster)
 
       expect(item_adjuster).to receive(:adjust!).twice

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant