solidus_core 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb628effcfda240354e15e2ae099740a7e10d5d6
-  data.tar.gz: 1e6540e660eca7a4d3e4b69ea0dd9266a676ea69
+  metadata.gz: 9161c98f377c58e982a151cdeb6c8ac7a2b5f656
+  data.tar.gz: 480fc65e5d85570f6eef9ae0f29cb45ca5f47e28
 SHA512:
-  metadata.gz: 3c8c0564b65175ea0a19830eb1569a59ffca329a530bee748c66f78ea8a23fc12eeccba3da510a56dfcfc2a75e220b7660afee0e961669587eec6031a8501ac3
-  data.tar.gz: 44ab87bbf973df9ba2f092466631bf701f90214755e23287b39b0d298eee3fe84f1ea455e7505ef33cef1326a73341103eb5a78f3fe2af559fef9186febd54e6
+  metadata.gz: 752f95c291e1810aa18c3973920e6e7cbdd279447de14da7a781d22962e946b41747867ee9c7c2c0c739ced9aa6f05fd357f2756d234b46228593f821f4295ee
+  data.tar.gz: 3c049638968609ca75f2d49b878c334e7cfa2532a9684b565d1d2c2e0382320ed72841529a6d8610b80c22ecbc2311da70c38c9085e63d07e1c1b6ae39e0f9c5

data/app/models/spree/order.rb

@@ -709,6 +709,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/payment.rb

@@ -38,6 +38,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/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/spec/models/spree/order_spec.rb

@@ -1479,4 +1479,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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1305,9 +1305,8 @@ 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.
 test_files: []
-has_rdoc: