spree_frontend 3.0.10 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36132541fc4c24b3a7c39be34f76b10348e1be01
-  data.tar.gz: f66b03dd73386f46a4d29835abdf11c96d7e6ed2
+  metadata.gz: 476c86ca526f2cbbaa444efe63433692a4b1e85a
+  data.tar.gz: 4c266c5c163e900eb963520eb45b8ece0419f1d2
 SHA512:
-  metadata.gz: bcb2b4b6939b7c309f289da9dc7a9e7b40e968b98d4cc06c3ba147b68bfd75b2d46c44c88bc4c2364ba61f46e08141c800beea53b20040ba58bfa320b03ae75b
-  data.tar.gz: bb896bec91bb4b943062aa420c91e787865c7ae8cc57f31ec84b3d58615247632a5b5372edfe6b380e59cc3420d0b7a71fdaae65d38671b4f6ee2caf4269ae57
+  metadata.gz: 40324361f62b2e6b5c932596e18293106b1cbcead6ccefbe6ffb4a9137b03b8c98625ebc14b4f54c72606bae952aa1076f9101f2cb7d45fc452baad531b0d22b
+  data.tar.gz: 40b9d62c3b995eed1223c5c5667ff7f7273958cb25e2cd57753ba814e5c7a211d71866f511011ca000f5327f64982f5c9312d039a2ce1f2ecb7306180b2c6d27

data/README.md

@@ -29,7 +29,7 @@ This stays as closely to the original spree frontend markup as possible. Helper
 Customizing
 -------
 
-Override the stylesheet to `apps/assets/stylesheets/spree/frontend/frontend_bootstrap.css.scss`. Use this as your base stylesheet and edit as required.
+Override the stylesheet to `vendor/assets/stylesheets/spree/frontend/frontend_bootstrap.css.scss`. Use this as your base stylesheet and edit as required.
 
 To style your spree store just override the bootstrap 3 variables. The full list of bootstrap variables can be found [here](https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_variables.scss). You can override these by simply redefining the variable before the `@import` directive.
 For example:

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

@@ -1,6 +1,9 @@
 //= require bootstrap-sprockets
+//= require jquery.payment
 //= require jquery.validate/jquery.validate.min
 //= require spree
 //= require spree/frontend/cart
 //= require spree/frontend/checkout
+//= require spree/frontend/checkout/address
+//= require spree/frontend/checkout/payment
 //= require spree/frontend/product

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

@@ -1,11 +1,16 @@
-//= require jquery.payment
-//= require_self
-//= require spree/frontend/checkout/address
-//= require spree/frontend/checkout/payment
-
 Spree.disableSaveOnClick = ->
-  ($ 'form.edit_order').submit ->
-    ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
+  ($ 'form.edit_order').on('submit', (e) ->
+    if (($ this).data('submitted') == true)
+      # Previously submitted, don't submit again
+      e.preventDefault()
+    else
+      # Mark it so that the next submit gets ignored
+      ($ this).data('submitted', true)
+      ($ this).find(':submit, :image').removeClass('primary').addClass 'disabled'
+  )
+
+Spree.enableSave = ->
+  ($ 'form.edit_order').data('submitted', false).find(':submit, :image').attr('disabled', false).addClass('primary').removeClass 'disabled'
 
 Spree.ready ($) ->
   Spree.Checkout = {}

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

@@ -40,7 +40,7 @@ Spree.ready ($) ->
       # i.e. if user enters invalid data
       ($ 'input[type="radio"]:checked').click()
 
-      $('#checkout_form_payment').submit ->
+      $('#checkout_form_payment').submit (event) ->
         # Coupon code application may take a number of seconds.
         # Informing the user that this is happening is a good way to indicate some progress to them.
         # In addition to this, if the coupon code FAILS then they don't lose their just-entered payment data.
@@ -65,14 +65,16 @@ Spree.ready ($) ->
             async: false,
             method: "PUT",
             url: url,
-            success: (data) ->
+            success: (data) =>
               coupon_code_field.val('')
               coupon_status.addClass("alert-success").html("Coupon code applied successfully.")
+              @submit()
               return true
             error: (xhr) ->
               handler = JSON.parse(xhr.responseText)
               coupon_status.addClass("alert-error").html(handler["error"])
-              $('.continue').attr('disabled', false)
+              Spree.enableSave()
+              event.preventDefault()
               return false
           })
 

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

@@ -33,15 +33,22 @@ Spree.ready ($) ->
   Spree.updateVariantPrice = (variant) ->
     variantPrice = variant.data('price')
     ($ '.price.selling').text(variantPrice) if variantPrice
+
+  Spree.disableCartForm = (variant) ->
+    inStock = variant.data('in-stock')
+    $('#add-to-cart-button').attr('disabled', !inStock)
+
   radios = ($ '#product-variants input[type="radio"]')
 
   if radios.length > 0
     selectedRadio = ($ '#product-variants input[type="radio"][checked="checked"]')
     Spree.showVariantImages selectedRadio.attr('value')
     Spree.updateVariantPrice selectedRadio
+    Spree.disableCartForm selectedRadio
 
-  Spree.addImageHandlers()
+    radios.click (event) ->
+      Spree.showVariantImages @value
+      Spree.updateVariantPrice ($ this)
+      Spree.disableCartForm ($ this)
 
-  radios.click (event) ->
-    Spree.showVariantImages @value
-    Spree.updateVariantPrice ($ this)
+  Spree.addImageHandlers()

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

@@ -2,5 +2,4 @@
 * 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/frontend_bootstrap.css.scss

@@ -1,4 +1,4 @@
-//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.
+//Add your custom bootstrap variables here, see https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_variables.scss for full list of variables.
 
 @import "bootstrap-sprockets";
 @import "variables";
@@ -19,7 +19,7 @@
     margin-bottom: 10px;
 
     img {
-      width: 306px;
+      width: 100%;
     }
   }
 

data/app/controllers/spree/checkout_controller.rb

@@ -18,6 +18,7 @@ module Spree
     before_action :apply_coupon_code
 
     before_action :setup_for_current_state
+    before_action :add_store_credit_payments, only: [:update]
 
     helper 'spree/orders'
 
@@ -71,7 +72,7 @@ module Spree
     def ensure_valid_state
       if @order.state != correct_state && !skip_state_validation?
         flash.keep
-        @order.state = correct_state
+        @order.update_column(:state, correct_state)
         redirect_to checkout_state_path(@order.state)
       end
     end
@@ -163,6 +164,21 @@ module Spree
       end
     end
 
+    def add_store_credit_payments
+      if params.has_key?(:apply_store_credit)
+        @order.add_store_credit_payments
+
+        # Remove other payment method parameters.
+        params[:order].delete(:payments_attributes)
+        params.delete(:payment_source)
+
+        # Return to the Payments page if additional payment is needed.
+        if @order.payments.valid.sum(:amount) < @order.total
+          redirect_to checkout_state_path(@order.state) and return
+        end
+      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)

data/app/controllers/spree/home_controller.rb

@@ -5,7 +5,7 @@ module Spree
 
     def index
       @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products
+      @products = @searcher.retrieve_products.includes(:possible_promotions)
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
   end

data/app/controllers/spree/orders_controller.rb

@@ -10,7 +10,7 @@ module Spree
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
-      @order = Order.find_by_number!(params[:id])
+      @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by_number!(params[:id])
     end
 
     def update
@@ -32,7 +32,9 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+      @order = current_order || Order.incomplete.
+                                  includes(line_items: [variant: [:images, :option_values, :product]]).
+                                  find_or_initialize_by(guest_token: cookies.signed[:guest_token])
       associate_user
     end
 

data/app/controllers/spree/products_controller.rb

@@ -10,14 +10,17 @@ module Spree
 
     def index
       @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products
+      @products = @searcher.retrieve_products.includes(:possible_promotions)
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 
     def show
-      @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
+      @variants = @product.variants_including_master.
+                           spree_base_scopes.
+                           active(current_currency).
+                           includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
-      @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]
+      @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
       redirect_if_legacy_path
     end
 
@@ -37,7 +40,7 @@ module Spree
         else
           @products = Product.active(current_currency)
         end
-        @product = @products.friendly.find(params[:id])
+        @product = @products.includes(:variants_including_master).friendly.find(params[:id])
       end
 
       def load_taxon

data/app/controllers/spree/store_controller.rb

@@ -4,6 +4,10 @@ module Spree
 
     skip_before_action :set_current_order, only: :cart_link
 
+    def forbidden
+      render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403
+    end
+
     def unauthorized
       render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
     end
@@ -14,26 +18,27 @@ module Spree
     end
 
     protected
-      # This method is placed here so that the CheckoutController
-      # and OrdersController can both reference it (or any other controller
-      # which needs it)
-      def apply_coupon_code
-        if params[:order] && params[:order][:coupon_code]
-          @order.coupon_code = params[:order][:coupon_code]
-
-          handler = PromotionHandler::Coupon.new(@order).apply
-
-          if handler.error.present?
-            flash.now[:error] = handler.error
-            respond_with(@order) { |format| format.html { render :edit } } and return
-          elsif handler.success
-            flash[:success] = handler.success
-          end
+
+    # This method is placed here so that the CheckoutController
+    # and OrdersController can both reference it (or any other controller
+    # which needs it)
+    def apply_coupon_code
+      if params[:order] && params[:order][:coupon_code]
+        @order.coupon_code = params[:order][:coupon_code]
+
+        handler = PromotionHandler::Coupon.new(@order).apply
+
+        if handler.error.present?
+          flash.now[:error] = handler.error
+          respond_with(@order) { |format| format.html { render :edit } } and return
+        elsif handler.success
+          flash[:success] = handler.success
         end
       end
+    end
 
-      def config_locale
-        Spree::Frontend::Config[:locale]
-      end
+    def config_locale
+      Spree::Frontend::Config[:locale]
+    end
   end
 end

data/app/controllers/spree/taxons_controller.rb

@@ -17,12 +17,7 @@ module Spree
     private
 
     def accurate_title
-      if @taxon
-        @taxon.seo_title
-      else
-        super
-      end
+      @taxon.try(:seo_title) || super
     end
-
   end
 end

data/app/helpers/spree/frontend_helper.rb

@@ -20,10 +20,11 @@ module Spree
       content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
     end
 
-    def checkout_progress
+    def checkout_progress(numbers: false)
       states = @order.checkout_steps
-      items = states.map do |state|
+      items = states.each_with_index.map do |state, i|
         text = Spree.t("order_state.#{state}").titleize
+        text.prepend("#{i.succ}. ") if numbers
 
         css_classes = []
         current_index = states.index(@order.state)

data/app/helpers/spree/taxons_helper.rb

@@ -4,12 +4,13 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max=4)
-      products = taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
+      products = taxon.active_products.select("spree_products.*, spree_products_taxons.position").limit(max)
       if (products.size < max)
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |taxon|
           to_get = max - products.length
-          products += taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += taxon.active_products.select("spree_products.*, spree_products_taxons.position").
+                      where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

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

@@ -2,33 +2,43 @@
 
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
   <p class="form-group" id=<%="#{address_id}firstname" %>>
-    <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span><br />
+    <%= form.label :firstname do %>
+      <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <%= form.text_field :firstname, :class => 'form-control required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}lastname" %>>
-    <%= form.label :lastname, Spree.t(:last_name) %><span class="required">*</span><br />
+    <%= form.label :lastname do %>
+      <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <%= form.text_field :lastname, :class => 'form-control required' %>
   </p>
   <% if Spree::Config[:company] %>
     <p class="form-group" id=<%="#{address_id}company" %>>
-      <%= form.label :company, Spree.t(:company) %><br />
+      <%= form.label :company, Spree.t(:company) %>
       <%= form.text_field :company, :class => 'form-control' %>
     </p>
   <% end %>
   <p class="form-group" id=<%="#{address_id}address1" %>>
-    <%= form.label :address1, Spree.t(:street_address) %><span class="required">*</span><br />
+    <%= form.label :address1 do %>
+      <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <%= form.text_field :address1, :class => 'form-control  required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}address2" %>>
-    <%= form.label :address2, Spree.t(:street_address_2) %><br />
+    <%= form.label :address2, Spree.t(:street_address_2) %>
     <%= form.text_field :address2, :class => 'form-control' %>
   </p>
   <p class="form-group" id=<%="#{address_id}city" %>>
-    <%= form.label :city, Spree.t(:city) %><span class="required">*</span><br />
+    <%= form.label :city do %>
+      <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <%= form.text_field :city, :class => 'form-control required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}country" %>>
-    <%= form.label :country_id, Spree.t(:country) %><span class="required">*</span><br />
+    <%= form.label :country_id do %>
+      <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <span id=<%="#{address_id}country-selection" %>>
       <%= form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'form-control required'} %>
     </span>
@@ -37,9 +47,11 @@
   <% if Spree::Config[:address_requires_state] %>
     <p class="form-group" id=<%="#{address_id}state" %>>
       <% have_states = !address.country.states.empty? %>
-      <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
+      <%= form.label :state do %>
+        <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
+      <% end %>
 
-      <% state_elements = [
+      <%== state_elements = [
          form.collection_select(:state_id, address.country.states,
                             :id, :name,
                             {:include_blank => true},
@@ -50,9 +62,6 @@
                             :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 => 'form-control required' %>
@@ -60,16 +69,20 @@
   <% end %>
 
   <p class="form-group" id=<%="#{address_id}zipcode" %>>
-    <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><br /><% end %>
+    <%= form.label :zipcode do %>
+      <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
+    <% end %>
     <%= form.text_field :zipcode, :class => "form-control #{'required' if address.require_zipcode?}" %>
   </p>
   <p class="form-group" id=<%="#{address_id}phone" %>>
-    <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><br /><% end %>
+    <%= form.label :phone do %>
+      <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
+    <% end %>
     <%= form.phone_field :phone, :class => "form-control #{'required' if address.require_phone?}" %>
   </p>
   <% if Spree::Config[:alternative_shipping_phone] %>
     <p class="form-group" id=<%="#{address_id}altphone" %>>
-      <%= form.label :alternative_phone, Spree.t(:alternative_phone) %><br />
+      <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
       <%= form.phone_field :alternative_phone, :class => 'form-control' %>
     </p>
   <% end %>

data/app/views/spree/checkout/_payment.html.erb

@@ -9,7 +9,6 @@
         <label for="use_existing_card_yes">
           <%= Spree.t(:use_existing_cc) %>
         </label>
-        <br/>
         <%= radio_button_tag 'use_existing_card', 'no' %>
         <label for="use_existing_card_no">
           <%= Spree.t(:use_new_cc_or_payment_method) %>
@@ -36,6 +35,8 @@
       </div>
     <% end %>
 
+    <%= render partial: 'spree/checkout/payment/storecredit' %>
+
     <ul class="list-group" id="payment-method-fields" data-hook>
       <% @order.available_payment_methods.each do |method| %>
         <li class="list-group-item">
@@ -58,7 +59,7 @@
     </ul>
 
     <p class='field' data-hook='coupon_code'>
-      <%= form.label :coupon_code %><br />
+      <%= form.label :coupon_code %>
       <%= form.text_field :coupon_code, :class => 'form-control' %>
     </p>
   </div>