spree_core 3.2.0.rc2 → 3.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9df21e1febf6c28c6c7fbe5f29457f33e1662bf7
-  data.tar.gz: 2b855fcc790eb5ed35eaf4c2ae34f023c1f38586
+  metadata.gz: 3b61c878ac693ae6026b96d3c9fcd0274d64fd06
+  data.tar.gz: 88fe797219b35ec4ef662b070992078e1451fe4f
 SHA512:
-  metadata.gz: 9872b3128e4d27049be36b7a83dcea10c77b04cca603c8d2b052683c4989cd863f904c5b195c574e52d5ad7cc2c5b5d9f253e61cc3c31ffb6221f2c085888111
-  data.tar.gz: efaa4550232d0d9bc5c7a4ccfd16e6b346e07fb2c276636e27d1e52875e9593369481f06eb1932dca4faa9fdaf52db49b9342d7357d1cd813eb73e1d454e8653
+  metadata.gz: 9953b341797318e180c7f33547c063a36f6c322c52f1faced2f833d3438ca25f11f098193a3bcabf825ccb80d4edbf4d1eb5efac350f712bfc60457a483e2aee
+  data.tar.gz: 10fbf84a91906b6554bec7ad3dfdc119ad1b0a666f0c97bb5a7008574d3ea60e2730b37543d6ab6916387fffde33ba462dbb2fdb988029ea28a2d5c6b079b7d5

data/app/models/spree/credit_card.rb

@@ -1,5 +1,7 @@
 module Spree
   class CreditCard < Spree::Base
+    include ActiveMerchant::Billing::CreditCardMethods
+
     belongs_to :payment_method
     belongs_to :user, class_name: Spree.user_class, foreign_key: 'user_id'
     has_many :payments, as: :source
@@ -15,7 +17,8 @@ module Spree
     attr_reader :number
     attr_accessor :encrypted_data,
                   :imported,
-                  :verification_value
+                  :verification_value,
+                  :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
       validates :month, :year, numericality: { only_integer: true }

data/app/models/spree/payment.rb

@@ -29,13 +29,13 @@ module Spree
     after_save :create_payment_profile, if: :profiles_supported?
 
     # update the order totals, etc.
-    after_save :update_order
+    set_callback :save, :after, :update_order, unless: -> { capture_on_dispatch }
 
     # invalidate previously entered payments
     after_create :invalidate_old_payments
     after_create :create_eligible_credit_event
 
-    attr_accessor :source_attributes, :request_env
+    attr_accessor :source_attributes, :request_env, :capture_on_dispatch
 
     after_initialize :build_source
 
@@ -221,14 +221,13 @@ module Spree
 
       def split_uncaptured_amount
         if uncaptured_amount > 0
-          order.payments.create! amount: uncaptured_amount,
-                                 avs_response: avs_response,
-                                 cvv_response_code: cvv_response_code,
-                                 cvv_response_message: cvv_response_message,
-                                 payment_method: payment_method,
-                                 response_code: response_code,
-                                 source: source,
-                                 state: 'pending'
+          order.payments.create!(
+            amount: uncaptured_amount,
+            payment_method: payment_method,
+            source: source,
+            state: 'pending',
+            capture_on_dispatch: true
+          ).authorize!
           update_attributes(amount: captured_amount)
         end
       end

data/app/models/spree/product.rb

@@ -373,7 +373,7 @@ module Spree
     def ensure_no_line_items
       if line_items.any?
         errors.add(:base, Spree.t(:cannot_destroy_if_attached_to_line_items))
-        return false
+        throw(:abort)
       end
     end
 

data/app/models/spree/product_property.rb

@@ -14,6 +14,7 @@ module Spree
     default_scope { order(:position) }
 
     self.whitelisted_ransackable_attributes = ['value']
+    self.whitelisted_ransackable_associations = ['property']
 
     # virtual attributes for use with AJAX completion stuff
     delegate :name, to: :property, prefix: true, allow_nil: true

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

@@ -13,7 +13,7 @@ module Spree
         end
 
         def compute_amount(order)
-          [(order.item_total + order.ship_total), compute(order)].min * -1
+          [(order.item_total + order.ship_total - order.shipping_discount), compute(order)].min * -1
         end
       end
     end

data/app/models/spree/variant.rb

@@ -267,7 +267,7 @@ module Spree
     def ensure_no_line_items
       if line_items.any?
         errors.add(:base, Spree.t(:cannot_destroy_if_attached_to_line_items))
-        return false
+        throw(:abort)
       end
     end
 

data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb

@@ -1,6 +1,6 @@
 class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
   def change
-    if table_exists?(:spree_promotion_rules_users) && !index_exists?(:spree_promotion_rules_users,
+    if data_source_exists?(:spree_promotion_rules_users) && !index_exists?(:spree_promotion_rules_users,
                                                                      [:user_id, :promotion_rule_id],
                                                                      name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id')
       add_index :spree_promotion_rules_users,
@@ -8,7 +8,7 @@ class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
                 name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id'
     end
 
-    if table_exists?(:spree_products_promotion_rules) && !index_exists?(:spree_products_promotion_rules,
+    if data_source_exists?(:spree_products_promotion_rules) && !index_exists?(:spree_products_promotion_rules,
                                                                         [:promotion_rule_id, :product_id],
                                                                         name: 'index_products_promotion_rules_on_promotion_rule_and_product')
       add_index :spree_products_promotion_rules,
@@ -24,15 +24,15 @@ class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
       add_index :spree_orders, :store_id
     end
 
-    if table_exists?(:spree_orders_promotions) && !index_exists?(:spree_orders_promotions, [:promotion_id, :order_id])
+    if data_source_exists?(:spree_orders_promotions) && !index_exists?(:spree_orders_promotions, [:promotion_id, :order_id])
       add_index :spree_orders_promotions, [:promotion_id, :order_id]
     end
 
-    if table_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes, :prototype_id)
+    if data_source_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes, :prototype_id)
       add_index :spree_properties_prototypes, :prototype_id
     end
 
-    if table_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes,
+    if data_source_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes,
                                                                      [:prototype_id, :property_id],
                                                                      name: 'index_properties_prototypes_on_prototype_and_property')
       add_index :spree_properties_prototypes,
@@ -40,15 +40,15 @@ class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
                 name: 'index_properties_prototypes_on_prototype_and_property'
     end
 
-    if table_exists?(:spree_taxons_prototypes) && !index_exists?(:spree_taxons_prototypes, [:prototype_id, :taxon_id])
+    if data_source_exists?(:spree_taxons_prototypes) && !index_exists?(:spree_taxons_prototypes, [:prototype_id, :taxon_id])
       add_index :spree_taxons_prototypes, [:prototype_id, :taxon_id]
     end
 
-    if table_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes, :prototype_id)
+    if data_source_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes, :prototype_id)
       add_index :spree_option_types_prototypes, :prototype_id
     end
 
-    if table_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes,
+    if data_source_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes,
                                                                        [:prototype_id, :option_type_id],
                                                                        name: 'index_option_types_prototypes_on_prototype_and_option_type')
       add_index :spree_option_types_prototypes,
@@ -56,7 +56,7 @@ class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
                 name: 'index_option_types_prototypes_on_prototype_and_option_type'
     end
 
-    if table_exists?(:spree_option_values_variants) && !index_exists?(:spree_option_values_variants,
+    if data_source_exists?(:spree_option_values_variants) && !index_exists?(:spree_option_values_variants,
                                                                        [:option_value_id, :variant_id],
                                                                        name: 'index_option_values_variants_on_option_value_and_variant')
       add_index :spree_option_values_variants,

data/db/migrate/20161014145148_add_created_at_to_variant.rb

@@ -2,7 +2,7 @@ class AddCreatedAtToVariant < ActiveRecord::Migration[5.0]
   def change
     add_column :spree_variants, :created_at, :datetime
     Spree::Variant.reset_column_information
-    Spree::Variant.where.not(updated_at: nil).update_all('created_at = updated_at')
-    Spree::Variant.where(updated_at: nil).update_all(created_at: Time.current, updated_at: Time.current)
+    Spree::Variant.unscoped.where.not(updated_at: nil).update_all('created_at = updated_at')
+    Spree::Variant.unscoped.where(updated_at: nil).update_all(created_at: Time.current, updated_at: Time.current)
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.2.0.rc2"
+    "3.2.0.rc3"
   end
 end

data/spec/models/spree/product_property_spec.rb

@@ -19,4 +19,8 @@ describe Spree::ProductProperty, type: :model do
       expect(@pp.property.name).to eq('Size')
     end
   end
+
+  context 'ransackable_associations' do
+    it { expect(Spree::ProductProperty.whitelisted_ransackable_associations).to include('property') }
+  end
 end

data/spec/models/spree/product_spec.rb

@@ -616,4 +616,14 @@ describe Spree::Product, type: :model do
       expect(product.category).to eql(taxonomy.taxons.first)
     end
   end
+
+  describe '#ensure_no_line_items' do
+    let(:product) { create(:product) }
+    let!(:line_item) { create(:line_item, variant: product.master) }
+
+    it 'should add error on product destroy' do
+      expect(product.destroy).to eq false
+      expect(product.errors[:base]).to include Spree.t(:cannot_destroy_if_attached_to_line_items)
+    end
+  end
 end

data/spec/models/spree/promotion/actions/create_adjustment_spec.rb

@@ -8,6 +8,69 @@ describe Spree::Promotion::Actions::CreateAdjustment, type: :model do
 
   it_behaves_like 'an adjustment source'
 
+  describe '#compute_amount' do
+    subject { described_class.new }
+
+    let(:shipping_discount) { 10 }
+    let(:order) do
+      double(:order, item_total: 30, ship_total: 10, shipping_discount: shipping_discount)
+    end
+
+    context 'when shipping_discount is applied' do
+      context 'and total is less than discount' do
+        it 'returns discount amount eq to total' do
+          allow(subject).to receive(:compute).with(order).and_return(100)
+
+          expect(subject.compute_amount(order)).to eq -30
+        end
+      end
+
+      context 'and total is equal to discount' do
+        it 'returns discount amount' do
+          allow(subject).to receive(:compute).with(order).and_return(30)
+
+          expect(subject.compute_amount(order)).to eq -30
+        end
+      end
+
+      context 'and total is greater than discount' do
+        it 'returns discount amount' do
+          allow(subject).to receive(:compute).with(order).and_return(10)
+
+          expect(subject.compute_amount(order)).to eq -10
+        end
+      end
+    end
+
+    context 'when shipping_discount is not applied' do
+      let(:shipping_discount) { 0 }
+
+      context 'and total is less than discount' do
+        it 'returns discount amount eq to total' do
+          allow(subject).to receive(:compute).with(order).and_return(100)
+
+          expect(subject.compute_amount(order)).to eq -40
+        end
+      end
+
+      context 'and total is equal to discount' do
+        it 'returns discount amount' do
+          allow(subject).to receive(:compute).with(order).and_return(40)
+
+          expect(subject.compute_amount(order)).to eq -40
+        end
+      end
+
+      context 'and total is greater than discount' do
+        it 'returns discount amount' do
+          allow(subject).to receive(:compute).with(order).and_return(10)
+
+          expect(subject.compute_amount(order)).to eq -10
+        end
+      end
+    end
+  end
+
   # From promotion spec:
   context "#perform" do
     before do

data/spec/models/spree/variant_spec.rb

@@ -806,4 +806,13 @@ describe Spree::Variant, type: :model do
       expect(variant.updated_at).to_not be_nil
     end
   end
+
+  describe '#ensure_no_line_items' do
+    let!(:line_item) { create(:line_item, variant: variant) }
+
+    it 'should add error on product destroy' do
+      expect(variant.destroy).to eq false
+      expect(variant.errors[:base]).to include Spree.t(:cannot_destroy_if_attached_to_line_items)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc2
+  version: 3.2.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1177,7 +1177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.