spree_frontend 2.4.10 → 3.0.0.rc1

data/app/controllers/spree/orders_controller.rb

@@ -1,7 +1,5 @@
 module Spree
   class OrdersController < Spree::StoreController
-    ssl_required :show
-
     before_action :check_authorization
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/products', 'spree/orders'
@@ -9,7 +7,6 @@ module Spree
     respond_to :html
 
     before_action :assign_order_with_lock, only: :update
-    before_action :apply_coupon_code, only: :update
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
@@ -41,14 +38,29 @@ module Spree
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
-      populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
-      if populator.populate(params[:variant_id], params[:quantity], params[:options])
-        respond_with(@order) do |format|
-          format.html { redirect_to cart_path }
+      order    = current_order(create_order_if_necessary: true)
+      variant  = Spree::Variant.find(params[:variant_id])
+      quantity = params[:quantity].to_i
+      options  = (params[:options] || {}).merge(currency: current_currency)
+
+      # 2,147,483,647 is crazy. See issue #2695.
+      if quantity.between?(1, 2_147_483_647)
+        begin
+          order.contents.add(variant, quantity, options)
+        rescue ActiveRecord::RecordInvalid => e
+          error = e.record.errors.full_messages.join(", ")
         end
       else
-        flash[:error] = populator.errors.full_messages.join(" ")
+        error = 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 }
+        end
       end
     end
 

data/app/controllers/spree/store_controller.rb

@@ -5,11 +5,11 @@ module Spree
     skip_before_action :set_current_order, only: :cart_link
 
     def unauthorized
-      render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
+      render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
     end
 
     def cart_link
-      render :partial => 'spree/shared/link_to_cart'
+      render partial: 'spree/shared/link_to_cart'
       fresh_when(simple_current_order)
     end
 
@@ -37,4 +37,3 @@ module Spree
       end
   end
 end
-

data/app/controllers/spree/taxons_controller.rb

@@ -1,12 +1,12 @@
 module Spree
   class TaxonsController < Spree::StoreController
-    rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/products'
 
     respond_to :html
 
     def show
-      @taxon = Taxon.find_by_permalink!(params[:id])
+      @taxon = Taxon.friendly.find(params[:id])
       return unless @taxon
 
       @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))

data/app/helpers/spree/frontend_helper.rb

@@ -0,0 +1,93 @@
+module Spree
+  module FrontendHelper
+    def body_class
+      @body_class ||= content_for?(:sidebar) ? 'two-col' : 'one-col'
+      @body_class
+    end
+    
+    def breadcrumbs(taxon, separator=" ")
+      return "" if current_page?("/") || taxon.nil?
+      separator = raw(separator)
+      crumbs = [content_tag(:li, content_tag(:span, link_to(Spree.t(:home), spree.root_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")]
+      if taxon
+        crumbs << content_tag(:li, content_tag(:span, link_to(Spree.t(:products), products_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(ancestor.name , seo_url(ancestor), itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb") } unless taxon.ancestors.empty?
+        crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon), itemprop: "url"), itemprop: "title"), class: 'active', itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+      else
+        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: "title"), class: 'active', itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+      end
+      crumb_list = content_tag(:ol, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'breadcrumb')
+      content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
+    end
+
+    def checkout_progress
+      states = @order.checkout_steps
+      items = states.map do |state|
+        text = Spree.t("order_state.#{state}").titleize
+
+        css_classes = []
+        current_index = states.index(@order.state)
+        state_index = states.index(state)
+
+        if state_index < current_index
+          css_classes << 'completed'
+          text = link_to text, checkout_state_path(state)
+        end
+
+        css_classes << 'next' if state_index == current_index + 1
+        css_classes << 'active' if state == @order.state
+        css_classes << 'first' if state_index == 0
+        css_classes << 'last' if state_index == states.length - 1
+        # No more joined classes. IE6 is not a target browser.
+        # Hack: Stops <a> being wrapped round previous items twice.
+        if state_index < current_index
+          content_tag('li', text, class: css_classes.join(' '))
+        else
+          content_tag('li', content_tag('a', text), class: css_classes.join(' '))
+        end
+      end
+      content_tag('ul', raw(items.join("\n")), class: 'progress-steps nav nav-pills nav-justified', id: "checkout-step-#{@order.state}")
+    end
+
+    def flash_messages(opts = {})
+      ignore_types = ["order_completed"].concat(Array(opts[:ignore_types]).map(&:to_s) || [])
+
+      flash.each do |msg_type, text|
+        unless ignore_types.include?(msg_type)
+          concat(content_tag :div, text, class: "alert alert-#{msg_type}")
+        end
+      end
+      nil
+    end
+
+    def link_to_cart(text = nil)
+      text = text ? h(text) : Spree.t('cart')
+      css_class = nil
+
+      if simple_current_order.nil? or simple_current_order.item_count.zero?
+        text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{Spree.t('empty')})"
+        css_class = 'empty'
+      else
+        text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
+        css_class = 'full'
+      end
+
+      link_to text.html_safe, spree.cart_path, :class => "cart-info #{css_class}"
+    end
+
+    # helper to determine if its appropriate to show the store menu
+    def store_menu?
+      %w{thank_you}.exclude? params[:action]
+    end
+
+    def taxons_tree(root_taxon, current_taxon, max_level = 1)
+      return '' if max_level < 1 || root_taxon.children.empty?
+      content_tag :div, class: 'list-group' do
+        root_taxon.children.map do |taxon|
+          css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'list-group-item active' : 'list-group-item'
+          link_to(taxon.name, seo_url(taxon), class: css_class) + taxons_tree(taxon, current_taxon, max_level - 1)
+        end.join("\n").html_safe
+      end
+    end
+  end
+end

data/app/helpers/spree/orders_helper.rb

@@ -0,0 +1,16 @@
+require 'truncate_html'
+require 'app/helpers/truncate_html_helper'
+
+module Spree
+  module OrdersHelper
+    include TruncateHtmlHelper
+
+    def truncated_product_description(product)
+      truncate_html(raw(product.description))
+    end
+
+    def order_just_completed?(order)
+      flash[:order_completed] && order.present?
+    end
+  end
+end

data/app/helpers/spree/store_helper.rb

@@ -0,0 +1,10 @@
+# Methods added to this helper will be available to all templates in the frontend.
+module Spree
+  module StoreHelper
+    def cache_key_for_taxons
+      max_updated_at = @taxons.maximum(:updated_at).to_i
+      parts = [@taxon.try(:id), max_updated_at].compact.join("-")
+      "#{I18n.locale}/taxons/#{parts}"
+    end
+  end
+end

data/app/helpers/spree/taxons_helper.rb

@@ -0,0 +1,19 @@
+module Spree
+  module TaxonsHelper
+    # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so
+    # 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)
+      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)
+          break if products.size >= max
+        end
+      end
+      products
+    end
+  end
+end

data/app/models/spree/frontend_configuration.rb

@@ -1,5 +1,5 @@
 module Spree
   class FrontendConfiguration < Preferences::Configuration
-    preference :locale, :string, :default => Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: Rails.application.config.i18n.default_locale
   end
 end

data/app/views/kaminari/twitter-bootstrap-3/_first_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="first">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/twitter-bootstrap-3/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li>

data/app/views/kaminari/twitter-bootstrap-3/_last_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>
+<% end %>

data/app/views/kaminari/twitter-bootstrap-3/_next_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="next_page">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/twitter-bootstrap-3/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/twitter-bootstrap-3/_paginator.html.erb

@@ -0,0 +1,24 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%- pagination_class ||= '' %>
+<%= paginator.render do -%>
+<ul class="pagination <%= pagination_class %>">
+  <%= first_page_tag unless current_page.first? %>
+  <%= prev_page_tag unless current_page.first? %>
+  <% each_page do |page| -%>
+    <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+      <%= page_tag page %>
+    <% elsif !page.was_truncated? -%>
+      <%= gap_tag %>
+    <% end -%>
+  <% end -%>
+  <%= next_page_tag unless current_page.last? %>
+  <%= last_page_tag unless current_page.last? %>
+</ul>
+<% end -%>

data/app/views/kaminari/twitter-bootstrap-3/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="prev">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>
+<% end %>

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

@@ -1,40 +1,40 @@
 <% address_id = address_type.chars.first %>
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <p class="field" id=<%="#{address_id}firstname" %>>
+  <p class="form-group" 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 => 'form-control required' %>
   </p>
-  <p class="field" id=<%="#{address_id}lastname" %>>
+  <p class="form-group" 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, :class => 'form-control required' %>
   </p>
   <% if Spree::Config[:company] %>
-    <p class="field" id=<%="#{address_id}company" %>>
+    <p class="form-group" id=<%="#{address_id}company" %>>
       <%= form.label :company, Spree.t(:company) %><br />
-      <%= form.text_field :company %>
+      <%= form.text_field :company, :class => 'form-control' %>
     </p>
   <% end %>
-  <p class="field" id=<%="#{address_id}address1" %>>
+  <p class="form-group" 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 => 'form-control  required' %>
   </p>
-  <p class="field" id=<%="#{address_id}address2" %>>
+  <p class="form-group" id=<%="#{address_id}address2" %>>
     <%= form.label :address2, Spree.t(:street_address_2) %><br />
-    <%= form.text_field :address2 %>
+    <%= form.text_field :address2, :class => 'form-control' %>
   </p>
-  <p class="field" id=<%="#{address_id}city" %>>
+  <p class="form-group" 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 => 'form-control required' %>
   </p>
-  <p class="field" id=<%="#{address_id}country" %>>
+  <p class="form-group" 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 => 'form-control required'} %>
     </span>
   </p>
 
   <% if Spree::Config[:address_requires_state] %>
-    <p class="field" id=<%="#{address_id}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/>
 
@@ -42,10 +42,10 @@
          form.collection_select(:state_id, address.country.states,
                             :id, :name,
                             {:include_blank => true},
-                            {:class => have_states ? 'required' : 'hidden',
+                            {:class => have_states ? 'form-control required' : 'form-control hidden',
                             :disabled => !have_states}) +
          form.text_field(:state_name,
-                            :class => !have_states ? 'required' : 'hidden',
+                            :class => !have_states ? 'form-control required' : 'form-control hidden',
                             :disabled => have_states)
          ].join.gsub('"', "'").gsub("\n", "")
       %>
@@ -54,22 +54,22 @@
       <% end %>
     </p>
       <noscript>
-        <%= form.text_field :state_name, :class => 'required' %>
+        <%= form.text_field :state_name, :class => 'form-control required' %>
       </noscript>
   <% end %>
 
-  <p class="field" id=<%="#{address_id}zipcode" %>>
+  <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.text_field :zipcode, :class => "#{'required' if address.require_zipcode?}" %>
+    <%= form.text_field :zipcode, :class => "form-control #{'required' if address.require_zipcode?}" %>
   </p>
-  <p class="field" id=<%="#{address_id}phone" %>>
+  <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.phone_field :phone, :class => "#{'required' if address.require_phone?}" %>
+    <%= form.phone_field :phone, :class => "form-control #{'required' if address.require_phone?}" %>
   </p>
   <% if Spree::Config[:alternative_shipping_phone] %>
-    <p class="field" id=<%="#{address_id}altphone" %>>
+    <p class="form-group" id=<%="#{address_id}altphone" %>>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %><br />
-      <%= form.phone_field :alternative_phone %>
+      <%= form.phone_field :alternative_phone, :class => 'form-control' %>
     </p>
   <% end %>
 </div>

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

@@ -1,28 +1,39 @@
-<div class="columns alpha six" data-hook="billing_fieldset_wrapper">
-  <fieldset id="billing" data-hook>
-    <%= form.fields_for :bill_address do |bill_form| %>
-      <legend align="center"><%= Spree.t(:billing_address) %></legend>
-      <%= render :partial => 'spree/address/form', :locals => { :form => bill_form, :address_type => 'billing', :address => @order.bill_address } %>
-    <% end %>
-  </fieldset>
-</div>
+<div class="row">
+  <div class="col-sm-6" data-hook="billing_fieldset_wrapper">
+    <div class="panel panel-default" id="billing" data-hook>
+      <%= form.fields_for :bill_address do |bill_form| %>
+        <div class="panel-heading">
+          <h3 class="panel-title"><%= Spree.t(:billing_address) %></h3>
+        </div>
+        <div class="panel-body">
+          <%= render :partial => 'spree/address/form', :locals => { :form => bill_form, :address_type => 'billing', :address => @order.bill_address } %>
+        </div>
+      <% end %>
+    </div>
+  </div>
 
-<div class="columns omega six" data-hook="shipping_fieldset_wrapper">
-  <fieldset id="shipping" data-hook>
-    <%= form.fields_for :ship_address do |ship_form| %>
-      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-      <p class="field checkbox" data-hook="use_billing">
-        <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
-        <%= label_tag :order_use_billing, Spree.t(:use_billing_address), :id => 'use_billing' %>
-      </p>
-      <%= render :partial => 'spree/address/form', :locals => { :form => ship_form, :address_type => 'shipping', :address => @order.ship_address } %>
-    <% end %>
-  </fieldset>
+  <div class="col-sm-6" data-hook="shipping_fieldset_wrapper">
+    <div class="panel panel-default" id="shipping" data-hook>
+      <%= form.fields_for :ship_address do |ship_form| %>
+        <div class="panel-heading">
+          <h3 class="panel-title"><%= Spree.t(:shipping_address) %></h3>
+        </div>
+        <div class="panel-body">
+          <p class="field checkbox" data-hook="use_billing">
+            <%= label_tag :order_use_billing, :id => 'use_billing' do %>
+              <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
+              <%= Spree.t(:use_billing_address) %>
+            <% end %>
+          </p>
+          <%= render :partial => 'spree/address/form', :locals => { :form => ship_form, :address_type => 'shipping', :address => @order.ship_address } %>
+        </div>
+      <% end %>
+    </div>
+  </div>
 </div>
-<hr class="clear" />
 
-<div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+<div class="well text-right form-buttons" data-hook="buttons">
+  <%= submit_tag Spree.t(:save_and_continue), :class => 'btn btn-lg btn-success' %>
   <% if try_spree_current_user %>
     <span data-hook="save_user_address">
       &nbsp; &nbsp;