solidus_core 2.2.2 → 2.3.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -188,42 +188,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre
-- !ruby/object:Gem::Dependency
-  name: premailer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +373,7 @@ files:
 - app/models/spree/billing_integration.rb
 - app/models/spree/calculator.rb
 - app/models/spree/calculator/default_tax.rb
+- app/models/spree/calculator/distributed_amount.rb
 - app/models/spree/calculator/flat_percent_item_total.rb
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
@@ -407,6 +394,7 @@ files:
 - app/models/spree/country.rb
 - app/models/spree/credit_card.rb
 - app/models/spree/customer_return.rb
+- app/models/spree/distributed_amounts_handler.rb
 - app/models/spree/exchange.rb
 - app/models/spree/gateway.rb
 - app/models/spree/gateway/bogus.rb
@@ -422,6 +410,7 @@ files:
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order.rb
 - app/models/spree/order/checkout.rb
+- app/models/spree/order/number_generator.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order_cancellations.rb
 - app/models/spree/order_capturing.rb
@@ -432,6 +421,7 @@ files:
 - app/models/spree/order_promotion.rb
 - app/models/spree/order_shipping.rb
 - app/models/spree/order_stock_location.rb
+- app/models/spree/order_taxation.rb
 - app/models/spree/order_update_attributes.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
@@ -439,7 +429,10 @@ files:
 - app/models/spree/payment_capture_event.rb
 - app/models/spree/payment_create.rb
 - app/models/spree/payment_method.rb
+- app/models/spree/payment_method/bogus_credit_card.rb
 - app/models/spree/payment_method/check.rb
+- app/models/spree/payment_method/credit_card.rb
+- app/models/spree/payment_method/simple_bogus_credit_card.rb
 - app/models/spree/payment_method/store_credit.rb
 - app/models/spree/payment_source.rb
 - app/models/spree/preference.rb
@@ -557,13 +550,19 @@ files:
 - app/models/spree/store_credit_type.rb
 - app/models/spree/store_credit_update_reason.rb
 - app/models/spree/store_payment_method.rb
-- app/models/spree/tax/item_adjuster.rb
+- app/models/spree/store_selector/by_server_name.rb
+- app/models/spree/store_selector/legacy.rb
+- app/models/spree/tax/item_tax.rb
 - app/models/spree/tax/order_adjuster.rb
+- app/models/spree/tax/order_tax.rb
 - app/models/spree/tax/shipping_rate_taxer.rb
 - app/models/spree/tax/tax_helpers.rb
 - app/models/spree/tax/tax_location.rb
+- app/models/spree/tax_calculator/default.rb
+- app/models/spree/tax_calculator/shipping_rate.rb
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
+- app/models/spree/tax_rate_tax_category.rb
 - app/models/spree/taxon.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/transfer_item.rb
@@ -587,11 +586,13 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/views/layouts/spree/base_mailer.html.erb
+- app/views/spree/carton_mailer/shipped_email.html.erb
 - app/views/spree/carton_mailer/shipped_email.text.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
+- app/views/spree/order_mailer/inventory_cancellation_email.html.erb
 - app/views/spree/order_mailer/inventory_cancellation_email.text.erb
 - app/views/spree/promotion_code_batch_mailer/promotion_code_batch_errored.text.erb
 - app/views/spree/promotion_code_batch_mailer/promotion_code_batch_finished.text.erb
@@ -600,16 +601,18 @@ files:
 - app/views/spree/shared/_base_mailer_footer.html.erb
 - app/views/spree/shared/_base_mailer_header.html.erb
 - app/views/spree/shared/_error_messages.html.erb
-- app/views/spree/shipment_mailer/shipped_email.html.erb
 - app/views/spree/test_mailer/test_email.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/locales/en.yml
 - db/default/spree/countries.rb
+- db/default/spree/refund_reasons.rb
 - db/default/spree/return_reasons.rb
 - db/default/spree/roles.rb
+- db/default/spree/shipping_categories.rb
 - db/default/spree/states.rb
+- db/default/spree/stock_locations.rb
 - db/default/spree/store_credit.rb
 - db/default/spree/stores.rb
 - db/default/spree/zones.rb
@@ -918,6 +921,10 @@ files:
 - db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb
 - db/migrate/20161129035810_add_index_to_spree_payments_number.rb
 - db/migrate/20170223235001_remove_spree_store_credits_column.rb
+- db/migrate/20170412103617_transform_tax_rate_category_relation.rb
+- db/migrate/20170422134804_add_roles_unique_constraints.rb
+- db/migrate/20170522143442_add_time_range_to_tax_rate.rb
+- db/migrate/20170608074534_rename_bogus_gateways.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -931,11 +938,12 @@ files:
 - lib/generators/spree/dummy/templates/rails/script/rails
 - lib/generators/spree/dummy/templates/rails/test.rb
 - lib/generators/spree/install/install_generator.rb
-- lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/install/templates/config/initializers/solidus.rb
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
+- lib/solidus/migrations/rename_gateways.rb
 - lib/solidus_core.rb
 - lib/spree/core.rb
 - lib/spree/core/class_constantizer.rb
@@ -1085,6 +1093,7 @@ files:
 - lib/tasks/migrations/create_vat_prices.rake
 - lib/tasks/migrations/migrate_shipping_rate_taxes.rake
 - lib/tasks/migrations/migrate_user_addresses.rake
+- lib/tasks/migrations/rename_gateways.rake
 - lib/tasks/order_capturing.rake
 - lib/tasks/upgrade.rake
 - script/rails
@@ -1199,6 +1208,7 @@ files:
 - spec/models/spree/app_configuration_spec.rb
 - spec/models/spree/asset_spec.rb
 - spec/models/spree/calculator/default_tax_spec.rb
+- spec/models/spree/calculator/distributed_amount_spec.rb
 - spec/models/spree/calculator/flat_percent_item_total_spec.rb
 - spec/models/spree/calculator/flat_rate_spec.rb
 - spec/models/spree/calculator/flexi_rate_spec.rb
@@ -1224,10 +1234,12 @@ files:
 - spec/models/spree/country_spec.rb
 - spec/models/spree/credit_card_spec.rb
 - spec/models/spree/customer_return_spec.rb
+- spec/models/spree/distributed_amounts_handler_spec.rb
 - spec/models/spree/exchange_spec.rb
 - spec/models/spree/gateway/bogus_simple.rb
 - spec/models/spree/gateway/bogus_spec.rb
 - spec/models/spree/gateway_spec.rb
+- spec/models/spree/image_spec.rb
 - spec/models/spree/inventory_unit_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/option_type_spec.rb
@@ -1237,6 +1249,8 @@ files:
 - spec/models/spree/order/callbacks_spec.rb
 - spec/models/spree/order/checkout_spec.rb
 - spec/models/spree/order/finalizing_spec.rb
+- spec/models/spree/order/number_generator_spec.rb
+- spec/models/spree/order/outstanding_balance_integration_spec.rb
 - spec/models/spree/order/payment_spec.rb
 - spec/models/spree/order/risk_assessment_spec.rb
 - spec/models/spree/order/state_machine_spec.rb
@@ -1254,9 +1268,14 @@ files:
 - spec/models/spree/order_shipping_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/order_stock_location_spec.rb
+- spec/models/spree/order_taxation_spec.rb
 - spec/models/spree/order_update_attributes_spec.rb
 - spec/models/spree/order_updater_spec.rb
 - spec/models/spree/payment_create_spec.rb
+- spec/models/spree/payment_method/bogus_credit_card_spec.rb
+- spec/models/spree/payment_method/check_spec.rb
+- spec/models/spree/payment_method/credit_card_spec.rb
+- spec/models/spree/payment_method/simple_bogus_credit_card_spec.rb
 - spec/models/spree/payment_method/store_credit_spec.rb
 - spec/models/spree/payment_method_spec.rb
 - spec/models/spree/payment_spec.rb
@@ -1371,12 +1390,14 @@ files:
 - spec/models/spree/store_credit_category_spec.rb
 - spec/models/spree/store_credit_event_spec.rb
 - spec/models/spree/store_credit_spec.rb
+- spec/models/spree/store_selector/by_server_name_spec.rb
+- spec/models/spree/store_selector/legacy_spec.rb
 - spec/models/spree/store_spec.rb
-- spec/models/spree/tax/item_adjuster_spec.rb
 - spec/models/spree/tax/order_adjuster_spec.rb
 - spec/models/spree/tax/shipping_rate_taxer_spec.rb
 - spec/models/spree/tax/tax_location_spec.rb
 - spec/models/spree/tax/taxation_integration_spec.rb
+- spec/models/spree/tax_calculator/default_spec.rb
 - spec/models/spree/tax_category_spec.rb
 - spec/models/spree/tax_rate_spec.rb
 - spec/models/spree/taxon_spec.rb

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

@@ -1,51 +0,0 @@
-# @api private
-# @note This is a helper class for Tax::OrderAdjuster.  It is marked as api
-#   private because taxes should always be calculated on the entire order, so
-#   external code should call Tax::OrderAdjuster instead of Tax::ItemAdjuster.
-module Spree
-  module Tax
-    # Adjust a single taxable item (line item or shipment)
-    class ItemAdjuster
-      attr_reader :item, :order
-
-      include TaxHelpers
-
-      # @param [Spree::LineItem,Spree::Shipment] item to adjust
-      # @param [Hash] options like already known tax rates for the order's zone
-      def initialize(item, options = {})
-        @item = item
-        @order = @item.order
-        # set instance variable so `TaxRate.match` is only called when necessary
-        @rates_for_order = options[:rates_for_order]
-        @rates_for_default_zone = options[:rates_for_default_zone]
-      end
-
-      # This updates the amounts for adjustments which already exist and
-      # creates and remove adjustments as needed to match the applicable
-      # (geographically and category-wise) tax rates.
-      def adjust!
-        rates = rates_for_item(item)
-
-        tax_adjustments = item.adjustments.select(&:tax?)
-        active_adjustments = rates.map do |rate|
-          # Find an existing adjustment from the same source.
-          # All tax adjustments already have source_type == 'Spree::TaxRate' so
-          # we need only check source_id.
-          adjustment = tax_adjustments.detect{|a| a.source_id == rate.id }
-          if adjustment
-            adjustment.update!
-            adjustment
-          else
-            # Create a new adjustment
-            rate.adjust(nil, item)
-          end
-        end
-
-        unmatched_adjustments = tax_adjustments - active_adjustments
-
-        # Remove any tax adjustments tied to rates which no longer match
-        item.adjustments.destroy(unmatched_adjustments)
-      end
-    end
-  end
-end

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

@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Spree::Tax::ItemAdjuster do
-  subject(:adjuster) { described_class.new(item) }
-  let(:order) { create(:order) }
-  let(:item) { create(:line_item, order: order) }
-
-  def tax_adjustments
-    item.adjustments.tax.to_a
-  end
-
-  describe 'initialization' do
-    it 'sets order to item order' do
-      expect(adjuster.order).to eq(item.order)
-    end
-
-    it 'sets adjustable' do
-      expect(adjuster.item).to eq(item)
-    end
-  end
-
-  shared_examples_for 'untaxed item' do
-    it 'creates no adjustments' do
-      adjuster.adjust!
-      expect(tax_adjustments).to eq([])
-    end
-
-    context 'with an existing tax adjustment' do
-      let!(:existing_adjustment) { create(:tax_adjustment, adjustable: item) }
-
-      it 'removes the existing adjustment' do
-        adjuster.adjust!
-        aggregate_failures do
-          expect(tax_adjustments).to eq([])
-          expect(Spree::Adjustment).to_not be_exists(existing_adjustment.id)
-        end
-      end
-    end
-  end
-
-  describe '#adjust!' do
-    before do
-      expect(order).to receive(:tax_address).at_least(:once).and_return(address)
-    end
-
-    context 'when the order has no tax zone' do
-      let(:address) { Spree::Tax::TaxLocation.new }
-
-      it_behaves_like 'untaxed item'
-    end
-
-    context 'when the order has a taxable address' do
-      let(:item) { build_stubbed :line_item, order: order }
-      let(:address) { order.tax_address }
-
-      before do
-        expect(Spree::TaxRate).to receive(:for_address).with(order.tax_address).and_return(rates_for_order_zone)
-      end
-
-      context 'when there are no matching rates' do
-        let(:rates_for_order_zone) { [] }
-
-        it_behaves_like 'untaxed item'
-      end
-
-      context 'when there are matching rates for the zone' do
-        context 'and all rates have the same tax category as the item' do
-          let(:item) { build_stubbed :line_item, order: order, tax_category: item_tax_category }
-          let(:item_tax_category) { build_stubbed(:tax_category) }
-          let(:rate_1) { create :tax_rate, tax_category: item_tax_category }
-          let(:rate_2) { create :tax_rate }
-          let(:rates_for_order_zone) { [rate_1, rate_2] }
-
-          it 'creates an adjustment for every matching rate' do
-            adjuster.adjust!
-            expect(tax_adjustments.length).to eq(1)
-          end
-        end
-      end
-    end
-  end
-end