solidus_core 1.3.0.beta1 → 1.3.0.rc1

data/spec/models/spree/variant/pricing_options_spec.rb

@@ -4,15 +4,20 @@ describe Spree::Variant::PricingOptions do
   subject { described_class.new }
 
   context '.default_price_attributes' do
+    subject { described_class.default_price_attributes }
+
+    it { is_expected.to have_key(:currency) }
+    it { is_expected.to have_key(:country_iso) }
+
     it 'can be passed into a WHERE clause on Spree::Prices' do
-      expect(Spree::Price.where(described_class.default_price_attributes).to_a).to eq([])
+      expect(Spree::Price.where(subject).to_a).to eq([])
     end
 
     context "with a matching price present" do
       let!(:price) { create(:price) }
 
       it 'returns a matching price' do
-        expect(Spree::Price.where(described_class.default_price_attributes).to_a).to include(price)
+        expect(Spree::Price.where(subject).to_a).to include(price)
       end
     end
   end
@@ -25,9 +30,13 @@ describe Spree::Variant::PricingOptions do
       expect(subject.desired_attributes[:currency]).to eq("USD")
     end
 
+    it "takes the orders tax address country" do
+      expect(subject.desired_attributes[:country_iso]).to eq("US")
+    end
+
     context "if line item has no order" do
       before do
-        expect(line_item).to receive(:order).and_return(nil)
+        expect(line_item).to receive(:order).at_least(:once).and_return(nil)
       end
 
       it "returns the line item's currency" do
@@ -48,7 +57,7 @@ describe Spree::Variant::PricingOptions do
     context "if neither order nor line item have a currency" do
       before do
         expect(line_item).to receive(:currency).and_return(nil)
-        expect(line_item).to receive(:order).and_return(nil)
+        expect(line_item).to receive(:order).at_least(:once).and_return(nil)
         expect(Spree::Config).to receive(:currency).at_least(:once).and_return("RUB")
       end
 
@@ -58,6 +67,17 @@ describe Spree::Variant::PricingOptions do
     end
   end
 
+  context ".from_price" do
+    let(:country) { create(:country) }
+    let(:price) { create(:price, country: country) }
+
+    subject { described_class.from_price(price) }
+    it "gets the currency from the previous price" do
+      expect(subject.currency).to eq(price.currency)
+      expect(subject.country_iso).to eq(country.iso)
+    end
+  end
+
   describe '#desired_attributes' do
     context "when called with no arguments" do
       it "returns the default pricing options" do
@@ -72,6 +92,14 @@ describe Spree::Variant::PricingOptions do
         expect(subject.desired_attributes[:currency]).to eq("EUR")
       end
     end
+
+    context "when called with a different country_iso" do
+      subject { described_class.new(country_iso: "DE") }
+
+      it "returns a Hash with the correct country" do
+        expect(subject.desired_attributes[:country_iso]).to eq("DE")
+      end
+    end
   end
 
   describe "#currency" do
@@ -91,6 +119,23 @@ describe Spree::Variant::PricingOptions do
     end
   end
 
+  describe "#country_iso" do
+    context "when initialized with no country_iso" do
+      it "returns the default country_iso" do
+        expect(Spree::Config).to receive(:admin_vat_country_iso).and_return("US")
+        expect(subject.country_iso).to eq("US")
+      end
+    end
+
+    context "when initialized with a different country_iso" do
+      subject { described_class.new(country_iso: "DE") }
+
+      it "returns that country_iso" do
+        expect(subject.country_iso).to eq("DE")
+      end
+    end
+  end
+
   describe "#cache_key" do
     it 'creates a cache key out of the values of the attributes hash' do
       expect(subject.cache_key).to eq("USD")
@@ -98,9 +143,47 @@ describe Spree::Variant::PricingOptions do
 
     context "with another currency" do
       subject { described_class.new(currency: "EUR") }
+
       it 'creates the correct cache key' do
         expect(subject.cache_key).to eq("EUR")
       end
+
+      context "and another country" do
+        subject { described_class.new(currency: "EUR", country_iso: "DE") }
+
+        it 'creates the correct cache key' do
+          expect(subject.cache_key).to eq("EUR/DE")
+        end
+      end
+    end
+  end
+
+  describe "#search_arguments" do
+    let!(:price) { create(:price, currency: "EUR") }
+    let(:options) { {} }
+
+    subject { described_class.new(options).search_arguments }
+
+    context "with a currency given" do
+      let(:options) { { currency: "EUR" } }
+
+      it 'can be passed into a `where` clause' do
+        expect(Spree::Price.where(subject)).to eq([price])
+      end
+    end
+
+    context "with no country given" do
+      it "is an array with only nil inside" do
+        expect(subject[:country_iso]).to eq([nil])
+      end
+    end
+
+    context "with a country given" do
+      let(:options) { { country_iso: "DE" } }
+
+      it "is an array with the country and nil" do
+        expect(subject[:country_iso]).to eq(["DE", nil])
+      end
     end
   end
 end

data/spec/models/spree/variant/vat_price_generator_spec.rb

@@ -0,0 +1,69 @@
+require "spec_helper"
+
+describe Spree::Variant::VatPriceGenerator do
+  let(:tax_category) { create(:tax_category) }
+  let(:product) { variant.product }
+  let(:variant) { create(:variant, price: 10, tax_category: tax_category) }
+
+  subject { described_class.new(variant).run }
+
+  context "with Germany as default admin country" do
+    let(:germany) { create(:country, iso: "DE") }
+    let(:germany_zone) { create(:zone, countries: [germany]) }
+    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_category: tax_category) }
+    let(:france) { create(:country, iso: "FR") }
+    let(:france_zone) { create(:zone, countries: [france]) }
+    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_category: tax_category) }
+
+    before do
+      Spree::Config.admin_vat_country_iso = "DE"
+    end
+
+    it "builds a correct price including VAT for all VAT countries" do
+      subject
+      variant.save
+      variant.reload
+      expect(variant.default_price.for_any_country?).to be false
+      expect(variant.prices.detect { |p| p.country_iso == "DE" }.try!(:amount)).to eq(10.00)
+      expect(variant.prices.detect { |p| p.country_iso == "FR" }.try!(:amount)).to eq(10.08)
+      expect(variant.prices.detect { |p| p.country_iso.nil? }.try!(:amount)).to eq(8.40)
+    end
+
+    it "will not build prices that are already present" do
+      variant.prices.build(amount: 11, country_iso: "FR")
+      variant.prices.build(amount: 11, country_iso: nil)
+      expect { subject }.not_to change { variant.prices.length }
+    end
+  end
+
+  context "with no default admin country" do
+    let(:germany) { create(:country, iso: "DE") }
+    let(:germany_zone) { create(:zone, countries: [germany]) }
+    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_category: tax_category) }
+    let(:france) { create(:country, iso: "FR") }
+    let(:france_zone) { create(:zone, countries: [france]) }
+    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_category: tax_category) }
+
+    it "builds a correct price including VAT for all VAT countries" do
+      subject
+      variant.save
+      variant.reload
+      expect(variant.default_price.for_any_country?).to be true
+      expect(variant.prices.detect { |p| p.country_iso == "DE" }.try!(:amount)).to eq(11.90)
+      expect(variant.prices.detect { |p| p.country_iso == "FR" }.try!(:amount)).to eq(12.00)
+      expect(variant.prices.detect { |p| p.country_iso.nil? }.try!(:amount)).to eq(10.00)
+    end
+  end
+
+  context "for a variant with not tax category" do
+    let(:tax_category) { nil }
+
+    before do
+      product.update(tax_category: nil)
+    end
+
+    it "creates no addditional prices" do
+      expect { subject }.not_to change { variant.prices.length }
+    end
+  end
+end

data/spec/models/spree/variant_spec.rb

@@ -52,6 +52,55 @@ describe Spree::Variant, type: :model do
         it { expect(product.master).to_not be_in_stock }
       end
     end
+
+    context "when several countries have VAT" do
+      let(:germany) { create(:country, iso: "DE") }
+      let(:denmark) { create(:country, iso: "DK") }
+      let(:france) { create(:country, iso: "FR") }
+
+      let(:high_vat_zone) { create(:zone, countries: [germany, denmark]) }
+      let(:low_vat_zone) { create(:zone, countries: [france]) }
+
+      let(:tax_category) { create(:tax_category) }
+
+      let!(:high_vat) { create(:tax_rate, included_in_price: true, amount: 0.25, zone: high_vat_zone, tax_category: tax_category) }
+      let!(:low_vat) { create(:tax_rate, included_in_price: true, amount: 0.15, zone: low_vat_zone, tax_category: tax_category) }
+
+      let(:product) { create(:product, tax_category: tax_category) }
+
+      subject(:new_variant) { create(:variant, price: 15, product: product) }
+
+      it "creates the appropriate prices for them" do
+        # default price + FR, DE, DK
+        expect { new_variant }.to change { Spree::Price.count }.by(4)
+        expect(new_variant.prices.find_by(country_iso: "FR").amount).to eq(17.25)
+        expect(new_variant.prices.find_by(country_iso: "DE").amount).to eq(18.75)
+        expect(new_variant.prices.find_by(country_iso: "DK").amount).to eq(18.75)
+        expect(new_variant.prices.find_by(country_iso: nil).amount).to eq(15.00)
+      end
+
+      context "when the products price changes" do
+        context "and rebuild_vat_prices is set to true" do
+          subject { variant.update(price: 99, rebuild_vat_prices: true, tax_category: tax_category) }
+
+          it "creates new appropriate prices for this variant" do
+            expect { subject }.to change { Spree::Price.count }.by(3)
+            expect(variant.prices.find_by(country_iso: "FR").amount).to eq(113.85)
+            expect(variant.prices.find_by(country_iso: "DE").amount).to eq(123.75)
+            expect(variant.prices.find_by(country_iso: "DK").amount).to eq(123.75)
+            expect(variant.prices.find_by(country_iso: nil).amount).to eq(99.00)
+          end
+        end
+
+        context "and rebuild_vat_prices is not set" do
+          subject { variant.update(price: 99, tax_category: tax_category) }
+
+          it "does not create new prices" do
+            expect { subject }.not_to change { Spree::Price.count }
+          end
+        end
+      end
+    end
   end
 
   context "product has other variants" do
@@ -182,23 +231,23 @@ describe Spree::Variant, type: :model do
     end
   end
 
-  context "#pricer" do
-    subject { variant.pricer }
+  context "#price_selector" do
+    subject { variant.price_selector }
 
-    it "returns an instance of a pricer" do
-      expect(variant.pricer).to be_a(Spree::Config.variant_pricer_class)
+    it "returns an instance of a price selector" do
+      expect(variant.price_selector).to be_a(Spree::Config.variant_price_selector_class)
     end
 
     it "is instacached" do
-      expect(variant.pricer.object_id).to eq(variant.pricer.object_id)
+      expect(variant.price_selector.object_id).to eq(variant.price_selector.object_id)
     end
   end
 
   context "#price_for(price_options)" do
-    let(:price_options) { Spree::Config.variant_pricer_class.pricing_options_class.new }
+    let(:price_options) { Spree::Config.variant_price_selector_class.pricing_options_class.new }
 
-    it "calls the pricer with the given options object" do
-      expect(variant.pricer).to receive(:price_for).with(price_options)
+    it "calls the price selector with the given options object" do
+      expect(variant.price_selector).to receive(:price_for).with(price_options)
       variant.price_for(price_options)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -435,7 +435,6 @@ files:
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_promotion_rule.rb
 - app/models/spree/product_property.rb
-- app/models/spree/product_scope/scopes.rb
 - app/models/spree/promotion.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_item_adjustments.rb
@@ -555,9 +554,10 @@ files:
 - app/models/spree/user_stock_location.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
-- app/models/spree/variant/pricer.rb
+- app/models/spree/variant/price_selector.rb
 - app/models/spree/variant/pricing_options.rb
 - app/models/spree/variant/scopes.rb
+- app/models/spree/variant/vat_price_generator.rb
 - app/models/spree/variant_property_rule.rb
 - app/models/spree/variant_property_rule_condition.rb
 - app/models/spree/variant_property_rule_value.rb
@@ -880,6 +880,7 @@ files:
 - db/migrate/20160308000300_disallow_adjustment_finalized_nulls.rb
 - db/migrate/20160318145302_add_timestamps_to_prices.rb
 - db/migrate/20160330204846_add_missing_timestamp_columns.rb
+- db/migrate/20160509181311_add_country_iso_to_prices.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -901,6 +902,7 @@ files:
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/solidus_core.rb
 - lib/spree/core.rb
+- lib/spree/core/class_constantizer.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
 - lib/spree/core/controller_helpers/order.rb
@@ -920,6 +922,7 @@ files:
 - lib/spree/core/importer/order.rb
 - lib/spree/core/importer/product.rb
 - lib/spree/core/permalinks.rb
+- lib/spree/core/price_migrator.rb
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
 - lib/spree/core/role_configuration.rb
@@ -935,6 +938,7 @@ files:
 - lib/spree/localized_number.rb
 - lib/spree/mailer_previews/carton_preview.rb
 - lib/spree/mailer_previews/order_preview.rb
+- lib/spree/migration_helpers.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permission_sets.rb
@@ -1048,6 +1052,7 @@ files:
 - lib/tasks/migrations/assure_store_on_orders.rake
 - lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
 - lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake
+- lib/tasks/migrations/create_vat_prices.rake
 - lib/tasks/migrations/migrate_shipping_rate_taxes.rake
 - lib/tasks/migrations/migrate_user_addresses.rake
 - lib/tasks/order_capturing.rake
@@ -1063,6 +1068,7 @@ files:
 - spec/lib/i18n_spec.rb
 - spec/lib/search/base_spec.rb
 - spec/lib/search/variant_spec.rb
+- spec/lib/spree/core/class_constantizer_spec.rb
 - spec/lib/spree/core/controller_helpers/auth_spec.rb
 - spec/lib/spree/core/controller_helpers/order_spec.rb
 - spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb
@@ -1072,7 +1078,9 @@ files:
 - spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
 - spec/lib/spree/core/current_store_spec.rb
 - spec/lib/spree/core/delegate_belongs_to_spec.rb
+- spec/lib/spree/core/environment_extension_spec.rb
 - spec/lib/spree/core/importer/order_spec.rb
+- spec/lib/spree/core/price_migrator_spec.rb
 - spec/lib/spree/core/role_configuration_spec.rb
 - spec/lib/spree/core/stock_configuration_spec.rb
 - spec/lib/spree/core/testing_support/factories/address_factory_spec.rb
@@ -1342,9 +1350,10 @@ files:
 - spec/models/spree/unit_cancel_spec.rb
 - spec/models/spree/user_spec.rb
 - spec/models/spree/validations/db_maximum_length_validator_spec.rb
-- spec/models/spree/variant/pricer_spec.rb
+- spec/models/spree/variant/price_selector_spec.rb
 - spec/models/spree/variant/pricing_options_spec.rb
 - spec/models/spree/variant/scopes_spec.rb
+- spec/models/spree/variant/vat_price_generator_spec.rb
 - spec/models/spree/variant_property_rule_condition_spec.rb
 - spec/models/spree/variant_property_rule_spec.rb
 - spec/models/spree/variant_property_rule_value_spec.rb

data/app/models/spree/product_scope/scopes.rb

@@ -1,47 +0,0 @@
-module Spree
-  class ProductScope < Spree::Base
-    before_validation(on: :create) do
-      # Add default empty arguments so scope validates and errors aren't caused when previewing it
-      if name && args = self.class.arguments_for_scope_name(name)
-        self.arguments ||= [''] * args.length
-      end
-    end
-
-    def self.all_scopes
-      {
-        # Scopes for selecting products based on taxon
-        taxon: {
-          taxons_name_eq: [:taxon_name],
-          in_taxons: [:taxon_names]
-        },
-        # product selection based on name, or search
-        search: {
-          in_name: [:words],
-          in_name_or_keywords: [:words],
-          in_name_or_description: [:words],
-          with_ids: [:ids]
-        },
-        # Scopes for selecting products based on option types and properties
-        values: {
-          with: [:value],
-          with_property: [:property],
-          with_property_value: [:property, :value],
-          with_option: [:option],
-          with_option_value: [:option, :value]
-        },
-        # product selection based upon master price
-        price: {
-          price_between: [:low, :high],
-          master_price_lte: [:amount],
-          master_price_gte: [:amount]
-        }
-      }
-    end
-
-    def self.arguments_for_scope_name(name)
-      if group = all_scopes.detect { |_k, v| v[name.to_sym] }
-        group[1][name.to_sym]
-      end
-    end
-  end
-end

data/app/models/spree/variant/pricer.rb

@@ -1,19 +0,0 @@
-module Spree
-  class Variant
-    class Pricer
-      def self.pricing_options_class
-        Spree::Variant::PricingOptions
-      end
-
-      attr_reader :variant
-
-      def initialize(variant)
-        @variant = variant
-      end
-
-      def price_for(price_options)
-        variant.prices.currently_valid.find_by(price_options.desired_attributes).try!(:money)
-      end
-    end
-  end
-end