solidus_frontend 1.2.3 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e875f120357aaa10f87a6402b432178994b778de
-  data.tar.gz: ff5d741b59b823fefcc6b9957b129674684bf128
+  metadata.gz: 557f1380ace494c533f71574c8e3c20d2ebcac9d
+  data.tar.gz: 4ad6870c05f6b1fd2cd8efa05010aff5be01b8ec
 SHA512:
-  metadata.gz: c5b686c9cd37c5ac17ba25f99e703378fa83331ad211bc70b6dfd01384fb4f27458e6a167412c007c34783b4c460f857f19c36d8e8b18f99fa7bac46c0ad71ff
-  data.tar.gz: 7ee3ed72eb625df00e3ae44128d0afab3479e6986794f6236a8be78d87304fc2b81b99ffbfa8db2e72522ae5c288ea222157fe8f197979922b2fd36a8c4bc580
+  metadata.gz: f00ccf8be0e5d04a794867da361945679a1e0983cac928f998ed36354e5a41ca15dc3ed2ea6ebf71f7f6e4515ec9ac2229f52f86e01554a162a56ad1f05dd132
+  data.tar.gz: 0f6ad8ca6f6526e1525326ae87574d15352ad99aa7eb344a11fa5908db7b60b012626c381c4d66148af4cb4865467e48f38165617e2044d534edcc181d83f77f

data/Gemfile

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

data/Rakefile

@@ -6,7 +6,7 @@ require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc "Generates a dummy app for testing"
 task :test_app do

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

@@ -52,7 +52,6 @@ $ ->
         else
           stateSelect.removeClass('required')
           stateSpanRequired.hide()
-        stateSelect.removeClass('hidden')
         stateInput.removeClass('required')
       else
         stateSelect.hide().prop 'disabled', true
@@ -66,7 +65,6 @@ $ ->
           stateInput.removeClass('required')
         statePara.toggle(!!statesRequired)
         stateInput.prop('disabled', !statesRequired)
-        stateInput.removeClass('hidden')
         stateSelect.removeClass('required')
 
     $('#bcountry select').change ->

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

@@ -1,6 +1,5 @@
 /*
-* This is a manifest file that includes stylesheets for spree_frontend 
+* This is a manifest file that includes stylesheets for spree_frontend
  *= require normalize
- *= require skeleton
  *= require spree/frontend/screen
 */

data/app/assets/stylesheets/spree/frontend/_skeleton.scss

@@ -0,0 +1,242 @@
+/*
+* Skeleton V1.2
+* Copyright 2011, Dave Gamache
+* www.getskeleton.com
+* Free to use under the MIT license.
+* http://www.opensource.org/licenses/mit-license.php
+* 6/20/2012
+*/
+
+
+/* Table of Contents
+==================================================
+    #Base 960 Grid
+    #Tablet (Portrait)
+    #Mobile (Portrait)
+    #Mobile (Landscape)
+    #Clearing */
+
+
+
+/* #Base 960 Grid
+================================================== */
+
+    .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
+    .container .column,
+    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
+    .row                                        { margin-bottom: 20px; }
+
+    /* Nested Column Classes */
+    .column.alpha, .columns.alpha               { margin-left: 0; }
+    .column.omega, .columns.omega               { margin-right: 0; }
+
+    /* Base Grid */
+    .container .one.column,
+    .container .one.columns                     { width: 40px;  }
+    .container .two.columns                     { width: 100px; }
+    .container .three.columns                   { width: 160px; }
+    .container .four.columns                    { width: 220px; }
+    .container .five.columns                    { width: 280px; }
+    .container .six.columns                     { width: 340px; }
+    .container .seven.columns                   { width: 400px; }
+    .container .eight.columns                   { width: 460px; }
+    .container .nine.columns                    { width: 520px; }
+    .container .ten.columns                     { width: 580px; }
+    .container .eleven.columns                  { width: 640px; }
+    .container .twelve.columns                  { width: 700px; }
+    .container .thirteen.columns                { width: 760px; }
+    .container .fourteen.columns                { width: 820px; }
+    .container .fifteen.columns                 { width: 880px; }
+    .container .sixteen.columns                 { width: 940px; }
+
+    .container .one-third.column                { width: 300px; }
+    .container .two-thirds.column               { width: 620px; }
+
+    /* Offsets */
+    .container .offset-by-one                   { padding-left: 60px;  }
+    .container .offset-by-two                   { padding-left: 120px; }
+    .container .offset-by-three                 { padding-left: 180px; }
+    .container .offset-by-four                  { padding-left: 240px; }
+    .container .offset-by-five                  { padding-left: 300px; }
+    .container .offset-by-six                   { padding-left: 360px; }
+    .container .offset-by-seven                 { padding-left: 420px; }
+    .container .offset-by-eight                 { padding-left: 480px; }
+    .container .offset-by-nine                  { padding-left: 540px; }
+    .container .offset-by-ten                   { padding-left: 600px; }
+    .container .offset-by-eleven                { padding-left: 660px; }
+    .container .offset-by-twelve                { padding-left: 720px; }
+    .container .offset-by-thirteen              { padding-left: 780px; }
+    .container .offset-by-fourteen              { padding-left: 840px; }
+    .container .offset-by-fifteen               { padding-left: 900px; }
+
+
+
+/* #Tablet (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 768px */
+
+    @media only screen and (min-width: 768px) and (max-width: 959px) {
+        .container                                  { width: 768px; }
+        .container .column,
+        .container .columns                         { margin-left: 10px; margin-right: 10px;  }
+        .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
+        .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
+        .alpha.omega                                { margin-left: 0; margin-right: 0; }
+
+        .container .one.column,
+        .container .one.columns                     { width: 28px; }
+        .container .two.columns                     { width: 76px; }
+        .container .three.columns                   { width: 124px; }
+        .container .four.columns                    { width: 172px; }
+        .container .five.columns                    { width: 220px; }
+        .container .six.columns                     { width: 268px; }
+        .container .seven.columns                   { width: 316px; }
+        .container .eight.columns                   { width: 364px; }
+        .container .nine.columns                    { width: 412px; }
+        .container .ten.columns                     { width: 460px; }
+        .container .eleven.columns                  { width: 508px; }
+        .container .twelve.columns                  { width: 556px; }
+        .container .thirteen.columns                { width: 604px; }
+        .container .fourteen.columns                { width: 652px; }
+        .container .fifteen.columns                 { width: 700px; }
+        .container .sixteen.columns                 { width: 748px; }
+
+        .container .one-third.column                { width: 236px; }
+        .container .two-thirds.column               { width: 492px; }
+
+        /* Offsets */
+        .container .offset-by-one                   { padding-left: 48px; }
+        .container .offset-by-two                   { padding-left: 96px; }
+        .container .offset-by-three                 { padding-left: 144px; }
+        .container .offset-by-four                  { padding-left: 192px; }
+        .container .offset-by-five                  { padding-left: 240px; }
+        .container .offset-by-six                   { padding-left: 288px; }
+        .container .offset-by-seven                 { padding-left: 336px; }
+        .container .offset-by-eight                 { padding-left: 384px; }
+        .container .offset-by-nine                  { padding-left: 432px; }
+        .container .offset-by-ten                   { padding-left: 480px; }
+        .container .offset-by-eleven                { padding-left: 528px; }
+        .container .offset-by-twelve                { padding-left: 576px; }
+        .container .offset-by-thirteen              { padding-left: 624px; }
+        .container .offset-by-fourteen              { padding-left: 672px; }
+        .container .offset-by-fifteen               { padding-left: 720px; }
+    }
+
+
+/*  #Mobile (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 320px */
+
+    @media only screen and (max-width: 767px) {
+        .container { width: 300px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column  { width: 300px; }
+
+        /* Offsets */
+        .container .offset-by-one,
+        .container .offset-by-two,
+        .container .offset-by-three,
+        .container .offset-by-four,
+        .container .offset-by-five,
+        .container .offset-by-six,
+        .container .offset-by-seven,
+        .container .offset-by-eight,
+        .container .offset-by-nine,
+        .container .offset-by-ten,
+        .container .offset-by-eleven,
+        .container .offset-by-twelve,
+        .container .offset-by-thirteen,
+        .container .offset-by-fourteen,
+        .container .offset-by-fifteen { padding-left: 0; }
+
+    }
+
+
+/* #Mobile (Landscape)
+================================================== */
+
+    /* Note: Design for a width of 480px */
+
+    @media only screen and (min-width: 480px) and (max-width: 767px) {
+        .container { width: 420px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column { width: 420px; }
+    }
+
+
+/* #Clearing
+================================================== */
+
+    /* Self Clearing Goodness */
+    .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
+
+    /* Use clearfix class on parent to clear nested columns,
+    or wrap each row of columns in a <div class="row"> */
+    .clearfix:before,
+    .clearfix:after,
+    .row:before,
+    .row:after {
+      content: '\0020';
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0; }
+    .row:after,
+    .clearfix:after {
+      clear: both; }
+    .row,
+    .clearfix {
+      zoom: 1; }
+
+    /* You can also use a <br class="clear" /> to clear columns */
+    .clear {
+      clear: both;
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0;
+    }

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

@@ -4,6 +4,7 @@
 //= depend_on_asset "fontawesome-webfont.svg"
 //= depend_on_asset "spree/frontend/cart.png"
 
+@import 'spree/frontend/skeleton';
 @import 'spree/frontend/variables';
 @import 'font-awesome';
 

data/app/controllers/spree/checkout_controller.rb

@@ -2,7 +2,7 @@ module Spree
   # This is somewhat contrary to standard REST convention since there is not
   # actually a Checkout object. There's enough distinct logic specific to
   # checkout which has nothing to do with updating an order that this approach
-  # is waranted.
+  # is warranted.
   class CheckoutController < Spree::StoreController
     before_filter :load_order
     around_filter :lock_order
@@ -21,7 +21,7 @@ module Spree
 
     helper 'spree/orders'
 
-    rescue_from Spree::Core::GatewayError, :with => :rescue_from_spree_gateway_error
+    rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
 
     # Updates the order and advances to the next state (when possible.)
     def update
@@ -34,7 +34,7 @@ module Spree
         end
         if !success
           flash[:error] = @order.errors.full_messages.join("\n")
-          redirect_to checkout_state_path(@order.state) and return
+          redirect_to(checkout_state_path(@order.state)) && return
         end
 
         if @order.completed?
@@ -52,124 +52,124 @@ module Spree
 
     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
+    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)
+    def massaged_params
+      massaged_params = params.deep_dup
 
-        massaged_params
-      end
+      move_payment_source_into_payments_attributes(massaged_params)
+      move_existing_card_into_payments_attributes(massaged_params)
+      set_payment_parameters_amount(massaged_params, @order)
 
-      def ensure_valid_state
-        unless skip_state_validation?
-          if (params[:state] && !@order.has_checkout_step?(params[:state])) ||
-             (!params[:state] && !@order.has_checkout_step?(@order.state))
-            @order.state = 'cart'
-            redirect_to checkout_state_path(@order.checkout_steps.first)
-          end
-        end
+      massaged_params
+    end
 
-        # 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
-          redirect_to checkout_state_path("payment")
+    def ensure_valid_state
+      unless skip_state_validation?
+        if (params[:state] && !@order.has_checkout_step?(params[:state])) ||
+           (!params[:state] && !@order.has_checkout_step?(@order.state))
+          @order.state = 'cart'
+          redirect_to checkout_state_path(@order.checkout_steps.first)
         end
       end
 
-      # Should be overriden if you have areas of your checkout that don't match
-      # up to a step within checkout_steps, such as a registration step
-      def skip_state_validation?
-        false
+      # 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
+        redirect_to checkout_state_path("payment")
       end
+    end
 
-      def load_order
-        @order = current_order
-        redirect_to spree.cart_path and return unless @order
-      end
+    # Should be overriden if you have areas of your checkout that don't match
+    # up to a step within checkout_steps, such as a registration step
+    def skip_state_validation?
+      false
+    end
 
-      def set_state_if_present
-        if params[:state]
-          redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
-          @order.state = params[:state]
-        end
-      end
+    def load_order
+      @order = current_order
+      redirect_to(spree.cart_path) && return unless @order
+    end
 
-      def ensure_checkout_allowed
-        unless @order.checkout_allowed?
-          redirect_to spree.cart_path
-        end
+    def set_state_if_present
+      if params[:state]
+        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
+        @order.state = params[:state]
       end
+    end
 
-      def ensure_order_not_completed
-        redirect_to spree.cart_path if @order.completed?
+    def ensure_checkout_allowed
+      unless @order.checkout_allowed?
+        redirect_to spree.cart_path
       end
+    end
 
-      def ensure_sufficient_stock_lines
-        if @order.insufficient_stock_lines.present?
-          flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
-          redirect_to spree.cart_path
-        end
-      end
+    def ensure_order_not_completed
+      redirect_to spree.cart_path if @order.completed?
+    end
 
-      # Provides a route to redirect after order completion
-      def completion_route
-        spree.order_path(@order)
+    def ensure_sufficient_stock_lines
+      if @order.insufficient_stock_lines.present?
+        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
+        redirect_to spree.cart_path
       end
+    end
 
-      def setup_for_current_state
-        method_name = :"before_#{@order.state}"
-        send(method_name) if respond_to?(method_name, true)
-      end
+    # Provides a route to redirect after order completion
+    def completion_route
+      spree.order_path(@order)
+    end
 
-      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
-        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 setup_for_current_state
+      method_name = :"before_#{@order.state}"
+      send(method_name) if respond_to?(method_name, true)
+    end
 
-      def before_delivery
-        return if params[:order].present?
+    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
+      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
 
-        packages = @order.shipments.map { |s| s.to_package }
-        @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-      end
+    def before_delivery
+      return if params[:order].present?
 
-      def before_payment
-        if @order.checkout_steps.include? "delivery"
-          packages = @order.shipments.map { |s| s.to_package }
-          @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-          @differentiator.missing.each do |variant, quantity|
-            @order.contents.remove(variant, quantity)
-          end
-        end
+      packages = @order.shipments.map(&:to_package)
+      @differentiator = Spree::Stock::Differentiator.new(@order, packages)
+    end
 
-        if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
-          @payment_sources = try_spree_current_user.payment_sources
+    def before_payment
+      if @order.checkout_steps.include? "delivery"
+        packages = @order.shipments.map(&:to_package)
+        @differentiator = Spree::Stock::Differentiator.new(@order, packages)
+        @differentiator.missing.each do |variant, quantity|
+          @order.contents.remove(variant, quantity)
         end
       end
 
-      def rescue_from_spree_gateway_error(exception)
-        flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
-        @order.errors.add(:base, exception.message)
-        render :edit
+      if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
+        @payment_sources = try_spree_current_user.payment_sources
       end
+    end
 
-      def check_authorization
-        authorize!(:edit, current_order, cookies.signed[:guest_token])
-      end
+    def rescue_from_spree_gateway_error(exception)
+      flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
+      @order.errors.add(:base, exception.message)
+      render :edit
+    end
+
+    def check_authorization
+      authorize!(:edit, current_order, cookies.signed[:guest_token])
+    end
   end
 end