solidus_frontend 1.0.7 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69d090e995c26e97c4b9eed6a36205ba4c8721e
-  data.tar.gz: 51856049c68819c9f9a2dfc1fdcccb569e037c02
+  metadata.gz: aef95541ce55ae65eb3f48f04ced3fc99e333c10
+  data.tar.gz: c4d27a4c94dae740f03711efb1eb6b2496c4b760
 SHA512:
-  metadata.gz: 525ef3dfd169cd8b2df4ac37387658dce47392811e89afe4e1ae0fe677bc1d5a313de1d5ddb9bffcb2015bb885d2948ac46b113055632c91eb25fb2bc5501d94
-  data.tar.gz: 13dea3731b3f1d2a754aa0b70964f8ff1293753fc23bce330e779b221d3605e243a96bb35e0af8d05d345fb4cd96bd9d8799db7897159440e50a5690c5d3bce6
+  metadata.gz: c83e0ceac48b02e4eb053b0732e915ff97180c5ecd508bb970b72ac83881031b1fc5a49b743abe91a7f54de5e8400942b90d6af28ef6db730a2aa32fae5b97bd
+  data.tar.gz: f8264d48702fcf8fc86718f3fcb0c8be1371f34c7aef7d3968df76ccfb8d9bad968b7e7ddb2f2898716ac0c8438396b76ee3a6a9fc074f63925851073180673b

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) ->
@@ -46,8 +43,12 @@ $ ->
         stateSelect.prop('disabled', false).show()
         stateInput.hide().prop 'disabled', true
         statePara.show()
-        stateSpanRequired.show()
-        stateSelect.addClass('required') if statesRequired
+        if statesRequired
+          stateSelect.addClass('required')
+          stateSpanRequired.show()
+        else
+          stateSelect.removeClass('required')
+          stateSpanRequired.hide()
         stateSelect.removeClass('hidden')
         stateInput.removeClass('required')
       else

data/app/controllers/spree/checkout_controller.rb

@@ -25,7 +25,8 @@ module Spree
 
     # Updates the order and advances to the next state (when possible.)
     def update
-      if @order.update_from_params(params, permitted_checkout_attributes, request.headers.env)
+      massaged_params = move_payment_source_into_payments_attributes(params)
+      if @order.update_from_params(massaged_params, permitted_checkout_attributes, request.headers.env)
         @order.temporary_address = !params[:save_user_address]
         success = if @order.state == 'confirm'
           @order.complete
@@ -116,8 +117,9 @@ module Spree
       def before_address
         # if the user has a default address, a callback takes care of setting
         # that; but if he doesn't, we need to build an empty one here
-        @order.bill_address ||= Address.build_default
-        @order.ship_address ||= Address.build_default if @order.checkout_steps.include?('delivery')
+        default = {country_id: Country.default.id}
+        @order.build_bill_address(default) unless @order.bill_address
+        @order.build_ship_address(default) if @order.checkout_steps.include?('delivery') && !@order.ship_address
       end
 
       def before_delivery

data/app/controllers/spree/store_controller.rb

@@ -13,7 +13,8 @@ module Spree
       fresh_when(simple_current_order)
     end
 
-    protected
+    private
+
       # This method is placed here so that the CheckoutController
       # and OrdersController can both reference it (or any other controller
       # which needs it)

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/lib/spree/frontend.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -114,11 +86,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - app/assets/images/credit_cards/amex_cid.gif
 - app/assets/images/credit_cards/credit_card.gif
 - app/assets/images/credit_cards/discover_cid.gif
@@ -221,48 +190,9 @@ files:
 - lib/spree/frontend.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
-- lib/spree/frontend/preference_rescue.rb
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.rake
-- script/rails
-- solidus_frontend.gemspec
-- spec/controllers/controller_extension_spec.rb
-- spec/controllers/controller_helpers_spec.rb
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/checkout_controller_with_views_spec.rb
-- spec/controllers/spree/content_controller_spec.rb
-- spec/controllers/spree/current_order_tracking_spec.rb
-- spec/controllers/spree/home_controller_spec.rb
-- spec/controllers/spree/orders_controller_ability_spec.rb
-- spec/controllers/spree/orders_controller_spec.rb
-- spec/controllers/spree/orders_controller_transitions_spec.rb
-- spec/controllers/spree/products_controller_spec.rb
-- spec/controllers/spree/taxons_controller_spec.rb
-- spec/features/address_spec.rb
-- spec/features/automatic_promotion_adjustments_spec.rb
-- spec/features/caching/products_spec.rb
-- spec/features/caching/taxons_spec.rb
-- spec/features/cart_spec.rb
-- spec/features/checkout_spec.rb
-- spec/features/checkout_unshippable_spec.rb
-- spec/features/coupon_code_spec.rb
-- spec/features/currency_spec.rb
-- spec/features/free_shipping_promotions_spec.rb
-- spec/features/locale_spec.rb
-- spec/features/order_spec.rb
-- spec/features/products_spec.rb
-- spec/features/promotion_code_invalidation_spec.rb
-- spec/features/quantity_promotions_spec.rb
-- spec/features/taxons_spec.rb
-- spec/features/template_rendering_spec.rb
-- spec/fixtures/thinking-cat.jpg
-- spec/helpers/base_helper_spec.rb
-- 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/images/datepicker/cal.gif
 - vendor/assets/images/flags/ad.png
 - vendor/assets/images/flags/ae.png
@@ -579,13 +509,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: solidus_frontend
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.

data/CHANGELOG.md

@@ -1 +0,0 @@
-## Spree 2.4.0 (unreleased) ##

data/Gemfile

@@ -1,6 +0,0 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
-
-gem 'solidus_core', :path => '../core'
-gem 'solidus_api', :path => '../api'
-
-gemspec

data/Rakefile

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-
-desc "Generates a dummy app for testing"
-task :test_app do
-  ENV['LIB_NAME'] = 'spree/frontend'
-  Rake::Task['common:test_app'].invoke
-end

data/lib/spree/frontend/preference_rescue.rb

@@ -1,25 +0,0 @@
-module Spree
-  class OldPrefs < ActiveRecord::Base
-    self.table_name = "spree_preferences"
-    belongs_to  :owner, :polymorphic => true
-    attr_accessor :owner_klass
-  end
-
-  class PreferenceRescue
-    def self.try
-      OldPrefs.where(:key => nil).each do |old_pref|
-        next unless owner = (old_pref.owner rescue nil)
-        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
-          begin
-            old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
-            old_pref.value_type = owner.preference_type(old_pref.name)
-            puts "Migrating Preference: #{old_pref.key}"
-            old_pref.save
-          rescue NoMethodError => ex
-            puts ex.message
-          end
-        end
-      end
-    end
-  end
-end

data/script/rails

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/frontend/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
-

data/solidus_frontend.gemspec

@@ -1,30 +0,0 @@
-# encoding: UTF-8
-version = File.read(File.expand_path("../../SOLIDUS_VERSION", __FILE__)).strip
-
-Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_frontend'
-  s.version     = version
-  s.summary     = 'Cart and storefront for the Solidus e-commerce project.'
-  s.description = s.summary
-
-  s.required_ruby_version = '>= 2.1.0'
-  s.author      = 'Solidus Team'
-  s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io/'
-  s.rubyforge_project = 'solidus_frontend'
-
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
-
-  s.add_dependency 'solidus_api', version
-  s.add_dependency 'solidus_core', 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_extension_spec.rb

@@ -1,126 +0,0 @@
-require 'spec_helper'
-
-# This test tests the functionality within
-# spree/core/controller_helpers/respond_with.rb
-# Rather than duck-punching the existing controllers, let's define a custom one:
-class Spree::CustomController < Spree::BaseController
-  def index
-    respond_with(Spree::Address.new) do |format|
-      format.html { render :text => "neutral" }
-    end
-  end
-
-  def create
-    # Just need a model with validations
-    # Address is good enough, so let's go with that
-    address = Spree::Address.new(params[:address])
-    respond_with(address)
-  end
-end
-
-describe Spree::CustomController, :type => :controller do
-  after do
-    Spree::CustomController.clear_overrides!
-  end
-
-  before do
-    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-      r.draw {
-        get 'index', to: 'spree/custom#index'
-        post 'create', to: 'spree/custom#create'
-      }
-    end
-  end
-
-  context "extension testing" do
-    context "index" do
-      context "specify symbol for handler instead of Proc" do
-        before do
-          Spree::CustomController.class_eval do
-            respond_override({:index => {:html => {:success => :success_method}}})
-
-            private
-
-            def success_method
-              render :text => 'success!!!'
-            end
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            spree_get :index
-            expect(response).to be_success
-            assert (response.body =~ /success!!!/)
-          end
-        end
-      end
-
-      context "render" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_override({:index => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
-            respond_override({:index => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            spree_get :index
-            expect(response).to be_success
-            assert (response.body =~ /success!!!/)
-          end
-        end
-      end
-
-      context "redirect" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_override({:index => {:html => {:success => lambda { redirect_to('/cart') }}}})
-            respond_override({:index => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            spree_get :index
-            expect(response).to be_redirect
-          end
-        end
-      end
-
-      context "validation error" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_to :html
-            respond_override({:create => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
-            respond_override({:create => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
-          end
-        end
-
-        describe "POST" do
-          it "has value success" do
-            spree_post :create
-            expect(response).to be_success
-            assert (response.body =~ /success!/)
-          end
-        end
-      end
-
-      context 'A different controllers respond_override. Regression test for #1301' do
-        before do
-          Spree::CheckoutController.instance_eval do
-            respond_override({:index => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
-          end
-        end
-
-        describe "POST" do
-          it "should not effect the wrong controller" do
-            spree_get :index
-            assert (response.body =~ /neutral/)
-          end
-        end
-      end
-    end
-  end
-end