solidus_frontend 2.0.3 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a591e9eca8f2ad1af78d06df64f1fb92f0dbdd2
-  data.tar.gz: 863b02f73442a2bc21e8d1013795ce016192b091
+  metadata.gz: 91994caf4d6589e096b79944e9c1b85b4c3471a9
+  data.tar.gz: '0242813eada0aef5639393066debcd46ced896cb'
 SHA512:
-  metadata.gz: ccb8362c714272e32fe20b7ea0777c29e20a61b790bfefbec1dd626855aa7653228053919ba60234ebe2953890c3954a7e2cd3ccc36d45d15ec65d95a8857dfb
-  data.tar.gz: '09b911642991cf16896b1e3722382560724a51a72031d0880c1b3f9bad568509cc41e083694d59279c6f820a78ef65d07eb4db855dfaef0a05cca30b75fe0158'
+  metadata.gz: 0345a11808be7289c09ba4224f44bd4dd44f659117883ee775d2f394a52defcf5c95584cbba9505eeb9944504d7ec32508f464c65ddc7496412d1469da5a218c
+  data.tar.gz: fc78552d2b109388cf8b4924a018b43633ee3ab3a3768e22070f789eebd428cf3d67178a8914a164d9186589a09a9e1831352f51ad8f25c3f4bc6f6399b5609f

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

@@ -7,6 +7,3 @@
 Spree.disableSaveOnClick = ->
   ($ 'form.edit_order').submit ->
     ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
-
-Spree.ready ($) ->
-  Spree.Checkout = {}

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

@@ -1,4 +1,4 @@
-$ ->
+Spree.ready ($) ->
   if $('#checkout_form_address').is('*')
     # Hidden by default to support browsers with javascript disabled
     $('.js-address-fields').show()

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

@@ -29,12 +29,11 @@ Spree.ready ($) ->
         ($ '#payment_method_' + @value).show() if @checked
       )
 
-      ($ document).on('click', '#cvv_link', (event) ->
+      ($ '#cvv_link').on 'click', (event) ->
         windowName = 'cvv_info'
         windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
         window.open(($ this).attr('href'), windowName, windowOptions)
         event.preventDefault()
-      )
 
       # Activate already checked payment method if form is re-rendered
       # i.e. if user enters invalid data

data/app/assets/javascripts/spree/frontend/product.js.coffee

@@ -1,8 +1,8 @@
-$ ->
+Spree.ready ($) ->
   Spree.addImageHandlers = ->
     thumbnails = ($ '#product-images ul.thumbnails')
     ($ '#main-image').data 'selectedThumb', ($ '#main-image img').attr('src')
-    thumbnails.find('li').eq(0).addClass 'selected'
+    thumbnails.find('li').eq(0).addClass 'selected' unless thumbnails.find('li.selected').length
     thumbnails.find('a').on 'click', (event) ->
       ($ '#main-image').data 'selectedThumb', ($ event.currentTarget).attr('href')
       ($ '#main-image').data 'selectedThumbId', ($ event.currentTarget).parent().attr('id')

data/app/controllers/spree/checkout_controller.rb

@@ -17,7 +17,7 @@ module Spree
     before_action :check_authorization
     before_action :apply_coupon_code
 
-    before_action :setup_for_current_state
+    before_action :setup_for_current_state, only: [:edit, :update]
 
     helper 'spree/orders'
 

data/app/controllers/spree/orders_controller.rb

@@ -18,10 +18,11 @@ module Spree
 
     def update
       if @order.contents.update_cart(order_params)
+        @order.next if params.key?(:checkout) && @order.cart?
+
         respond_with(@order) do |format|
           format.html do
             if params.key?(:checkout)
-              @order.next if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
               redirect_to cart_path
@@ -41,27 +42,30 @@ module Spree
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
-      order    = current_order(create_order_if_necessary: true)
+      @order   = current_order(create_order_if_necessary: true)
       variant  = Spree::Variant.find(params[:variant_id])
       quantity = params[:quantity].to_i
 
       # 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)
-        rescue ActiveRecord::RecordInvalid => e
-          error = e.record.errors.full_messages.join(", ")
-        end
-      else
-        error = Spree.t(:please_enter_reasonable_quantity)
+      if !quantity.between?(1, 2_147_483_647)
+        @order.errors.add(:base, Spree.t(:please_enter_reasonable_quantity))
       end
 
-      if error
-        flash[:error] = error
-        redirect_back_or_default(spree.root_path)
-      else
-        respond_with(order) do |format|
-          format.html { redirect_to cart_path }
+      begin
+        @line_item = @order.contents.add(variant, quantity)
+      rescue ActiveRecord::RecordInvalid => e
+        @order.errors.add(:base, e.record.errors.full_messages.join(", "))
+      end
+
+      respond_with(@order) do |format|
+        format.html do
+          if @order.errors.any?
+            flash[:error] = @order.errors.full_messages.join(", ")
+            redirect_back_or_default(spree.root_path)
+            return
+          else
+            redirect_to cart_path
+          end
         end
       end
     end

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

@@ -2,34 +2,43 @@
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
   <p class="field" id=<%="#{address_id}firstname" %>>
     <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span><br />
-    <%= form.text_field :firstname, :class => 'required' %>
+    <%= form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name' %>
   </p>
+
   <p class="field" id=<%="#{address_id}lastname" %>>
     <%= form.label :lastname, Spree.t(:last_name) %><span class="required">*</span><br />
-    <%= form.text_field :lastname, :class => 'required' %>
+    <%= form.text_field :lastname, autocomplete: address_type + ' family-name' %>
   </p>
+
   <% if Spree::Config[:company] %>
     <p class="field" id=<%="#{address_id}company" %>>
       <%= form.label :company, Spree.t(:company) %><br />
-      <%= form.text_field :company %>
+      <%= form.text_field :company, autocomplete: address_type + ' organization' %>
     </p>
   <% end %>
+
   <p class="field" id=<%="#{address_id}address1" %>>
     <%= form.label :address1, Spree.t(:street_address) %><span class="required">*</span><br />
-    <%= form.text_field :address1, :class => 'required' %>
+    <%= form.text_field :address1, class: 'required', autocomplete: address_type + ' address-line1' %>
   </p>
+
   <p class="field" id=<%="#{address_id}address2" %>>
     <%= form.label :address2, Spree.t(:street_address_2) %><br />
-    <%= form.text_field :address2 %>
+    <%= form.text_field :address2, autocomplete: address_type + ' address-line2' %>
   </p>
+
   <p class="field" id=<%="#{address_id}city" %>>
     <%= form.label :city, Spree.t(:city) %><span class="required">*</span><br />
-    <%= form.text_field :city, :class => 'required' %>
+    <%= form.text_field :city, class: 'required', autocomplete: address_type + ' address-level2' %>
   </p>
+
   <p class="field" id=<%="#{address_id}country" %>>
     <%= form.label :country_id, Spree.t(:country) %><span class="required">*</span><br />
     <span id=<%="#{address_id}country-selection" %>>
-      <%= form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
+      <%= form.collection_select :country_id, available_countries, :id, :name, {},
+          class: 'required',
+          autocomplete: address_type + ' country-name'
+        %>
     </span>
   </p>
 
@@ -46,7 +55,8 @@
             {
               class: have_states ? 'required' : '',
               style: have_states ? '' : 'display: none;',
-              disabled: !have_states
+              disabled: !have_states,
+              autocomplete: address_type + ' address-level1'
             })
           %>
         <%=
@@ -54,28 +64,31 @@
             :state_name,
             class: !have_states ? 'required' : '',
             style: have_states ? 'display: none;' : '',
-            disabled: have_states
+            disabled: have_states,
+            autocomplete: address_type + ' address-level1'
           )
         %>
       </span>
       <noscript>
-        <%= form.text_field :state_name, :class => 'required' %>
+        <%= form.text_field :state_name, :class => 'required', autocomplete: address_type + ' address-level1' %>
       </noscript>
     </p>
   <% end %>
 
   <p class="field" id=<%="#{address_id}zipcode" %>>
     <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><% end %><br />
-    <%= form.text_field :zipcode, :class => "#{'required' if address.require_zipcode?}" %>
+    <%= form.text_field :zipcode, class: "#{'required' if address.require_zipcode?}", autocomplete: address_type + ' postal-code' %>
   </p>
+
   <p class="field" id=<%="#{address_id}phone" %>>
     <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><% end %><br />
-    <%= form.phone_field :phone, :class => "#{'required' if address.require_phone?}" %>
+    <%= form.phone_field :phone, class: "#{'required' if address.require_phone?}", autocomplete: address_type + ' home tel' %>
   </p>
+
   <% if Spree::Config[:alternative_shipping_phone] %>
     <p class="field" id=<%="#{address_id}altphone" %>>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %><br />
-      <%= form.phone_field :alternative_phone %>
+      <%= form.phone_field :alternative_phone, autocomplete: address_type + ' tel' %>
     </p>
   <% end %>
 </div>

data/app/views/spree/layouts/spree_application.html.erb

@@ -32,6 +32,5 @@
 
     </div>
 
-    <%= render :partial => 'spree/shared/google_analytics' %>
   </body>
 </html>

data/app/views/spree/products/_cart_form.html.erb

@@ -29,7 +29,7 @@
     <% end %>
 
     <% if @product.price_for(current_pricing_options) and !@product.price.nil? %>
-      <div data-hook="product_price" class="columns five <% if !@product.has_variants? %> alpha <% else %> omega <% end %>">
+      <div data-hook="product_price" class="columns five <%= !@product.has_variants? ? 'alpha' : 'omega' %>">
 
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>

data/solidus_frontend.gemspec

@@ -12,12 +12,15 @@ Gem::Specification.new do |s|
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io/'
-  s.rubyforge_project = 'solidus_frontend'
+  s.license     = 'BSD-3-Clause'
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
+  s.required_ruby_version = '>= 2.2.2'
+  s.required_rubygems_version = '>= 1.8.23'
+
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,9 +81,9 @@ 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 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
@@ -218,53 +218,6 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
-      context "when in the payment state" do
-        let(:order) { create(:order_with_line_items) }
-        let(:payment_method) { create(:credit_card_payment_method) }
-
-        let(:params) do
-          {
-            state: 'payment',
-            order: {
-              payments_attributes: [
-                {
-                  payment_method_id: payment_method.id.to_s,
-                  source_attributes: attributes_for(:credit_card)
-                }
-              ]
-            }
-          }
-        end
-
-        before do
-          order.update_attributes! user: user
-          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: 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: params
-            }.to raise_error(ActiveRecord::RecordNotFound)
-
-            expect(order.state).to eq('payment')
-            expect(order.payments).to be_empty
-          end
-        end
-      end
-
       context "when in the confirm state" do
         before do
           order.update_attributes! user: user

data/spec/controllers/spree/orders_controller_spec.rb

@@ -18,7 +18,12 @@ describe Spree::OrdersController, type: :controller do
       it "should create a new order when none specified" do
         post :populate
         expect(cookies.signed[:guest_token]).not_to be_blank
-        expect(Spree::Order.find_by_guest_token(cookies.signed[:guest_token])).to be_persisted
+
+        order_by_token = Spree::Order.find_by_guest_token(cookies.signed[:guest_token])
+        assigned_order = assigns[:order]
+
+        expect(assigned_order).to eq order_by_token
+        expect(assigned_order).to be_persisted
       end
 
       context "with Variant" do
@@ -85,6 +90,13 @@ describe Spree::OrdersController, type: :controller do
           put :update, session: { order_id: 1 }
           expect(response).to redirect_to(spree.cart_path)
         end
+
+        it "should advance the order if :checkout button is pressed" do
+          allow(order).to receive(:update_attributes).and_return true
+          expect(order).to receive(:next)
+          put :update, { checkout: true }, { order_id: 1 }
+          expect(response).to redirect_to checkout_state_path('address')
+        end
       end
     end
 

data/spec/features/checkout_spec.rb

@@ -77,9 +77,9 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   context "doesn't allow bad credit card numbers" do
-    let!(:payment_method) { create(:credit_card_payment_method) }
     before(:each) do
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [create(:credit_card_payment_method)])
 
       user = create(:user)
       order.user = user
@@ -180,8 +180,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
-    let!(:bogus) { create(:credit_card_payment_method) }
+    let(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -190,6 +189,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
     before do
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [bogus])
 
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)

data/spec/features/free_shipping_promotions_spec.rb

@@ -15,15 +15,14 @@ describe "Free shipping promotions", type: :feature, js: true do
   let!(:payment_method) { create(:check_payment_method) }
   let!(:product) { create(:product, name: "RoR Mug", price: 20) }
   let!(:promotion) do
-    promotion = Spree::Promotion.create!(name: "Free Shipping",
-                                         starts_at: 1.day.ago,
-                                         expires_at: 1.day.from_now)
-
-    action = Spree::Promotion::Actions::FreeShipping.new
-    action.promotion = promotion
-    action.save
-
-    promotion.reload # so that promotion.actions is available
+    create(
+      :promotion,
+      apply_automatically: true,
+      promotion_actions: [Spree::Promotion::Actions::FreeShipping.new],
+      name: "Free Shipping",
+      starts_at: 1.day.ago,
+      expires_at: 1.day.from_now,
+    )
   end
 
   context "free shipping promotion automatically applied" do

data/spec/features/locale_spec.rb

@@ -40,7 +40,7 @@ describe 'setting locale', type: :feature do
         visit '/checkout/address'
         find('.form-buttons input[type=submit]').click
 
-        %w(firstname lastname address1 city).each do |attr|
+        %w(firstname address1 city).each do |attr|
           expect(find(".field#b#{attr} label.error")).to have_text(message)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,6 @@ files:
 - app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_filters.html.erb
 - app/views/spree/shared/_footer.html.erb
-- app/views/spree/shared/_google_analytics.html.erb
 - app/views/spree/shared/_head.html.erb
 - app/views/spree/shared/_header.html.erb
 - app/views/spree/shared/_link_to_cart.html.erb
@@ -274,7 +273,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
-- spec/support/shared_contexts/product_prototypes.rb
 - spec/views/spree/checkout/_summary_spec.rb
 - vendor/assets/javascripts/jquery.validate/additional-methods.min.js
 - vendor/assets/javascripts/jquery.validate/jquery.validate.min.js
@@ -327,7 +325,8 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
 homepage: http://solidus.io/
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -337,16 +336,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.23
 requirements:
 - none
-rubyforge_project: solidus_frontend
-rubygems_version: 2.6.11
+rubyforge_project: 
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.

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

@@ -1,36 +0,0 @@
-<% if tracker = Spree::Tracker.current %>
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '<%= tracker.analytics_id %>', 'auto');
-    ga('require', 'displayfeatures');
-    ga('send', 'pageview');
-
-    <% if @order && order_just_completed?(@order) %>
-      <%# more info: https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce %>
-      ga('require', 'ecommerce', 'ecommerce.js');
-      ga('ecommerce:addTransaction', {
-        'id': '<%= j @order.number %>',                                    // Transaction ID. Required.
-        'affiliation': '<%= current_store.name %>',                 // Affiliation or store name.
-        'revenue': '<%= @order.total %>',                                // Grand Total.
-        'shipping': '<%= @order.ship_total %>',                                  // Shipping.
-        'tax': '<%= @order.tax_total %>',                                        // Tax.
-        'currency': '<%= @order.currency %>'                        // local currency code.
-      });
-      <% @order.line_items.each do |line_item| %>
-        ga('ecommerce:addItem', {
-          'id': '<%= j @order.number %>',                        // Transaction ID. Required.
-          'name': '<%= j line_item.variant.product.name %>',    // Product name. Required.
-          'sku': '<%= j (line_item.variant.sku || line_item.variant_id) %>', // SKU/code.
-          'category': '',                                     // Category or variation.
-          'price': '<%= line_item.price %>',                 // Unit price.
-          'quantity': '<%= line_item.quantity %>'           // Quantity.
-        });
-      <% end %>
-      ga('ecommerce:send');
-    <% end %>
-  </script>
-<% end %>

data/spec/support/shared_contexts/product_prototypes.rb

@@ -1,28 +0,0 @@
-shared_context "product prototype" do
-  def build_option_type_with_values(name, values)
-    ot = FactoryGirl.create(:option_type, name: name)
-    values.each do |val|
-      ot.option_values.create(name: val.downcase, presentation: val)
-    end
-    ot
-  end
-
-  let(:product_attributes) do
-    # FactoryGirl.attributes_for is un-deprecated!
-    #   https://github.com/thoughtbot/factory_girl/issues/274#issuecomment-3592054
-    FactoryGirl.attributes_for(:base_product)
-  end
-
-  let(:prototype) do
-    size = build_option_type_with_values("size", %w(Small Medium Large))
-    FactoryGirl.create(:prototype, name: "Size", option_types: [size])
-  end
-
-  let(:option_values_hash) do
-    hash = {}
-    prototype.option_types.each do |i|
-      hash[i.id.to_s] = i.option_value_ids
-    end
-    hash
-  end
-end