spree_frontend 3.2.9 → 3.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87042361e61117e53fdf2d80e91b5ecca709132
-  data.tar.gz: a98c7b6e0c15fc6d63e8fd2ed31b435e831952dc
+  metadata.gz: 895c04875fd5f5f2af102a55b9625f8a61a901c9
+  data.tar.gz: 8e081c1219e709db368ab3deb9f59cbb48518bcc
 SHA512:
-  metadata.gz: 8426d0e03d77dc7f4664e2dd135a46d859faacbbd6de34772184aca714e81715cdbecbfbbfa3c00a1be776cb3c35e78a3f8de362affba8a6923b0da093e3be6d
-  data.tar.gz: 4a04e2bc07dc6b959ecdb11e8a3845a8ecef037218293c33efaf9e02b303619aa0322fafe67c3133f9df95d2bdc9195c0c862bd01b3720ad6af70708810d6268
+  metadata.gz: 90a535919679f330a4b07abe0fc769a2a3eddc9daa8d91d9583597de65607dfd07323075a9ac0976e401d89c9b6740af930c31ab18b68735dc843424a33b2022
+  data.tar.gz: 83a4a268aa6426b1d6bba8f101a620aeab42d8aafb6b9e418b1fe7437b8baaed31c071c7acb1d551826d7c86fefd0e4dabf4e27bfce1b9a289cedd19862853b1

data/app/controllers/spree/checkout_controller.rb

@@ -4,7 +4,6 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
-    before_action :expires_now, only: [:edit]
     before_action :load_order_with_lock
     before_action :ensure_valid_state_lock_version, only: [:update]
     before_action :set_state_if_present
@@ -18,7 +17,7 @@ module Spree
     before_action :check_authorization
 
     before_action :setup_for_current_state
-    before_action :add_store_credit_payments, only: [:update]
+    before_action :add_store_credit_payments, :remove_store_credit_payments, only: [:update]
 
     helper 'spree/orders'
 
@@ -180,6 +179,13 @@ module Spree
       end
     end
 
+    def remove_store_credit_payments
+      if params.key?(:remove_store_credit)
+        @order.remove_store_credit_payments
+        redirect_to checkout_state_path(@order.state) and return
+      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/orders_controller.rb

@@ -10,7 +10,7 @@ module Spree
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
-      @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).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
@@ -49,6 +49,9 @@ module Spree
       if quantity.between?(1, 2_147_483_647)
         begin
           order.contents.add(variant, quantity, options)
+          order.update_line_item_prices!
+          order.create_tax_charge!
+          order.update_with_updater!
         rescue ActiveRecord::RecordInvalid => e
           error = e.record.errors.full_messages.join(", ")
         end
@@ -68,7 +71,7 @@ module Spree
 
     def populate_redirect
       flash[:error] = Spree.t(:populate_get_error)
-      redirect_to('/cart')
+      redirect_to cart_path
     end
 
     def empty
@@ -88,7 +91,8 @@ module Spree
     end
 
     def check_authorization
-      order = Spree::Order.find_by_number(params[:id]) || current_order
+      order = Spree::Order.find_by(number: params[:id]) if params[:id].present?
+      order = current_order unless order
 
       if order
         authorize! :edit, order, cookies.signed[:guest_token]

data/app/controllers/spree/products_controller.rb

@@ -41,7 +41,9 @@ module Spree
         else
           @products = Product.active(current_currency)
         end
-        @product = @products.includes(:variants_including_master, variant_images: :viewable).friendly.find(params[:id])
+
+        @product = @products.includes(:variants_including_master, variant_images: :viewable).
+                             friendly.distinct(false).find(params[:id])
       end
 
       def load_taxon

data/app/helpers/spree/frontend_helper.rb

@@ -23,7 +23,7 @@ module Spree
     def checkout_progress(numbers: false)
       states = @order.checkout_steps
       items = states.each_with_index.map do |state, i|
-        text = Spree.t("order_state.#{state}").titleize
+        text = Spree.t("order_states.#{state}").titleize
         text.prepend("#{i.succ}. ") if numbers
 
         css_classes = []

data/app/helpers/spree/taxons_helper.rb

@@ -4,13 +4,12 @@ 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("spree_products.*, spree_products_taxons.position").limit(max)
+      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("spree_products.*, spree_products_taxons.position").
-                      where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          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

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

@@ -8,6 +8,9 @@
 </div>
 
 <div class="well text-right form-buttons" data-hook="buttons">
+  <% if @order.using_store_credit? %>
+    <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
+  <% end %>
   <%= submit_tag Spree.t(:place_order), class: 'btn btn-lg btn-success' %>
   <script>Spree.disableSaveOnClick();</script>
 </div>

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

@@ -64,7 +64,7 @@
 
     <% if order.using_store_credit? %>
       <tr data-hook="order_details_store_credit">
-        <td><%= Spree.t(:store_credit_name) %>:</strong></td>
+        <td><strong><%= Spree.t(:store_credit_name) %>:</strong></td>
         <td><span id='summary-store-credit'><%= order.display_total_applied_store_credit.to_html %></span></td>
       </tr>
     <% end %>

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

@@ -5,6 +5,7 @@
       <p><%= Spree.t('store_credit.remaining_amount', amount: @order.display_store_credit_remaining_after_capture) %></p>
     <% else %>
       <p><%= Spree.t('store_credit.additional_payment_needed', amount: @order.display_order_total_after_store_credit) %></p>
+      <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
     <% end %>
   </div>
 

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

@@ -7,7 +7,7 @@
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
               <%= radio_button_tag "variant_id", variant.id, index == 0,
-                  'data-price' => variant.price_in(current_currency).money, 
+                  'data-price' => variant.price_in(current_currency).money,
                   'data-in-stock' => variant.can_supply?
               %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
@@ -34,10 +34,10 @@
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
-            <span class="lead price selling" itemprop="price">
+            <span class="lead price selling" itemprop="price" content="<%= @product.price_in(current_currency).amount.to_d %>">
               <%= display_price(@product) %>
             </span>
-            <span itemprop="priceCurrency" content="<%= @product.currency %>"></span>
+            <span itemprop="priceCurrency" content="<%= current_currency %>"></span>
           </div>
 
           <% if @product.master.can_supply? %>

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

@@ -6,7 +6,7 @@
     <ul class="nav navbar-nav navbar-right" data-hook>
       <li id="link-to-cart" data-hook>
         <noscript>
-          <%= link_to Spree.t(:cart), '/cart' %>
+          <%= link_to_cart %>
         </noscript>
         &nbsp;
       </li>

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

@@ -16,7 +16,6 @@
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
             <div>
-              <i class='fa fa-truck'></i>
               <%= Spree.t(:shipment_details, stock_location: shipment.stock_location.name, shipping_method: shipment.selected_shipping_rate.name) %>
             </div>
           <% end %>

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

@@ -32,7 +32,10 @@
             </div>
             <div class="panel-footer text-center">
               <span itemprop="offers" itemscope itemtype="https://schema.org/Offer">
-                <span class="price selling lead" itemprop="price"><%= display_price(product) %></span>
+                <span class="price selling lead" itemprop="price" content="<%= product.price_in(current_currency).amount.to_d %>">
+                  <%= display_price(product) %>
+                </span>
+                <span itemprop="priceCurrency" content="<%= current_currency %>"></span>
               </span>
             </div>
           <% end %>

data/spec/controllers/controller_extension_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+# This test tests the functionality within
+# spree/core/controller_helpers/respond_with.rb
+# Rather than duck-punching the existing controllers, let's define a custom one:
+class Spree::CustomController < Spree::BaseController
+  def index
+    respond_with(Spree::Address.new) do |format|
+      format.html { render plain: "neutral" }
+    end
+  end
+
+  def create
+    # Just need a model with validations
+    # Address is good enough, so let's go with that
+    address = Spree::Address.new(params[:address])
+    respond_with(address)
+  end
+end
+
+describe Spree::CustomController, type: :controller do
+  after do
+    Spree::CustomController.clear_overrides!
+  end
+
+  before do
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw {
+        get 'index', to: 'spree/custom#index'
+        post 'create', to: 'spree/custom#create'
+      }
+    end
+  end
+
+  context "extension testing" do
+    context "index" do
+      context "specify symbol for handler instead of Proc" do
+        before do
+          Spree::CustomController.class_eval do
+            respond_override({index: {html: {success: :success_method}}})
+
+            private
+
+            def success_method
+              render plain: 'success!!!'
+            end
+          end
+        end
+
+        describe "GET" do
+          it "has value success" do
+            spree_get :index
+            expect(response).to be_success
+            assert (response.body =~ /success!!!/)
+          end
+        end
+      end
+
+      context "render" do
+        before do
+          Spree::CustomController.instance_eval do
+            respond_override(index: { html: { success: lambda { render(plain: 'success!!!') } } })
+            respond_override(index: { html: { failure: lambda { render(plain: 'failure!!!') } } })
+          end
+        end
+
+        describe "GET" do
+          it "has value success" do
+            spree_get :index
+            expect(response).to be_success
+            assert (response.body =~ /success!!!/)
+          end
+        end
+      end
+
+      context "redirect" do
+        before do
+          Spree::CustomController.instance_eval do
+            respond_override({index: {html: {success: lambda { redirect_to('/cart') }}}})
+            respond_override(index: { html: { failure: lambda { render(plain: 'failure!!!') } } })
+          end
+        end
+
+        describe "GET" do
+          it "has value success" do
+            spree_get :index
+            expect(response).to be_redirect
+          end
+        end
+      end
+
+      context "validation error" do
+        before do
+          Spree::CustomController.instance_eval do
+            respond_to :html
+            respond_override(create: { html: { success: lambda { render(plain: 'success!!!') } } })
+            respond_override(create: { html: { failure: lambda { render(plain: 'failure!!!') } } })
+          end
+        end
+
+        describe "POST" do
+          it "has value success" do
+            spree_post :create
+            expect(response).to be_success
+            assert (response.body =~ /success!/)
+          end
+        end
+      end
+
+      context 'A different controllers respond_override. Regression test for #1301' do
+        before do
+          Spree::CheckoutController.instance_eval do
+            respond_override(index: { html: { success: lambda { render(plain: 'success!!!') } } })
+          end
+        end
+
+        describe "POST" do
+          it "should not effect the wrong controller" do
+            spree_get :index
+            assert (response.body =~ /neutral/)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/controller_helpers_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+# In this file, we want to test that the controller helpers function correctly
+# So we need to use one of the controllers inside Spree.
+# ProductsController is good.
+describe Spree::ProductsController, type: :controller do
+
+  let!(:available_locales) { [:en, :de] }
+  let!(:available_locale) { :de }
+  let!(:unavailable_locale) { :ru }
+
+  before do
+    I18n.enforce_available_locales = false
+    expect(I18n).to receive(:available_locales).and_return(available_locales)
+  end
+
+  after do
+    Spree::Frontend::Config[:locale] = :en
+    Rails.application.config.i18n.default_locale = :en
+    I18n.locale = :en
+    I18n.enforce_available_locales = true
+  end
+
+  # Regression test for #1184
+  context 'when session locale not set' do
+    before(:each) do
+      session[:locale] = nil
+    end
+
+    context 'when Spree::Frontend::Config[:locale] not present' do
+      before(:each) do
+        Spree::Frontend::Config[:locale] = nil
+      end
+
+      context 'when rails application default locale not set' do
+        before(:each) do
+          Rails.application.config.i18n.default_locale = nil
+        end
+
+        it "sets the I18n default locale" do
+          spree_get :index
+          expect(I18n.locale).to eq(I18n.default_locale)
+        end
+      end
+
+      context 'when rails application default locale is set' do
+        context 'and not in available_locales' do
+          before(:each) do
+            Rails.application.config.i18n.default_locale = unavailable_locale
+          end
+
+          it "sets the I18n default locale" do
+            spree_get :index
+            expect(I18n.locale).to eq(I18n.default_locale)
+          end
+        end
+
+        context 'and in available_locales' do
+          before(:each) do
+            Rails.application.config.i18n.default_locale = available_locale
+          end
+
+          it "sets the rails app locale" do
+            expect(I18n.locale).to eq(:en)
+            spree_get :index
+            expect(I18n.locale).to eq(available_locale)
+          end
+        end
+      end
+    end
+
+    context 'when Spree::Frontend::Config[:locale] is present' do
+      context 'and not in available_locales' do
+        before(:each) do
+          Spree::Frontend::Config[:locale] = unavailable_locale
+        end
+
+        it "sets the I18n default locale" do
+          spree_get :index
+          expect(I18n.locale).to eq(I18n.default_locale)
+        end
+      end
+
+      context 'and not in available_locales' do
+        before(:each) do
+          Spree::Frontend::Config[:locale] = available_locale
+        end
+
+        it "sets the default locale based on Spree::Frontend::Config[:locale]" do
+          expect(I18n.locale).to eq(:en)
+          spree_get :index
+          expect(I18n.locale).to eq(available_locale)
+        end
+      end
+    end
+  end
+
+  context 'when session locale is set' do
+    context 'and not in available_locales' do
+      before(:each) do
+        session[:locale] = unavailable_locale
+      end
+
+      it "sets the I18n default locale" do
+        spree_get :index
+        expect(I18n.locale).to eq(I18n.default_locale)
+      end
+    end
+
+    context 'and in available_locales' do
+      before(:each) do
+        session[:locale] = available_locale
+      end
+
+      it "sets the session locale" do
+        expect(I18n.locale).to eq(:en)
+        spree_get :index
+        expect(I18n.locale).to eq(available_locale)
+      end
+    end
+  end
+end