spree_frontend 3.2.0.rc1 → 3.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a338832e544a685ba98e6920db856223cebc89d
-  data.tar.gz: ba3582921a8f83ea5edb4477255c9f684899d156
+  metadata.gz: d492783cc7c2e03af5aa464ff106164671d47e16
+  data.tar.gz: 33eb524b36fa06355a1330b7f9d909bd71221664
 SHA512:
-  metadata.gz: b40461730f99df2887a3f6367dec2605a701cec1741c0a1ccb594a09ca54c6572113c8773ccc8f1d654a6c29c36b2c7160f82e358526d743c583d59d0e69bc39
-  data.tar.gz: 986c4f262981d47995e9cc724b779c59382fd08a51be0967047525adf7b5391a9ff645b85e46c68828f52bd7ea5296112582cf61b8714d9b56d7292edba3371f
+  metadata.gz: 498a2359ded88634cb12d3c93e0f575a046418d07b148465536d9cdbdce1fc4250b7da9805482b5bbf4153b785f7691ac4d1ee2104b9ba18bafed9fa863de977
+  data.tar.gz: 51d160a36d15c5cdd16eac4dc30733cb554df9f6e48d0cf1ba4bf63f805941ef318b691bff3715b49246212621e31a5364ebe90146c81f879132b0aeff5af0e9

data/app/controllers/spree/checkout_controller.rb

@@ -169,6 +169,7 @@ module Spree
 
         # Remove other payment method parameters.
         params[:order].delete(:payments_attributes)
+        params[:order].delete(:existing_card)
         params.delete(:payment_source)
 
         # Return to the Payments page if additional payment is needed.

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -458,5 +458,58 @@ describe Spree::CheckoutController, type: :controller do
       order.reload
       expect(order.state).to eq 'confirm'
     end
+
+    context 'with store credits payment' do
+      let(:user) { create(:user) }
+      let(:credit_amount) { order.total + 1.00 }
+      let(:put_attrs) do
+        {
+          state: 'payment',
+          apply_store_credit: 'Apply Store Credit',
+          order: {
+            payments_attributes: [{ payment_method_id: payment_method_id }],
+          }
+        }
+      end
+      before do
+        create(:store_credit_payment_method)
+        create(:store_credit, user: user, amount: credit_amount)
+      end
+
+      def expect_one_store_credit_payment(order, amount)
+        expect(order.payments.count).to eq 1
+        expect(order.payments.first.source).to be_a Spree::StoreCredit
+        expect(order.payments.first.amount).to eq amount
+      end
+
+      it 'can fully pay with store credits while removing other payment attributes' do
+        spree_put :update, put_attrs
+
+        order.reload
+        expect(order.state).to eq 'confirm'
+        expect_one_store_credit_payment(order, order.total)
+      end
+
+      it 'can fully pay with store credits while removing an existing card' do
+        credit_card = create(:credit_card, user: user, payment_method: Spree::PaymentMethod.first)
+        put_attrs[:order][:existing_card] = credit_card.id
+        spree_put :update, put_attrs
+
+        order.reload
+        expect(order.state).to eq 'confirm'
+        expect_one_store_credit_payment(order, order.total)
+      end
+
+      context 'partial payment' do
+        let(:credit_amount) { order.total - 1.00 }
+        it 'returns to payment for partial store credit' do
+          spree_put :update, put_attrs
+
+          order.reload
+          expect(order.state).to eq 'payment'
+          expect_one_store_credit_payment(order, credit_amount)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
+  version: 3.2.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement