solidus_frontend 1.1.4 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bfa9f673c5ba3f399dd3c643b1f231651b5533
-  data.tar.gz: 1d781adb44a73c8e505285962a4a4cd8065ecd73
+  metadata.gz: 014616c55d9c2f1cedf9a12976a11155ccaf89b4
+  data.tar.gz: e684794f24c5a6aea4bb452b3c9fe4946f20edfa
 SHA512:
-  metadata.gz: c5772895992c212862e2c0880a9be288c2340f778a0bd8228b3c3401e7a0d9e514d945e76d1b56fa7ad1a5999a858e3e6c76dfcd31b4144ef9e5d5c639f93d02
-  data.tar.gz: 56b83d75ec28b5aff1f644b08b05fabf31682339617dd04263713c2d405b8c86b4a97f2f6c60fead48f1fd743c501daa9fa59015864a71b8ca2c25b2abe4df95
+  metadata.gz: 2499b1edebd95397a8bbd722fff282fa8a690aeefdd942bb36e1d76cea39422dcafbba3e1edf3a50e5873aac8f6f5fafa614b6a5630e02a351ef71dc4f1e435d
+  data.tar.gz: 2315833e9e0238c35237a51a0462da8ac0ce5ce9b73a6f5220abfb1c49a8318c8f9ab13457599004d916acb389119a779866754761dca40e51906fd5ad88d037

data/app/assets/javascripts/spree/frontend/checkout/address.js.coffee

@@ -1,8 +1,5 @@
 $ ->
   if $('#checkout_form_address').is('*')
-    # Hidden by default to support browsers with javascript disabled
-    $('.js-address-fields').show()
-
     $('#checkout_form_address').validate()
 
     getCountryId = (region) ->

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -343,12 +343,6 @@ nav #main-nav-bar {
   }
 }
 
-figure#logo {
-  img {
-    padding-top:25px;
-  }
-}
-
 nav#taxonomies {
   .taxonomy-root {
     text-transform: uppercase;

data/app/controllers/spree/checkout_controller.rb

@@ -25,8 +25,7 @@ module Spree
 
     # Updates the order and advances to the next state (when possible.)
     def update
-      massaged_params = move_payment_source_into_payments_attributes(params)
-      if @order.update_from_params(massaged_params, permitted_checkout_attributes, request.headers.env)
+      if OrderUpdateAttributes.new(@order, update_params, request_env: request.headers.env).apply
         @order.temporary_address = !params[:save_user_address]
         success = if @order.state == 'confirm'
           @order.complete
@@ -52,6 +51,26 @@ module Spree
     end
 
     private
+
+      def update_params
+        if update_params = massaged_params[:order]
+          update_params.permit(permitted_checkout_attributes)
+        else
+          # We current allow update requests without any parameters in them.
+          {}
+        end
+      end
+
+      def massaged_params
+        massaged_params = params.deep_dup
+
+        move_payment_source_into_payments_attributes(massaged_params)
+        move_existing_card_into_payments_attributes(massaged_params)
+        set_payment_parameters_amount(massaged_params, @order)
+
+        massaged_params
+      end
+
       def ensure_valid_state
         unless skip_state_validation?
           if (params[:state] && !@order.has_checkout_step?(params[:state])) ||
@@ -61,7 +80,7 @@ module Spree
           end
         end
 
-        # Fix for #4117
+        # Fix for https://github.com/spree/spree/issues/4117
         # If confirmation of payment fails, redirect back to payment screen
         if params[:state] == "confirm" && @order.payment_required? && @order.payments.valid.empty?
           flash.keep

data/app/controllers/spree/orders_controller.rb

@@ -45,7 +45,7 @@ module Spree
       variant  = Spree::Variant.find(params[:variant_id])
       quantity = params[:quantity].to_i
 
-      # 2,147,483,647 is crazy. See issue #2695.
+      # 2,147,483,647 is crazy. See issue https://github.com/spree/spree/issues/2695.
       if quantity.between?(1, 2_147_483_647)
         begin
           order.contents.add(variant, quantity)

data/app/views/spree/address/_form.html.erb

@@ -38,24 +38,24 @@
       <% have_states = !address.country.states.empty? %>
       <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
 
-      <span class="js-address-fields" style="display: none;">
-        <%= form.collection_select(
-          :state_id, address.country.states, :id, :name,
-          {include_blank: true},
-          {
-            class: have_states ? 'required' : 'hidden',
-            disabled: !have_states
-          }) %>
-        <%= form.text_field(
-          :state_name,
-          class: !have_states ? 'required' : 'hidden',
-          disabled: have_states) %>
-      </span>
-
+      <% state_elements = [
+         form.collection_select(:state_id, address.country.states,
+                            :id, :name,
+                            {:include_blank => true},
+                            {:class => have_states ? 'required' : 'hidden',
+                            :disabled => !have_states}) +
+         form.text_field(:state_name,
+                            :class => !have_states ? 'required' : 'hidden',
+                            :disabled => have_states)
+         ].join.gsub('"', "'").gsub("\n", "")
+      %>
+      <%= javascript_tag do -%>
+        $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
+      <% end %>
+    </p>
       <noscript>
         <%= form.text_field :state_name, :class => 'required' %>
       </noscript>
-    </p>
   <% end %>
 
   <p class="field" id=<%="#{address_id}zipcode" %>>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -3,13 +3,12 @@
 
 <p class="field">
   <%= label_tag "name_on_card_#{payment_method.id}", Spree.t(:name_on_card) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}"} %>
+  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", :autocomplete => "cc-name" } %>
 </p>
 
 <p class="field" data-hook="card_number">
   <%= label_tag "card_number", Spree.t(:card_number) %><span class="required">*</span><br />
-  <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
-  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "off") %>
+  <%= text_field_tag "#{param_prefix}[number]", '', {:id => 'card_number', :class => 'required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "cc-number", type: "tel"} %>
   &nbsp;
   <span id="card_type" style="display:none;">
     ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -20,12 +19,12 @@
 
 <p class="field" data-hook="card_expiration">
   <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required cardExpiry", :placeholder => "MM / YY" %>
+  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required cardExpiry", :placeholder => "MM / YY", type: "tel" %>
 </p>
 
 <p class="field" data-hook="card_code">
   <%= label_tag "card_code", Spree.t(:card_code) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required cardCode', :size => 5) %>
+  <%= text_field_tag "#{param_prefix}[verification_value]", '', {:id => 'card_code', :class => 'required cardCode', :size => 5, type: "tel", autocomplete: "off"} %>
   <%= link_to "(#{Spree.t(:what_is_this)})", spree.cvv_path, :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
 </p>
 

data/app/views/spree/shared/_main_nav_bar.html.erb

@@ -7,6 +7,6 @@
       </noscript>
       &nbsp;
     </li>
-    <script>Spree.fetch_cart('<%= j cart_link_url %>')</script>
+    <script>Spree.fetch_cart('<%= j spree.cart_link_url %>')</script>
   </ul>
 </nav>

data/lib/spree/frontend.rb

@@ -1,9 +1,6 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'canonical-rails'
-require 'deface'
-require 'coffee-rails'
-require 'sass-rails'
 
 require 'spree/core'
 

data/solidus_frontend.gemspec

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-version = File.read(File.expand_path("../../SOLIDUS_VERSION", __FILE__)).strip
+require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_frontend'
-  s.version     = version
+  s.version     = Spree.solidus_version
   s.summary     = 'Cart and storefront for the Solidus e-commerce project.'
   s.description = s.summary
 
@@ -18,13 +18,11 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'solidus_api', version
-  s.add_dependency 'solidus_core', version
+  s.add_dependency 'solidus_api', s.version
+  s.add_dependency 'solidus_core', s.version
 
   s.add_dependency 'canonical-rails', '~> 0.0.4'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'coffee-rails'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/controller_helpers_spec.rb

@@ -7,7 +7,6 @@ describe Spree::ProductsController, :type => :controller do
 
   before do
     I18n.enforce_available_locales = false
-    expect(I18n).to receive(:available_locales).and_return([:en, :de])
     Spree::Frontend::Config[:locale] = :de
   end
 
@@ -17,7 +16,7 @@ describe Spree::ProductsController, :type => :controller do
     I18n.enforce_available_locales = true
   end
 
-  # Regression test for #1184
+  # Regression test for https://github.com/spree/spree/issues/1184
   it "sets the default locale based off Spree::Frontend::Config[:locale]" do
     expect(I18n.locale).to eq(:en)
     spree_get :index

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -41,7 +41,7 @@ describe Spree::CheckoutController, :type => :controller do
       expect(response).to redirect_to(spree.cart_path)
     end
 
-    # Regression test for #2280
+    # Regression test for https://github.com/spree/spree/issues/2280
     it "should redirect to current step trying to access a future step" do
       order.update_column(:state, "address")
       spree_get :edit, { :state => "delivery" }
@@ -81,17 +81,18 @@ describe Spree::CheckoutController, :type => :controller do
         }
       end
 
-      let!(:payment_method) { create(:payment_method) }
       before do
         # Must have *a* shipping method and a payment method so updating from address works
-        allow(order).to receive_messages ensure_available_shipping_rates: true
+        allow(order).to receive_messages :available_shipping_methods => [stub_model(Spree::ShippingMethod)]
+        allow(order).to receive_messages :available_payment_methods => [stub_model(Spree::PaymentMethod)]
+        allow(order).to receive_messages :ensure_available_shipping_rates => true
         order.line_items << FactoryGirl.create(:line_item)
       end
 
       context "with the order in the cart state" do
         before do
+          order.update_attributes! user: user
           order.update_column(:state, "cart")
-          allow(order).to receive_messages :user => user
         end
 
         it "should assign order" do
@@ -125,24 +126,22 @@ describe Spree::CheckoutController, :type => :controller do
 
         context "current_user doesnt respond to persist_order_address" do
           it "doesnt raise any error" do
-            expect {
-              spree_post :update, {
-                :state => "address",
-                :order => {
-                  :bill_address_attributes => address_params,
-                  :use_billing => true
-                },
-                :save_user_address => "1"
-              }
-            }.to_not raise_error
+            spree_post :update, {
+              :state => "address",
+              :order => {
+                :bill_address_attributes => address_params,
+                :use_billing => true
+              },
+              :save_user_address => "1"
+            }
           end
         end
       end
 
       context "with the order in the address state" do
         before do
+          order.update_attributes! user: user
           order.update_columns(ship_address_id: create(:address).id, state: "address")
-          allow(order).to receive_messages user: user
         end
 
         context "with a billing and shipping address" do
@@ -169,7 +168,24 @@ describe Spree::CheckoutController, :type => :controller do
         end
       end
 
-      context "when in the payment state" do
+      # This is the only time that we need the 'set_payment_parameters_amount'
+      # controller code, because otherwise the transition to 'confirm' will
+      # trigger the 'add_store_credit_payments' transition code which will do
+      # the same thing here.
+      # Perhaps we can just remove 'set_payment_parameters_amount' entirely at
+      # some point?
+      context "when there is a checkout step between payment and confirm" do
+        before do
+          @old_checkout_flow = Spree::Order.checkout_flow
+          Spree::Order.class_eval do
+            insert_checkout_step :new_step, after: :payment
+          end
+        end
+
+        after do
+          Spree::Order.checkout_flow(&@old_checkout_flow)
+        end
+
         let(:order) { create(:order_with_line_items) }
         let(:payment_method) { create(:credit_card_payment_method) }
 
@@ -180,10 +196,10 @@ describe Spree::CheckoutController, :type => :controller do
               payments_attributes: [
                 {
                   payment_method_id: payment_method.id.to_s,
-                  source_attributes: attributes_for(:credit_card)
-                }
-              ]
-            }
+                  source_attributes: attributes_for(:credit_card),
+                },
+              ],
+            },
           }
         end
 
@@ -192,34 +208,19 @@ describe Spree::CheckoutController, :type => :controller do
           3.times { order.next! } # should put us in the payment state
         end
 
-        context 'with a permitted payment method' do
-          it 'sets the payment amount' do
-            post :update, params
-            order.reload
-            expect(order.state).to eq('confirm')
-            expect(order.payments.size).to eq(1)
-            expect(order.payments.first.amount).to eq(order.total)
-          end
-        end
-
-        context 'with an unpermitted payment method' do
-          before { payment_method.update!(display_on: "back_end") }
-
-          it 'sets the payment amount' do
-            expect {
-              post :update, params
-            }.to raise_error(ActiveRecord::RecordNotFound)
-
-            expect(order.state).to eq('payment')
-            expect(order.payments).to be_empty
-          end
+        it 'sets the payment amount' do
+          spree_post :update, params
+          order.reload
+          expect(order.state).to eq('new_step')
+          expect(order.payments.size).to eq(1)
+          expect(order.payments.first.amount).to eq(order.total)
         end
       end
 
       context "when in the confirm state" do
         before do
+          order.update_attributes! user: user
           order.update_column(:state, "confirm")
-          allow(order).to receive_messages :user => user
           # An order requires a payment to reach the complete state
           # This is because payment_required? is true on the order
           create(:payment, :amount => order.total, :order => order)
@@ -227,7 +228,7 @@ describe Spree::CheckoutController, :type => :controller do
           order.payments.reload
         end
 
-        # This inadvertently is a regression test for #2694
+        # This inadvertently is a regression test for https://github.com/spree/spree/issues/2694
         it "should redirect to the order view" do
           spree_post :update, {:state => "confirm"}
           expect(response).to redirect_to spree.order_path(order)
@@ -248,12 +249,12 @@ describe Spree::CheckoutController, :type => :controller do
 
     context "save unsuccessful" do
       before do
-        allow(order).to receive_messages :user => user
-        allow(order).to receive_messages :update_attributes => false
+        order.update_attributes! user: user
+        allow(order).to receive_messages valid?: false
       end
 
       it "should not assign order" do
-        spree_post :update, {:state => "address"}
+        spree_post :update, {:state => "address", email: ''}
         expect(assigns[:order]).not_to be_nil
       end
 
@@ -283,8 +284,8 @@ describe Spree::CheckoutController, :type => :controller do
 
     context "Spree::Core::GatewayError" do
       before do
-        allow(order).to receive_messages :user => user
-        allow(order).to receive(:update_attributes).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
+        order.update_attributes! user: user
+        allow(order).to receive(:next).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
         spree_post :update, {:state => "address"}
       end
 
@@ -310,7 +311,7 @@ describe Spree::CheckoutController, :type => :controller do
 
       context "when the order is invalid" do
         before do
-          allow(order).to receive_messages :update_attributes => true, :next => nil
+          allow(order).to receive_messages :valid? => true, :next => nil
           order.errors.add :base, 'Base error'
           order.errors.add :adjustments, 'error'
         end

data/spec/controllers/spree/checkout_controller_with_views_spec.rb

@@ -12,7 +12,7 @@ describe Spree::CheckoutController, type: :controller do
     allow(controller).to receive_messages try_spree_current_user: user
   end
 
-  # Regression test for #3246
+  # Regression test for https://github.com/spree/spree/issues/3246
   context "when using GBP" do
     before do
       Spree::Config[:currency] = "GBP"

data/spec/controllers/spree/orders_controller_spec.rb

@@ -100,7 +100,7 @@ describe Spree::OrdersController, :type => :controller do
       end
     end
 
-    # Regression test for #2750
+    # Regression test for https://github.com/spree/spree/issues/2750
     context "#update" do
       before do
         allow(user).to receive :last_incomplete_spree_order