spree_frontend 2.1.12 → 2.2.0

data/app/controllers/spree/products_controller.rb

@@ -1,8 +1,6 @@
 module Spree
   class ProductsController < Spree::StoreController
     before_filter :load_product, :only => :show
-    before_filter :load_taxon, :only => :index
-
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
 
@@ -11,6 +9,7 @@ module Spree
     def index
       @searcher = build_searcher(params)
       @products = @searcher.retrieve_products
+      @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 
     def show
@@ -18,20 +17,7 @@ module Spree
 
       @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
-
-      referer = request.env['HTTP_REFERER']
-      if referer
-        begin
-          referer_path = URI.parse(request.env['HTTP_REFERER']).path
-          # Fix for #2249
-        rescue URI::InvalidURIError
-          # Do nothing
-        else
-          if referer_path && referer_path.match(/\/t\/(.*)/)
-            @taxon = Spree::Taxon.find_by_permalink($1)
-          end
-        end
-      end
+      @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]
     end
 
     private
@@ -41,14 +27,11 @@ module Spree
 
       def load_product
         if try_spree_current_user.try(:has_spree_role?, "admin")
-          @product = Product.with_deleted.find_by_permalink!(params[:id])
+          @products = Product.with_deleted
         else
-          @product = Product.active(current_currency).find_by_permalink!(params[:id])
+          @products = Product.active(current_currency)
         end
-      end
-
-      def load_taxon
-        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+        @product = @products.friendly.find(params[:id])
       end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -6,7 +6,30 @@ module Spree
       render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
     end
 
+    def cart_link
+      render :partial => 'spree/shared/link_to_cart'
+      fresh_when(simple_current_order)
+    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
+        end
+      end
+
       def config_locale
         Spree::Frontend::Config[:locale]
       end

data/app/controllers/spree/taxons_controller.rb

@@ -11,6 +11,7 @@ module Spree
 
       @searcher = build_searcher(params.merge(:taxon => @taxon.id))
       @products = @searcher.retrieve_products
+      @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 
     private

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

@@ -20,8 +20,10 @@
   </fieldset>
 </div>
 <hr class="clear" />
+
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+
   <span data-hook="save_user_address">
     &nbsp; &nbsp;
     <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>

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

@@ -37,7 +37,7 @@
 
           <h5 class="stock-shipping-method-title"><%= Spree.t(:shipping_method) %></h5>
           <ul class="field radios shipping-methods">
-            <% ship_form.object.shipping_rates.each do |rate| %>
+            <% ship_form.object.shipping_rates.with_shipping_method.each do |rate| %>
               <li class="shipping-method">
                 <label>
                   <%= ship_form.radio_button :selected_shipping_rate_id, rate.id %>

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

@@ -22,12 +22,10 @@
       <% end %>
     </ul>
     <br style="clear:both;" />
-    <% if Spree::Promotion.with_code.count > 0 %>
-      <p class='field' data-hook='coupon_code'>
-        <%= form.label :coupon_code %><br />
-        <%= form.text_field :coupon_code %>
-      </p>
-    <% end %>
+    <p class='field' data-hook='coupon_code'>
+      <%= form.label :coupon_code %><br />
+      <%= form.text_field :coupon_code %>
+    </p>
   </div>
 </fieldset>
 

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

@@ -6,28 +6,54 @@
       <td><strong><%= Spree.t(:item_total) %>:</strong></td>
       <td><strong><%= order.display_item_total.to_html %></strong></td>
     </tr>
-    <tbody id="summary-order-charges" data-hook>
-      <% order.adjustments.eligible.each do |adjustment| %>
-      <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-        <tr>
-          <td><%= adjustment.label %>: </td>
-          <td><%= adjustment.display_amount.to_html %></td>
+
+    <% if order.line_item_adjustments.exists? %>
+      <tbody data-hook="order_details_promotion_adjustments">
+        <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <tr class="total">
+            <td><%= label %></td>
+            <td><%= Spree::Money.new(adjustments.sum(&:amount)).to_html %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    <% end %>
+
+    <tbody data-hook="order_details_tax_adjustments">
+      <% order.all_adjustments.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr class="total">
+          <td><%= label %></td>
+          <td><%= Spree::Money.new(adjustments.sum(&:amount)).to_html %></td>
         </tr>
       <% end %>
     </tbody>
-    <tr data-hook="order_total">
-      <td><strong><%= Spree.t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= order.display_total.to_html %></span></strong></td>
-    </tr>
-    <% if order.line_item_adjustment_totals.present? %>
-      <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% order.line_item_adjustment_totals.each do |label, total| %>
+
+    <% if order.checkout_steps.include?("delivery") %>
+      <tr data-hook="shipping_total">
+      <% if order.shipment_total > 0 %>
+        <td><%= Spree.t(:shipping_total) %></td>
+        <td><%= Spree::Money.new(order.shipment_total).to_html %></td>
+      <% else %>
+        <td><strong><%= Spree.t(:free_shipping) %></strong></td>
+        <td><%= Spree.t(:free_shipping_amount) %></td>
+      <% end %>
+      </tr>
+    <% end %>
+
+    <% if order.adjustments.eligible.exists? %>
+      <tbody id="summary-order-charges" data-hook>
+        <% order.adjustments.eligible.each do |adjustment| %>
+        <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr class="total">
-            <td><strong><%= label %></strong></td>
-            <td><strong><span><%= total.to_html %></span></strong></td>
+            <td><%= adjustment.label %>: </td>
+            <td><%= adjustment.display_amount.to_html %></td>
           </tr>
         <% end %>
       </tbody>
     <% end %>
+
+    <tr data-hook="order_total">
+      <td><strong><%= Spree.t(:order_total) %>:</strong></td>
+      <td><strong><span id='summary-order-total'><%= order.display_total.to_html %></span></strong></td>
+    </tr>
   </tbody>
 </table>

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

@@ -24,9 +24,13 @@
       </div>
     <% end %>
   </div>
-
 </div>
 
+<script>
+Spree.current_order_id = "<%= @order.number %>"
+Spree.current_order_token = "<%= @order.token %>"
+</script>
+
 <% if I18n.locale != :en %>
-  <script src="<%= assets_prefix %>/jquery.validate/localization/messages_<%= I18n.locale.to_s.downcase.gsub("-", "") %>.js"></script>
+  <script src="<%= assets_prefix %>/jquery.validate/localization/messages_<%= I18n.locale %>.js"></script>
 <% end %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -1,6 +1,11 @@
 <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
+<p class="field">
+  <%= label_tag "name_on_card_#{payment_method.id}", Spree.t(:name_on_card) %><span class="required">*</span><br />
+  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}"} %>
+</p>
+
 <p class="field" data-hook="card_number">
   <%= label_tag "card_number", Spree.t(:card_number) %><span class="required">*</span><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
@@ -12,10 +17,12 @@
     )
   </span>
 </p>
+
 <p class="field" data-hook="card_expiration">
   <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
   <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required cardExpiry", :placeholder => "MM / YY" %>
 </p>
+
 <p class="field" data-hook="card_code">
   <%= label_tag "card_code", Spree.t(:card_code) %><span class="required">*</span><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required cardCode', :size => 5) %>
@@ -23,6 +30,3 @@
 </p>
 
 <%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
-
-<%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
-<%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

data/app/views/spree/content/test.html.erb

@@ -0,0 +1 @@
+Nothing to see here. Move along now.

data/app/views/spree/home/index.html.erb

@@ -5,6 +5,8 @@
 <% end %>
 
 <div data-hook="homepage_products">
-  <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
+  <% cache(cache_key_for_products) do %>
+    <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
+  <% end %>
 </div>
 

data/app/views/spree/orders/_adjustment_row.html.erb

@@ -0,0 +1,6 @@
+<tr class="adjustment">
+  <td colspan="4" align='right'><h5><%= type %>: <%= label %></h5></td>
+  <td colspan='2'>
+    <h5><%= Spree::Money.new(adjustments.sum(&:amount), :currency => @order.currency) %></h5>
+  </td>
+</tr>

data/app/views/spree/orders/_adjustments.html.erb

@@ -1,14 +1,24 @@
-<thead>
-  <tr data-hook="cart_adjustments_headers">
-    <th class="cart-adjustment-header" colspan="6"><%= Spree.t(:order_adjustments) %></th>
-  </tr>
-</thead>
 <tbody id="cart_adjustments" data-hook>
-  <% @order.adjustments.eligible.each do |adjustment| %>
+  <% if @order.line_item_adjustments.exists? %>
+    <% @order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+      <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:promotion) %>
+    <% end %>
+  <% end %>
+
+  <% @order.all_adjustments.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:tax) %>
+  <% end %>
+
+  <% @order.shipments.each do |shipment| %>
     <tr>
-      <td colspan="4"><%= adjustment.label %></td>
-      <td><%= adjustment.display_amount.to_html %></td>
-      <td></td>
+      <td colspan="4" align='right'><h5><%= Spree.t(:shipping) %>: <%= shipment.shipping_method.name %></h5></td>
+      <td colspan='2'>
+        <h5><%= shipment.display_discounted_cost %></h5>
+      </td>
     </tr>
   <% end %>
+
+  <% @order.adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
+    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:adjustment) %>
+  <% end %>
 </tbody>

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

@@ -12,5 +12,17 @@
   <tbody id="line_items" data-hook>
     <%= render partial: 'line_item', collection: order_form.object.line_items, locals: {order_form: order_form} %>
   </tbody>
-  <%= render "spree/orders/adjustments" unless @order.adjustments.eligible.blank? %>
+  <% if @order.adjustments.exists? || @order.line_item_adjustments.exists? || @order.shipment_adjustments.exists? %>
+    <tr class="cart-subtotal">
+      <td colspan="4" align='right'><h5><%= Spree.t(:cart_subtotal, :count => @order.line_items.sum(:quantity)) %></h5></th>
+      <td colspan><h5><%= order_form.object.display_item_total %></h5></td>
+      <td></td>
+    </tr>
+    <%= render "spree/orders/adjustments" %>
+  <% end %>
+  <tr class="cart-total">
+    <td colspan="4" align='right'><h5><%= Spree.t(:total) %></h5></th>
+    <td colspan><h5><%= order_form.object.display_total %></h5></td>
+    <td></td>
+  </tr>
 </table>

data/app/views/spree/orders/_line_item.html.erb

@@ -11,7 +11,7 @@
     <td class="cart-item-description" data-hook="cart_item_description">
       <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
       <%= variant.options_text %>
-      <% if line_item.insufficient_stock? %>
+      <% if @order.insufficient_stock_lines.include? line_item %>
         <span class="out-of-stock">
           <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
         </span>

data/app/views/spree/orders/edit.html.erb

@@ -18,31 +18,27 @@
         <%= render :partial => 'form', :locals => { :order_form => order_form } %>
       </div>
 
-        <div id="subtotal" data-hook class="columns sixteen alpha omega">
-          <h5><%= Spree.t(:subtotal) %>: <span class="order-total"><%= @order.display_total.to_html %></span></h5>
-        </div>
-
-        <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
-          <%= order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code) %>
-          <%= button_tag :class => 'primary', :id => 'update-button' do %>
-            <%= Spree.t(:update) %>
-          <% end %>
-          <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
-            <%= Spree.t(:checkout) %>
-          <% end %>
-        </div>
+      <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
+        <%= order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code) %>
+        <%= button_tag :class => 'primary', :id => 'update-button' do %>
+          <%= Spree.t(:update) %>
+      <% end %>
+        <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
+          <%= Spree.t(:checkout) %>
+      <% end %>
       </div>
     </div>
   <% end %>
+  </div>
 
   <div id="empty-cart" data-hook>
     <%= form_tag empty_cart_path, :method => :put do %>
       <p id="clear_cart_link" data-hook>
-        <%= submit_tag Spree.t(:empty_cart), :class => 'button gray' %>
-        <%= Spree.t(:or) %>
-        <%= link_to Spree.t(:continue_shopping), products_path, :class => 'continue button gray' %>
-      </p>
-    <% end %>
+    <%= submit_tag Spree.t(:empty_cart), :class => 'button gray' %>
+    <%= Spree.t(:or) %>
+    <%= link_to Spree.t(:continue_shopping), products_path, :class => 'continue button gray' %>
+    </p>
+  <% end %>
   </div>
 
   <% end %>

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

@@ -0,0 +1,15 @@
+<% source = payment.source %>
+<% if source.is_a?(Spree::CreditCard) %>
+  <span class="cc-type">
+    <% unless (cc_type = source.cc_type).blank? %>
+      <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
+    <% end %>
+    <% if source.last_digits %>
+      <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+    <% end %>
+  </span>
+  <br />
+  <span class="full-name"><%= source.name %></span>
+<% else %>
+  <%= content_tag(:span, payment.payment_method.name) %>
+<% end %>

data/app/views/spree/products/_cart_form.html.erb

@@ -7,24 +7,26 @@
         <ul>
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "products[#{@product.id}]", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money  %>
-              <label for="<%= ['products', @product.id, variant.id].join('_') %>">
+              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => Spree::Money.new(variant.price, with_currency: true).to_s  %>
+              <%= label_tag "variant_id" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>
                 </span>
                 <% if variant_price variant %>
                   <span class="price diff"><%= variant_price variant %></span>
                 <% end %>
-              </label>
+              <% end %>
             </li>
           <% end%>
         </ul>
       </div>
-    <% end%>
+    <% else %>
+      <%= hidden_field_tag "variant_id", @product.master.id %>
+    <% end %>
 
     <% if @product.price_in(current_currency) and !@product.price.nil? %>
       <div data-hook="product_price" class="columns five <% if !@product.has_variants? %> alpha <% else %> omega <% end %>">
-
+        
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
@@ -34,14 +36,13 @@
             <span itemprop="priceCurrency" content="<%= @product.currency %>"></span>
           </div>
 
-          <% if @product.master.in_stock? %>
+          <% if @product.master.can_supply? %>
             <link itemprop="availability" href="http://schema.org/InStock" />
-          <% end %>
+          <% end %> 
         </div>
 
         <div class="add-to-cart">
-          <%= number_field_tag (@product.variants_and_option_values.any? ? :quantity : "variants[#{@product.master.id}]"),
-            1, :class => 'title', :min => 1 %>
+          <%= number_field_tag :quantity, 1, :class => 'title', :min => 1 %>
           <%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
             <%= Spree.t(:add_to_cart) %>
           <% end %>
@@ -52,6 +53,6 @@
           <br>
           <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
         </div>
-    <% end %>
+    <% end %>    
   </div>
 <% end %>