solidus_frontend 1.2.3 → 1.3.0.beta1

data/app/controllers/spree/content_controller.rb

@@ -3,7 +3,7 @@ module Spree
     respond_to :html
 
     def cvv
-      render :layout => false
+      render layout: false
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   class OrdersController < Spree::StoreController
     before_action :check_authorization
-    rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/products', 'spree/orders'
 
     respond_to :html
@@ -20,7 +20,7 @@ module Spree
       if @order.contents.update_cart(order_params)
         respond_with(@order) do |format|
           format.html do
-            if params.has_key?(:checkout)
+            if params.key?(:checkout)
               @order.next if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
@@ -76,7 +76,7 @@ module Spree
 
     def accurate_title
       if @order && @order.completed?
-        Spree.t(:order_number, :number => @order.number)
+        Spree.t(:order_number, number: @order.number)
       else
         Spree.t(:shopping_cart)
       end
@@ -95,21 +95,20 @@ module Spree
 
     private
 
-      def order_params
-        if params[:order]
-          params[:order].permit(*permitted_order_attributes)
-        else
-          {}
-        end
+    def order_params
+      if params[:order]
+        params[:order].permit(*permitted_order_attributes)
+      else
+        {}
       end
+    end
 
-      def assign_order
-        @order = current_order
-        unless @order
-          flash[:error] = Spree.t(:order_not_found)
-          redirect_to root_path and return
-        end
+    def assign_order
+      @order = current_order
+      unless @order
+        flash[:error] = Spree.t(:order_not_found)
+        redirect_to(root_path) && return
       end
-
+    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -3,7 +3,7 @@ module Spree
     before_action :load_product, only: :show
     before_action :load_taxon, only: :index
 
-    rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/taxons'
 
     respond_to :html
@@ -15,31 +15,32 @@ module Spree
     end
 
     def show
-      @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
+      @variants = @product.variants_including_master.with_prices(current_pricing_options).includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
       @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]
     end
 
     private
-      def accurate_title
-        if @product
-          @product.meta_title.blank? ? @product.name : @product.meta_title
-        else
-          super
-        end
-      end
 
-      def load_product
-        if try_spree_current_user.try(:has_spree_role?, "admin")
-          @products = Product.with_deleted
-        else
-          @products = Product.active(current_currency)
-        end
-        @product = @products.friendly.find(params[:id])
+    def accurate_title
+      if @product
+        @product.meta_title.blank? ? @product.name : @product.meta_title
+      else
+        super
       end
+    end
 
-      def load_taxon
-        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+    def load_product
+      if try_spree_current_user.try(:has_spree_role?, "admin")
+        @products = Product.with_deleted
+      else
+        @products = Product.available
       end
+      @product = @products.friendly.find(params[:id])
+    end
+
+    def load_taxon
+      @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -1,48 +1,48 @@
 module Spree
   class StoreController < Spree::BaseController
+    include Spree::Core::ControllerHelpers::Pricing
     include Spree::Core::ControllerHelpers::Order
 
     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
 
     private
 
-      # 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 } } && 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
 
-      def lock_order
-        OrderMutex.with_lock!(@order) { yield }
-      rescue Spree::OrderMutex::LockFailed => e
-        flash[:error] = Spree.t(:order_mutex_error)
-        redirect_to spree.cart_path
-      end
+    def lock_order
+      OrderMutex.with_lock!(@order) { yield }
+    rescue Spree::OrderMutex::LockFailed
+      flash[:error] = Spree.t(:order_mutex_error)
+      redirect_to spree.cart_path
+    end
   end
 end
-

data/app/controllers/spree/taxons_controller.rb

@@ -1,6 +1,6 @@
 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
@@ -23,6 +23,5 @@ module Spree
         super
       end
     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/spree/address/_form.html.erb

@@ -39,19 +39,25 @@
       <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
 
       <span class="js-address-fields" style="display: none;">
-        <%= form.collection_select(
-          :state_id, address.country.states, :id, :name,
-          {include_blank: true},
-          {
-            class: have_states ? 'required' : 'hidden',
-            disabled: !have_states
-          }) %>
-        <%= form.text_field(
-          :state_name,
-          class: !have_states ? 'required' : 'hidden',
-          disabled: have_states) %>
+        <%=
+          form.collection_select(
+            :state_id, address.country.states, :id, :name,
+            {:include_blank => true},
+            {
+              class: have_states ? 'required' : '',
+              style: have_states ? '' : 'display: none;',
+              disabled: !have_states
+            })
+          %>
+        <%=
+          form.text_field(
+            :state_name,
+            class: !have_states ? 'required' : '',
+            style: have_states ? 'display: none;' : '',
+            disabled: have_states
+          )
+        %>
       </span>
-
       <noscript>
         <%= form.text_field :state_name, :class => 'required' %>
       </noscript>

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

@@ -13,8 +13,8 @@
     <p data-hook="links">
       <%= link_to Spree.t(:back_to_store), spree.root_path, :class => "button" %>
       <% unless order_just_completed?(@order) %>
-        <% if try_spree_current_user && respond_to?(:spree_account_path) %>
-          <%= link_to Spree.t(:my_account), spree_account_path, :class => "button" %>
+        <% if try_spree_current_user && respond_to?(:account_path) %>
+          <%= link_to Spree.t(:my_account), spree.account_path, :class => "button" %>
         <% end %>
       <% end %>
     </p>

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

@@ -1,13 +1,13 @@
 <%= form_for :order, :url => populate_orders_path do |f| %>
   <div id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
-    <% if @product.variants_and_option_values(current_currency).any? %>
+    <% if @product.variants_and_option_values_for(current_pricing_options).any? %>
       <div id="product-variants" class="columns five alpha">
         <h6 class="product-section-title"><%= Spree.t(:variants) %></h6>
         <ul>
-          <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
+          <% @product.variants_and_option_values_for(current_pricing_options).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money  %>
+              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_for(current_pricing_options)  %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>
@@ -28,7 +28,7 @@
       <%= hidden_field_tag "variant_id", @product.master.id %>
     <% end %>
 
-    <% if @product.price_in(current_currency) and !@product.price.nil? %>
+    <% if @product.price_for(current_pricing_options) and !@product.price.nil? %>
       <div data-hook="product_price" class="columns five <% if !@product.has_variants? %> alpha <% else %> omega <% end %>">
 
         <div id="product-price">
@@ -37,7 +37,7 @@
             <span class="price selling" itemprop="price">
               <%= display_price(@product) %>
             </span>
-            <span itemprop="priceCurrency" content="<%= @product.currency %>"></span>
+            <span itemprop="priceCurrency" content="<%= current_pricing_options.currency %>"></span>
           </div>
 
           <% if @product.master.can_supply? %>

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

@@ -1,4 +1,4 @@
-<% cache [I18n.locale, current_currency, @product] do %>
+<% cache [I18n.locale, current_pricing_options, @product] do %>
   <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
     <% @body_id = 'product-details' %>
 

data/app/views/spree/shared/_google_analytics.html.erb

@@ -18,7 +18,7 @@
         'revenue': '<%= @order.total %>',                                // Grand Total.
         'shipping': '<%= @order.ship_total %>',                                  // Shipping.
         'tax': '<%= @order.tax_total %>',                                        // Tax.
-        'currency': '<%= current_currency %>'                        // local currency code.
+        'currency': '<%= @order.currency %>'                        // local currency code.
       });
       <% @order.line_items.each do |line_item| %>
         ga('ecommerce:addItem', {

data/app/views/spree/shared/_order_details.html.erb

@@ -3,18 +3,18 @@
   <% if order.has_step?("address") %>
 
     <div class="columns alpha four" data-hook="order-bill-address">
-      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h6>
+      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
       <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
     </div>
 
     <% if order.has_step?("delivery") %>
       <div class="columns alpha four" data-hook="order-ship-address">
-        <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h6>
+        <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
         <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
       </div>
 
       <div class="columns alpha four" data-hook="order-shipment">
-        <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless order.completed? %></h6>
+        <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:delivery) unless order.completed? %></h6>
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
             <div>
@@ -28,15 +28,16 @@
     <% end %>
   <% end %>
 
-  <div class="columns omega four">
-    <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless order.completed? %></h6>
-    <div class="payment-info">
-      <% order.payments.valid.each do |payment| %>
-        <%= render payment %><br/>
-      <% end %>
+  <% if order.has_step?("payment") %>
+    <div class="columns omega four">
+      <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:payment) unless order.completed? %></h6>
+      <div class="payment-info">
+        <% order.payments.valid.each do |payment| %>
+          <%= render payment %><br/>
+        <% end %>
+      </div>
     </div>
-  </div>
-
+  <% end %>
 </div>
 
 <hr />

data/app/views/spree/shared/_products.html.erb

@@ -26,13 +26,13 @@
     <% products.each do |product| %>
       <% url = spree.product_path(product, taxon_id: @taxon.try(:id)) %>
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", name: "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
-        <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
+        <% cache(@taxon.present? ? [I18n.locale, current_pricing_options, @taxon, product] : [I18n.locale, current_pricing_options, product]) do %>
           <div class="product-image">
             <%= link_to image_tag(product.display_image.attachment(:small), itemprop: "image"), url, itemprop: 'url' %>
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-            <span class="price selling" itemprop="price"><%= display_price(product) %>
+            <span class="price selling" itemprop="price"><%= display_price(product) %></span>
           </span>
         <% end %>
       </li>

data/config/initializers/assets.rb

@@ -1 +1,8 @@
-Rails.application.config.assets.precompile += %w( favicon.ico spree/frontend/cart.png credit_cards/* icons/delete.png )
+Rails.application.config.assets.precompile += %w[
+  spree/frontend/all*
+  jquery.validate/localization/messages_*
+  favicon.ico
+  spree/frontend/cart.png
+  credit_cards/*
+  icons/delete.png
+]

data/config/initializers/canonical_rails.rb

@@ -5,11 +5,10 @@ CanonicalRails.setup do |config|
   #
   # Acts as a whitelist for routes to have trailing slashes
 
-  config.collection_actions# = [:index]
+  config.collection_actions # = [:index]
 
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
 
   config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
-
 end

data/config/routes.rb

@@ -1,36 +1,35 @@
 Spree::Core::Engine.add_routes do
+  root to: 'home#index'
 
-  root :to => 'home#index'
+  resources :products, only: [:index, :show]
 
-  resources :products, :only => [:index, :show]
-
-  get '/locale/set', :to => 'locale#set'
+  get '/locale/set', to: 'locale#set'
 
   # non-restful checkout stuff
-  patch '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
-  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-  get '/checkout', :to => 'checkout#edit' , :as => :checkout
+  patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
+  get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
+  get '/checkout', to: 'checkout#edit', as: :checkout
 
-  populate_redirect = redirect do |params, request|
+  populate_redirect = redirect do |_params, request|
     request.flash[:error] = Spree.t(:populate_get_error)
     request.referer || '/cart'
   end
 
-  get '/orders/populate', :to => populate_redirect
+  get '/orders/populate', to: populate_redirect
   get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
-  resources :orders, :except => [:index, :new, :create, :destroy] do
-    post :populate, :on => :collection
+  resources :orders, except: [:index, :new, :create, :destroy] do
+    post :populate, on: :collection
   end
 
-  get '/cart', :to => 'orders#edit', :as => :cart
-  patch '/cart', :to => 'orders#update', :as => :update_cart
-  put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
+  get '/cart', to: 'orders#edit', as: :cart
+  patch '/cart', to: 'orders#update', as: :update_cart
+  put '/cart/empty', to: 'orders#empty', as: :empty_cart
 
   # route globbing for pretty nested taxon and product paths
-  get '/t/*id', :to => 'taxons#show', :as => :nested_taxons
+  get '/t/*id', to: 'taxons#show', as: :nested_taxons
 
-  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
-  get '/content/cvv', :to => 'content#cvv', :as => :cvv
-  get '/cart_link', :to => 'store#cart_link', :as => :cart_link
+  get '/unauthorized', to: 'home#unauthorized', as: :unauthorized
+  get '/content/cvv', to: 'content#cvv', as: :cvv
+  get '/cart_link', to: 'store#cart_link', as: :cart_link
 end