solidus_core 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a74c842726347bde057601765d2a6401987bb21
-  data.tar.gz: aa32d37bd70ac5bb4c7f06c35cd35b3ab165e1d1
+  metadata.gz: 0c0fea50cb0031d9a121c7abfb25c015c86542f5
+  data.tar.gz: 9294f4effa7875921c5deef2e05c69c52d6abddf
 SHA512:
-  metadata.gz: 576bef445deb2e4f067d1dcb51ab0a1df2391e41d252b4a842a2eaffca9b7697c511e91988bdd2f34aeb740368ec1cd94b44ba3fb6837be35c86e7df6a4ab9a6
-  data.tar.gz: 35be043f25fb4163902ee555e8dbe2103e1960cd1930df23836879dc94477c71c80231a4ac2dc3c3490c7912097db038db6d7b6ecd09afdd06819c81edda4f57
+  metadata.gz: 6e213a7266228cd8167cf8e1dab29442079d1bbb5a9eb885a9d30058b9110e95662b4984c4bb54248f1d9c98c7550e78b2483374b2895474b2ca38c2fbba94e9
+  data.tar.gz: 84b512524dc615c1803c2f4cd35039076f7e27b76bbe2a1ef8950a3a17d9423a21c64f0da75a4c177deff0db762cbbcc32bbdceb2b34c06e0ef09581ca98ea6f

data/app/models/spree/order.rb

@@ -681,6 +681,23 @@ module Spree
       Spree::Money.new(total_available_store_credit - total_applicable_store_credit, { currency: currency })
     end
 
+    def payments_attributes=(attributes)
+      validate_payments_attributes(attributes)
+      super(attributes)
+    end
+
+    def validate_payments_attributes(attributes)
+      attributes = Array.wrap(attributes)
+      # Ensure the payment methods specified are allowed for this user
+      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods)
+      attributes.each do |payment_attributes|
+        payment_method_id = payment_attributes[:payment_method_id]
+
+        # raise RecordNotFound unless it is an allowed payment method
+        payment_methods.find(payment_method_id) if payment_method_id
+      end
+    end
+
     private
 
     def link_by_email

data/app/models/spree/order_update_attributes.rb

@@ -14,6 +14,8 @@ module Spree
     # Assign the attributes to the order and save the order
     # @return true if saved, otherwise false and errors will be set on the order
     def apply
+      order.validate_payments_attributes(@payments_attributes)
+
       assign_order_attributes
       assign_payments_attributes
 

data/app/models/spree/payment.rb

@@ -39,6 +39,7 @@ module Spree
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
+    validates :payment_method, presence: true
 
     default_scope -> { order(:created_at) }
 

data/app/models/spree/preferences/statically_configurable.rb

@@ -22,14 +22,14 @@ module Spree
         if respond_to?(:preference_source) && preference_source
           self.class.preference_sources[preference_source] || {}
         else
-          super
+          self[:preferences]
         end
       end
 
       def preferences=(val)
         if respond_to?(:preference_source) && preference_source
         else
-          super
+          self[:preferences] = val
         end
       end
     end

data/db/default/spree/zones.rb

@@ -1,7 +1,7 @@
 eu_vat = Spree::Zone.find_or_create_by!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
 north_america = Spree::Zone.find_or_create_by!(name: "North America", description: "USA + Canada")
 
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE).
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).
 each do |symbol|
   eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(iso: symbol))
 end

data/db/migrate/20140410141842_add_many_missing_indexes.rb

@@ -1,17 +1,19 @@
 class AddManyMissingIndexes < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def change
-    add_index :spree_adjustments, [:adjustable_id, :adjustable_type]
-    add_index :spree_adjustments, :eligible
-    add_index :spree_adjustments, :order_id
-    add_index :spree_promotions, :code
-    add_index :spree_promotions, :expires_at
-    add_index :spree_states, :country_id
-    add_index :spree_stock_items, :deleted_at
-    add_index :spree_option_types, :position
-    add_index :spree_option_values, :position
-    add_index :spree_product_option_types, :option_type_id
-    add_index :spree_product_option_types, :product_id
-    add_index :spree_products_taxons, :position
-    add_index :spree_promotions, :starts_at
+    safe_add_index :spree_adjustments, [:adjustable_id, :adjustable_type]
+    safe_add_index :spree_adjustments, :eligible
+    safe_add_index :spree_adjustments, :order_id
+    safe_add_index :spree_promotions, :code
+    safe_add_index :spree_promotions, :expires_at
+    safe_add_index :spree_states, :country_id
+    safe_add_index :spree_stock_items, :deleted_at
+    safe_add_index :spree_option_types, :position
+    safe_add_index :spree_option_values, :position
+    safe_add_index :spree_product_option_types, :option_type_id
+    safe_add_index :spree_product_option_types, :product_id
+    safe_add_index :spree_products_taxons, :position
+    safe_add_index :spree_promotions, :starts_at
   end
 end

data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb

@@ -1,63 +1,65 @@
 class CorrectSomePolymorphicIndexAndAddMoreMissing < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def change
-    add_index :spree_addresses, :country_id
-    add_index :spree_addresses, :state_id
+    safe_add_index :spree_addresses, :country_id
+    safe_add_index :spree_addresses, :state_id
 
-    remove_index :spree_adjustments, [:source_type, :source_id]
-    add_index :spree_adjustments, [:source_id, :source_type]
+    safe_remove_index :spree_adjustments, [:source_type, :source_id]
+    safe_add_index :spree_adjustments, [:source_id, :source_type]
 
-    add_index :spree_inventory_units, :return_authorization_id
+    safe_add_index :spree_inventory_units, :return_authorization_id
 
-    add_index :spree_log_entries, [:source_id, :source_type]
+    safe_add_index :spree_log_entries, [:source_id, :source_type]
 
-    add_index :spree_orders, :approver_id
-    add_index :spree_orders, :created_by_id
-    add_index :spree_orders, :ship_address_id
-    add_index :spree_orders, :bill_address_id
-    add_index :spree_orders, :considered_risky
+    safe_add_index :spree_orders, :approver_id
+    safe_add_index :spree_orders, :created_by_id
+    safe_add_index :spree_orders, :ship_address_id
+    safe_add_index :spree_orders, :bill_address_id
+    safe_add_index :spree_orders, :considered_risky
 
-    add_index :spree_orders_promotions, [:order_id, :promotion_id]
+    safe_add_index :spree_orders_promotions, [:order_id, :promotion_id]
 
-    add_index :spree_payments, [:source_id, :source_type]
+    safe_add_index :spree_payments, [:source_id, :source_type]
 
-    add_index :spree_product_option_types, :position
+    safe_add_index :spree_product_option_types, :position
 
-    add_index :spree_product_properties, :position
-    add_index :spree_product_properties, :property_id
+    safe_add_index :spree_product_properties, :position
+    safe_add_index :spree_product_properties, :property_id
 
-    add_index :spree_promotion_action_line_items, :promotion_action_id
-    add_index :spree_promotion_action_line_items, :variant_id
+    safe_add_index :spree_promotion_action_line_items, :promotion_action_id
+    safe_add_index :spree_promotion_action_line_items, :variant_id
 
-    add_index :spree_promotion_rules, :promotion_id
+    safe_add_index :spree_promotion_rules, :promotion_id
 
-    add_index :spree_promotions, :advertise
+    safe_add_index :spree_promotions, :advertise
 
-    add_index :spree_return_authorizations, :number
-    add_index :spree_return_authorizations, :order_id
-    add_index :spree_return_authorizations, :stock_location_id
+    safe_add_index :spree_return_authorizations, :number
+    safe_add_index :spree_return_authorizations, :order_id
+    safe_add_index :spree_return_authorizations, :stock_location_id
 
-    add_index :spree_shipments, :address_id
+    safe_add_index :spree_shipments, :address_id
 
-    add_index :spree_shipping_methods, :tax_category_id
+    safe_add_index :spree_shipping_methods, :tax_category_id
 
-    add_index :spree_state_changes, [:stateful_id, :stateful_type]
-    add_index :spree_state_changes, :user_id
+    safe_add_index :spree_state_changes, [:stateful_id, :stateful_type]
+    safe_add_index :spree_state_changes, :user_id
 
-    add_index :spree_stock_locations, :country_id
-    add_index :spree_stock_locations, :state_id
+    safe_add_index :spree_stock_locations, :country_id
+    safe_add_index :spree_stock_locations, :state_id
 
-    add_index :spree_tax_rates, :deleted_at
-    add_index :spree_tax_rates, :tax_category_id
-    add_index :spree_tax_rates, :zone_id
+    safe_add_index :spree_tax_rates, :deleted_at
+    safe_add_index :spree_tax_rates, :tax_category_id
+    safe_add_index :spree_tax_rates, :zone_id
 
-    add_index :spree_taxonomies, :position
+    safe_add_index :spree_taxonomies, :position
 
-    add_index :spree_taxons, :position
+    safe_add_index :spree_taxons, :position
 
-    add_index :spree_variants, :position
-    add_index :spree_variants, :track_inventory
+    safe_add_index :spree_variants, :position
+    safe_add_index :spree_variants, :track_inventory
 
-    add_index :spree_zone_members, :zone_id
-    add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
+    safe_add_index :spree_zone_members, :zone_id
+    safe_add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
   end
 end

data/db/migrate/20141217215630_update_product_slug_index.rb

@@ -1,6 +1,8 @@
 class UpdateProductSlugIndex < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def change
-    remove_index :spree_products, :slug
-    add_index :spree_products, :slug, unique: true
+    safe_remove_index :spree_products, :slug
+    safe_add_index :spree_products, :slug, unique: true
   end
 end

data/db/migrate/20150723224133_remove_unnecessary_indexes.rb

@@ -4,6 +4,8 @@
 # migration deletes any of the indexes left around in stores using the
 # out-dated version of that migration
 class RemoveUnnecessaryIndexes < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def up
     safe_remove_index :spree_credit_cards, :address_id
     safe_remove_index :spree_gateways, :active
@@ -59,14 +61,4 @@ class RemoveUnnecessaryIndexes < ActiveRecord::Migration
     safe_add_index :spree_variants, :deleted_at
     safe_add_index :spree_zones, :default_tax
   end
-
-  private
-
-  def safe_remove_index(table, column)
-    remove_index(table, column) if index_exists?(table, column)
-  end
-
-  def safe_add_index(table, column)
-    add_index(table, column) if column_exists?(table, column)
-  end
 end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -126,7 +126,7 @@ end
       core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
 
       if core_gems.include?(lib_name)
-        '../../../../../Gemfile'
+        '../../../../Gemfile'
       else
         '../../../../Gemfile'
       end

data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js

@@ -7,7 +7,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require spree/backend
-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
-//= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
-<% end %>
 //= require_tree .

data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js

@@ -7,7 +7,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require spree/frontend
-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
-//= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
-<% end %>
 //= require_tree .

data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css

@@ -4,9 +4,6 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
  *= require spree/backend
-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend'  %>
- *= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
-<% end %>
  *= require_self
  *= require_tree .
 */

data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css

@@ -4,9 +4,6 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
  *= require spree/frontend
-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
- *= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
-<% end %>
  *= require_self
  *= require_tree .
 */

data/lib/spree/core.rb

@@ -70,6 +70,7 @@ require 'spree/core/environment/calculators'
 require 'spree/core/environment'
 require 'spree/promo/environment'
 require 'spree/migrations'
+require 'spree/migration_helpers'
 require 'spree/core/engine'
 
 require 'spree/i18n'

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.2.2"
+    "1.2.3"
   end
 
   def self.solidus_gem_version

data/lib/spree/migration_helpers.rb

@@ -0,0 +1,19 @@
+module Spree
+  module MigrationHelpers
+    def safe_remove_index(table, column)
+      remove_index(table, column) if index_exists?(table, column)
+    end
+
+    def safe_add_index(table, column, options = {})
+      if columns_exist?(table, column) && !index_exists?(table, column, options)
+        add_index(table, column, options)
+      end
+    end
+
+    private
+
+    def columns_exist?(table, columns)
+      Array.wrap(columns).all? { |column| column_exists?(table, column) }
+    end
+  end
+end

data/spec/models/spree/order_spec.rb

@@ -1411,4 +1411,56 @@ describe Spree::Order, :type => :model do
       end
     end
   end
+
+  describe "#validate_payments_attributes" do
+    let(:attributes) { [ActionController::Parameters.new(payment_method_id: payment_method.id)] }
+    subject do
+      order.validate_payments_attributes(attributes)
+    end
+
+    context "with empty array" do
+      let(:attributes) { [] }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with no payment method specified" do
+      let(:attributes) { [ActionController::Parameters.new({})] }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with valid payment method" do
+      let(:payment_method) { create(:check_payment_method) }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with inactive payment method" do
+      let(:payment_method) { create(:check_payment_method, active: false) }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "with unavailable payment method" do
+      let(:payment_method) { create(:check_payment_method, display_on: "back_end") }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "with soft-deleted payment method" do
+      let(:payment_method) { create(:check_payment_method, deleted_at: Time.current) }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
 end

data/spec/models/spree/order_update_attributes_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module Spree
   RSpec.describe OrderUpdateAttributes do
     let(:order) { create(:order) }
+    let(:payment_method) { create(:payment_method) }
     let(:request_env) { nil }
     let(:update) { described_class.new(order, attributes, request_env: request_env) }
 
@@ -25,7 +26,10 @@ module Spree
       let(:attributes) do
         {
           payments_attributes: [
-            {source_attributes: attributes_for(:credit_card)}
+            {
+              payment_method_id: payment_method.id,
+              source_attributes: attributes_for(:credit_card)
+            }
           ]
         }
       end

data/spec/models/spree/payment_spec.rb

@@ -661,12 +661,13 @@ describe Spree::Payment, :type => :model do
     end
 
     context "completed orders" do
+      let(:payment_method) { create(:check_payment_method) }
       before { allow(order).to receive_messages completed?: true }
 
       it "updates payment_state and shipments" do
         expect(order.updater).to receive(:update_payment_state)
         expect(order.updater).to receive(:update_shipment_state)
-        Spree::Payment.create(:amount => 100, :order => order)
+        Spree::Payment.create!(amount: 100, order: order, payment_method: payment_method)
       end
     end
 

data/spec/models/spree/preferences/statically_configurable_spec.rb

@@ -9,6 +9,10 @@ module Spree
         def initialize
           @preferences = {color: 'blue'}
         end
+
+        def [](key)
+          return @preferences if key == :preferences
+        end
       end
     end
     let(:klass) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -936,6 +936,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
@@ -1367,7 +1368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.