spree_frontend 2.4.10 → 3.0.0.rc1

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

@@ -1,5 +1,5 @@
 //= require jquery.validate/jquery.validate.min
 //= require spree
+//= require spree/frontend/cart
 //= require spree/frontend/checkout
 //= require spree/frontend/product
-//= require spree/frontend/cart

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

@@ -67,11 +67,11 @@ Spree.ready ($) ->
             url: url,
             success: (data) ->
               coupon_code_field.val('')
-              coupon_status.addClass("success").html("Coupon code applied successfully.")
+              coupon_status.addClass("alert-success").html("Coupon code applied successfully.")
               return true
             error: (xhr) ->
               handler = JSON.parse(xhr.responseText)
-              coupon_status.addClass("error").html(handler["error"])
+              coupon_status.addClass("alert-error").html(handler["error"])
               $('.continue').attr('disabled', false)
               return false
           })

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

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

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

@@ -1,61 +1,4 @@
-/*--------------------------------------*/
-/* Colors
-/*--------------------------------------*/
-$c_green:       #8dba53 !default;  /* Spree green    */
-$c_red:         #e45353 !default;  /* Error red      */
-
-$layout_background_color:   #FFFFFF !default;
-$title_text_color:          #404042 !default;
-$body_text_color:           #404042 !default;
-$link_text_color:           #00ADEE !default;
-
-$product_background_color:  #FFFFFF !default;
-$product_title_text_color:  #404042 !default;
-$product_body_text_color:   #404042 !default;
-$product_link_text_color:   #BBBBBB !default;
-
-/*--------------------------------------*/
-/* Fonts import from remote
-/*--------------------------------------*/
-@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
-
-/*--------------------------------------*/
-/* Font families
-/*--------------------------------------*/
-$ff_base:       'Ubuntu', sans-serif !default;
-
-/*--------------------------------------
-  | Font sizes
-  |--------------------------------------
-  |- Navigation                         
-  |                                    */
-      $header_navigation_font_size:           14px !default;
-      $horizontal_navigation_font_size:       16px !default;
-      $main_navigation_header_font_size:      14px !default;
-      $main_navigation_font_size:             12px !default;
-/*|------------------------------------
-  |- Product Listing                         
-  |                                  */
-      $product_list_name_font_size:           12px !default;
-      $product_list_price_font_size:          16px !default;
-      $product_list_header_font_size:         20px !default;
-      $product_list_search_font_size:         14px !default;
-/*|------------------------------------
-  |- Product Details
-  |                                  */
-      $product_detail_name_font_size:         24px !default;
-      $product_detail_description_font_size:  12px !default;
-      $product_detail_price_font_size:        20px !default;
-      $product_detail_title_font_size:        14px !default;
-/*|------------------------------------
-  |- Basic
-  |                                  */
-      $heading_font_size:                     24px !default;
-      $sub_heading_font_size:                 14px !default;
-      $button_font_size:                      12px !default;
-      $input_box_font_size:                   13px !default;
-      $base_font_size:                        12px !default;
-      $border_color:                          lighten($body_text_color, 60) !default;
-      $default_border:                        1px solid $border_color !default;
-      $button_border_color:                   rgba(0, 138, 189, .75) !default;
-      $table_head_color:                      lighten($body_text_color, 60) !default;
+/*--------------------------------
+  Colors
+--------------------------------*/
+$brand-primary: #1c5c92;

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

@@ -0,0 +1,102 @@
+//Add your custom bootstrap variables here, see https://github.com/twbs/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/_variables.scss for full list of variables.
+
+@import "bootstrap-sprockets";
+@import "variables";
+@import "bootstrap";
+
+// -- Spree Custom Header and Footer ---------------------
+#spree-header {
+  background: $brand-primary asset-url('spree_header.jpg') center center;
+  background-size: cover;
+  margin-bottom: $line-height-computed;
+
+  #header {
+    background: rgba($gray-darker, 0.4);
+    padding: $line-height-computed 0;
+  }
+
+  #logo {
+    margin-bottom: 10px;
+
+    img {
+      width: 306px;
+    }
+  }
+
+  .nav a {
+    color: white;
+
+    &:hover, &:focus {
+      background: rgba($gray-darker, 0.4);
+    }
+  }
+
+  .navbar {
+    border: 0;
+    margin-bottom: 0;
+  }
+}
+
+#spree-footer {
+  background: $gray-dark;
+  padding-top: $padding-base-horizontal;
+  margin-top: $line-height-computed;
+  color: white;
+}
+
+// -- Spree Layout Custom Rules -------------------------
+
+.alert-notice { @extend .alert-success; }
+.alert-error, .alert-registration_error { @extend .alert-danger; }
+.alert-alert { @extend .alert-info; }
+
+.product-body {
+  height: 170px;
+}
+
+.progress-steps {
+  margin-top: $line-height-computed;
+}
+
+h1 {
+  margin-bottom: 30px;
+}
+
+// Center cart line items
+table {
+  &.table > tbody > tr {
+    &.line-item td, &.stock-item td {
+      vertical-align: middle;
+    }
+  }
+
+  &#line-items {
+    > tbody, > tfoot {
+      > tr > td {
+        vertical-align: middle;
+
+        &.order-qty {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+
+// Footer links
+#footer-left a {
+  color: lighten($brand-primary, 20);
+
+  &:hover {
+    color: lighten($brand-primary, 10);
+  }
+}
+
+// Updated credit-card image
+#credit-card-image {
+  margin-top: -10px;
+}
+
+.existing-credit-card-list td {
+  padding: 5px;
+}

data/app/controllers/spree/checkout_controller.rb

@@ -4,11 +4,9 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
-    ssl_required
-
     before_action :load_order_with_lock
-    before_action :ensure_valid_state_lock_version, only: [:update]
-    before_action :set_state_if_present
+    before_filter :ensure_valid_state_lock_version, only: [:update]
+    before_filter :set_state_if_present
 
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed
@@ -48,22 +46,35 @@ module Spree
     end
 
     private
-      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
 
-        # Fix for #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
+    def unknown_state?
+      (params[:state] && !@order.has_checkout_step?(params[:state])) ||
+        (!params[:state] && !@order.has_checkout_step?(@order.state))
+    end
+
+    def insufficient_payment?
+      params[:state] == "confirm" &&
+        @order.payment_required? &&
+        @order.payments.valid.sum(:amount) != @order.total
+    end
+
+    def correct_state
+      if unknown_state?
+        @order.checkout_steps.first
+      elsif insufficient_payment?
+        'payment'
+      else
+        @order.state
       end
+    end
+
+    def ensure_valid_state
+      if @order.state != correct_state && !skip_state_validation?
+        flash.keep
+        @order.state = correct_state
+        redirect_to checkout_state_path(@order.state)
+      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
@@ -113,8 +124,8 @@ module Spree
       end
 
       # Provides a route to redirect after order completion
-      def completion_route
-        spree.order_path(@order)
+      def completion_route(custom_params = nil)
+        spree.order_path(@order, custom_params)
       end
 
       def setup_for_current_state
@@ -143,13 +154,6 @@ module Spree
           @differentiator.missing.each do |variant, quantity|
             @order.contents.remove(variant, quantity)
           end
-
-          # @order.contents.remove did transitively call reload in the past.
-          # Hiding the fact that the machine advanced already to "payment" state.
-          #
-          # As an intermediary step to optimize reloads out of high volume code path
-          # the reload was lifted here and will be removed by later passes.
-          @order.reload
         end
 
         if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)