solidus_core 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfbaab05af3945cfa3851f30385796b958081539
-  data.tar.gz: 0ce9487cd7d65d53c29a521604e88f1c7c2cccee
+  metadata.gz: fedc5c2cdf1cb1e25f80a181af360d2250eb273c
+  data.tar.gz: 75df629b91496ec4e8d94f3624835237d7b0814a
 SHA512:
-  metadata.gz: ded1d464481cb7560a968170df60ee2b4fb7f41cd5f5270cac8459aa65d987cf74aca0f6bb0089235669db0fc40109080249178316c2d596a5c094f5409a815f
-  data.tar.gz: a1b690aed55aea7da4e8f7d20147479f966ea1d36953a85bed3ab91307443c6b1aa40a3152f4be8ac3719c3af6c0aa2d31e7bedd2548e178c05364bfede90faa
+  metadata.gz: 96482c5df0535d60f3daaddba9efe951675e02c7ca38c7bbe3412c903b7020a5655eeafaa509d45af212c04c17161f26a759ab7ba587695929601c0f8f0f710c
+  data.tar.gz: f23eec90d1da8eb97d4ffe8efd47be92ca48de63b7821282c0f96dd8146626283a9646a504cbd2961b97d4da3fab86cdc5990a759d91c4c3273cd515819896ef

data/app/models/spree/calculator/default_tax.rb

@@ -42,7 +42,7 @@ module Spree
     end
 
     def round_to_two_places(amount)
-      BigDecimal.new(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+      BigDecimal(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
     end
 
     def deduced_total_by_rate(item, rate)

data/app/models/spree/calculator/flexi_rate.rb

@@ -15,7 +15,7 @@ module Spree
       items_count = object.quantity
       items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-      return BigDecimal.new(0) if items_count == 0
+      return BigDecimal(0) if items_count == 0
 
       additional_items_count = items_count - 1
       preferred_first_item + preferred_additional_item * additional_items_count

data/app/models/spree/calculator/returns/default_refund_amount.rb

@@ -25,7 +25,7 @@ module Spree
       end
 
       def percentage_of_line_item(inventory_unit)
-        1 / BigDecimal.new(inventory_unit.line_item.quantity)
+        1 / BigDecimal(inventory_unit.line_item.quantity)
       end
     end
   end

data/app/models/spree/calculator/tiered_flat_rate.rb

@@ -34,7 +34,7 @@ module Spree
     def cast_to_d(value)
       value.to_s.to_d
     rescue ArgumentError
-      BigDecimal.new(0)
+      BigDecimal(0)
     end
 
     def preferred_tiers_content

data/app/models/spree/calculator/tiered_percent.rb

@@ -40,7 +40,7 @@ module Spree
     def cast_to_d(value)
       value.to_s.to_d
     rescue ArgumentError
-      BigDecimal.new(0)
+      BigDecimal(0)
     end
 
     def preferred_tiers_content

data/app/models/spree/inventory_unit.rb

@@ -128,7 +128,7 @@ module Spree
     end
 
     def percentage_of_line_item
-      1 / BigDecimal.new(line_item.quantity)
+      1 / BigDecimal(line_item.quantity)
     end
 
     def current_return_item

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

@@ -39,7 +39,7 @@ module Spree
           if !amount.is_a?(BigDecimal)
             Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{amount.inspect}, it should return a BigDecimal"
           end
-          amount ||= BigDecimal.new(0)
+          amount ||= BigDecimal(0)
           amount = amount.abs
           [(calculable.item_total + calculable.ship_total), amount].min * -1
         end

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

@@ -35,7 +35,7 @@ module Spree
           if !promotion_amount.is_a?(BigDecimal)
             Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{promotion_amount.inspect}, it should return a BigDecimal"
           end
-          promotion_amount ||= BigDecimal.new(0)
+          promotion_amount ||= BigDecimal(0)
           promotion_amount = promotion_amount.abs
           [adjustable.amount, promotion_amount].min * -1
         end

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

@@ -56,7 +56,7 @@ module Spree::Promotion::Actions
       if !adjustment_amount.is_a?(BigDecimal)
         Spree::Deprecation.warn "#{calculator.class.name}#compute returned #{adjustment_amount.inspect}, it should return a BigDecimal"
       end
-      adjustment_amount ||= BigDecimal.new(0)
+      adjustment_amount ||= BigDecimal(0)
       adjustment_amount = adjustment_amount.abs
 
       order = line_item.order

data/app/models/spree/promotion/rules/item_total.rb

@@ -17,7 +17,7 @@ module Spree
         def eligible?(order, _options = {})
           return false unless order.currency == preferred_currency
           item_total = order.item_total
-          unless item_total.send(preferred_operator == 'gte' ? :>= : :>, BigDecimal.new(preferred_amount.to_s))
+          unless item_total.send(preferred_operator == 'gte' ? :>= : :>, BigDecimal(preferred_amount.to_s))
             eligibility_errors.add(:base, ineligible_message)
           end
 

data/app/models/spree/promotion_chooser.rb

@@ -16,7 +16,7 @@ module Spree
         end
         best_promotion_adjustment.amount
       else
-        BigDecimal.new('0')
+        BigDecimal('0')
       end
     end
 

data/db/migrate/20160101010000_solidus_one_four.rb

@@ -1120,17 +1120,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["track_inventory"], name: "index_spree_variants_on_track_inventory"
     end
 
-    create_table "spree_wallet_payment_sources", force: :cascade do |t|
-      t.integer "user_id", null: false
-      t.string "payment_source_type", null: false
-      t.integer "payment_source_id", null: false
-      t.boolean "default", default: false, null: false
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.index ["user_id", "payment_source_id", "payment_source_type"], name: "index_spree_wallet_payment_sources_on_source_and_user", unique: true
-      t.index ["user_id"], name: "index_spree_wallet_payment_sources_on_user_id"
-    end
-
     create_table "spree_zone_members", force: :cascade do |t|
       t.string "zoneable_type"
       t.integer "zoneable_id"

data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb

@@ -0,0 +1,25 @@
+class CreateSpreeWalletPaymentSources < ActiveRecord::Migration[4.2]
+  def change
+    return if table_exists?(:spree_wallet_payment_sources)
+
+    create_table :spree_wallet_payment_sources do |t|
+      t.references(
+        :user,
+        foreign_key: { to_table: Spree.user_class.table_name },
+        index: true,
+        null: false,
+      )
+      t.references :payment_source, polymorphic: true, null: false
+      t.boolean :default, default: false, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index(
+      :spree_wallet_payment_sources,
+      [:user_id, :payment_source_id, :payment_source_type],
+      unique: true,
+      name: 'index_spree_wallet_payment_sources_on_source_and_user',
+    )
+  end
+end

data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb

@@ -0,0 +1,27 @@
+class MigrateCreditCardsToWalletPaymentSources < ActiveRecord::Migration[4.2]
+  class CreditCard < ActiveRecord::Base
+    self.table_name = 'spree_credit_cards'
+  end
+  class WalletPaymentSource < ActiveRecord::Base
+    self.table_name = 'spree_wallet_payment_sources'
+  end
+
+  def up
+    credit_cards = CreditCard.
+      where.not(gateway_customer_profile_id: nil).
+      where.not(user_id: nil)
+
+    credit_cards.find_each do |credit_card|
+      WalletPaymentSource.find_or_create_by!(
+        user_id: credit_card.user_id,
+        payment_source_id: credit_card.id,
+        payment_source_type: 'Spree::CreditCard'
+      ) do |wallet_source|
+        wallet_source.default = credit_card.default
+      end
+    end
+  end
+
+  def down
+  end
+end

data/lib/spree/core/search/base.rb

@@ -27,15 +27,12 @@ module Spree
 
         def retrieve_products
           @products = get_base_scope
+          curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
             @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).distinct
           end
-          if @properties[:page]
-            curr_page = @properties[:page] || 1
-            @products = @products.page(curr_page).per(@properties[:per_page])
-          end
-          @products
+          @products = @products.page(curr_page).per(per_page)
         end
 
         def method_missing(name)
@@ -104,14 +101,9 @@ module Spree
           @properties[:search] = params[:search]
           @properties[:include_images] = params[:include_images]
 
-          if params[:per_page].present? || params[:page].present?
-            Spree::Deprecation.warn "Pagination inside the searcher is no longer supported." \
-              "Please paginate the results of the searcher yourself."
-
-            per_page = params[:per_page].to_i
-            @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
-            @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
-          end
+          per_page = params[:per_page].to_i
+          @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
+          @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
         end
       end
     end

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.4.1"
+    "2.4.2"
   end
 
   def self.solidus_gem_version

data/lib/spree/localized_number.rb

@@ -22,7 +22,7 @@ module Spree
       number = number.gsub(separator, '.') unless separator == '.'
 
       # Handle empty string for ruby 2.4 compatibility
-      BigDecimal.new(number.presence || 0)
+      BigDecimal(number.presence || 0)
     end
   end
 end

data/lib/spree/preferences/preferable.rb

@@ -114,7 +114,7 @@ module Spree
           begin
             value.to_s.to_d
           rescue ArgumentError
-            BigDecimal.new(0)
+            BigDecimal(0)
           end
         when :integer
           value.to_i

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

@@ -4,7 +4,7 @@ require 'spree/testing_support/factories/product_factory'
 FactoryGirl.define do
   factory :line_item, class: 'Spree::LineItem' do
     quantity 1
-    price { BigDecimal.new('10.00') }
+    price { BigDecimal('10.00') }
     order
     transient do
       product nil

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

@@ -15,7 +15,7 @@ FactoryGirl.define do
     store
 
     transient do
-      line_items_price BigDecimal.new(10)
+      line_items_price { BigDecimal(10) }
     end
 
     # TODO: Improve the name of order_with_totals factory.

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

@@ -4,7 +4,7 @@ require 'spree/testing_support/factories/option_type_factory'
 require 'spree/testing_support/factories/product_factory'
 
 FactoryGirl.define do
-  sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+  sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: 'Spree::Variant' do
     price 19.99

data/spec/lib/search/base_spec.rb

@@ -35,15 +35,13 @@ RSpec.describe Spree::Core::Search::Base do
   it "switches to next page according to the page parameter" do
     @product3 = create(:product, name: "RoR Pants", price: 14.00)
 
-    Spree::Deprecation.silence do
-      params = { per_page: "2" }
-      searcher = Spree::Core::Search::Base.new(params)
-      expect(searcher.retrieve_products.count).to eq(2)
+    params = { per_page: "2" }
+    searcher = Spree::Core::Search::Base.new(params)
+    expect(searcher.retrieve_products.count).to eq(2)
 
-      params[:page] = "2"
-      searcher = Spree::Core::Search::Base.new(params)
-      expect(searcher.retrieve_products.count).to eq(1)
-    end
+    params[:page] = "2"
+    searcher = Spree::Core::Search::Base.new(params)
+    expect(searcher.retrieve_products.count).to eq(1)
   end
 
   it "maps search params to named scopes" do

data/spec/lib/spree/money_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe Spree::Money do
       end
 
       context 'with BigDecimal' do
-        let(:amount){ BigDecimal.new('10.00') }
+        let(:amount){ BigDecimal('10.00') }
         it { should == "$10.00 USD" }
       end
     end

data/spec/models/spree/calculator/tiered_flat_rate_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
         before { calculator.preferred_tiers = { 20 => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -26,7 +26,7 @@ RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
         before { calculator.preferred_tiers = { 20.5 => 20.5 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20.5') => BigDecimal.new('20.5') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20.5') => BigDecimal('20.5') })
         end
       end
 
@@ -34,7 +34,7 @@ RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
         before { calculator.preferred_tiers = { "20" => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -42,7 +42,7 @@ RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
         before { calculator.preferred_tiers = { "  20 " => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -50,7 +50,7 @@ RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
         before { calculator.preferred_tiers = { "20.5" => "20.5" } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20.5') => BigDecimal.new('20.5') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20.5') => BigDecimal('20.5') })
         end
       end
     end

data/spec/models/spree/calculator/tiered_percent_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
         before { calculator.preferred_tiers = { 20 => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -42,7 +42,7 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
         before { calculator.preferred_tiers = { 20.5 => 20.5 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20.5') => BigDecimal.new('20.5') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20.5') => BigDecimal('20.5') })
         end
       end
 
@@ -50,7 +50,7 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
         before { calculator.preferred_tiers = { "20" => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -58,7 +58,7 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
         before { calculator.preferred_tiers = { "  20 " => 20 } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20') => BigDecimal.new('20') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20') => BigDecimal('20') })
         end
       end
 
@@ -66,7 +66,7 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
         before { calculator.preferred_tiers = { "20.5" => "20.5" } }
         it "converts successfully" do
           is_expected.to be true
-          expect(calculator.preferred_tiers).to eq({ BigDecimal.new('20.5') => BigDecimal.new('20.5') })
+          expect(calculator.preferred_tiers).to eq({ BigDecimal('20.5') => BigDecimal('20.5') })
         end
       end
     end

data/spec/models/spree/price_spec.rb

@@ -141,6 +141,6 @@ RSpec.describe Spree::Price, type: :model do
 
     subject { price.net_amount }
 
-    it { is_expected.to eq(BigDecimal.new(20) / 1.1) }
+    it { is_expected.to eq(BigDecimal(20) / 1.1) }
   end
 end

data/spec/models/spree/reimbursement/credit_spec.rb

@@ -12,7 +12,7 @@ module Spree
         before { allow(reimbursement).to receive(:credits).and_return([credit_double, credit_double]) }
 
         it 'should sum the amounts of all of the reimbursements credits' do
-          expect(subject).to eq BigDecimal.new('199.98')
+          expect(subject).to eq BigDecimal('199.98')
         end
       end
     end

data/spec/models/spree/reimbursement_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe Spree::Reimbursement, type: :model do
     let(:shipping_method)         { create :shipping_method, zones: [tax_zone] }
     let(:variant)                 { create :variant }
     let(:order)                   { create(:order_with_line_items, state: 'payment', line_items_attributes: [{ variant: variant, price: line_items_price }], shipment_cost: 0, shipping_method: shipping_method) }
-    let(:line_items_price)        { BigDecimal.new(10) }
+    let(:line_items_price)        { BigDecimal(10) }
     let(:line_item)               { order.line_items.first }
     let(:inventory_unit)          { line_item.inventory_units.first }
     let(:payment)                 { build(:payment, amount: payment_amount, order: order, state: 'checkout') }

data/spec/models/spree/user_spec.rb

@@ -102,7 +102,7 @@ end
 
 RSpec.describe Spree.user_class, type: :model do
   context "reporting" do
-    let(:order_value) { BigDecimal.new("80.94") }
+    let(:order_value) { BigDecimal("80.94") }
     let(:order_count) { 4 }
     let(:orders) { Array.new(order_count, double(total: order_value)) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -529,6 +529,8 @@ files:
 - db/default/spree/stores.rb
 - db/default/spree/zones.rb
 - db/migrate/20160101010000_solidus_one_four.rb
+- db/migrate/20160420044191_create_spree_wallet_payment_sources.rb
+- db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb
 - db/migrate/20160924135758_remove_is_default_from_prices.rb
 - db/migrate/20161009141333_remove_currency_from_line_items.rb
 - db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb