spree_frontend 3.6.6 → 3.7.0.rc1

data/app/controllers/spree/checkout_controller.rb

@@ -104,9 +104,7 @@ module Spree
 
     def set_state_if_present
       if params[:state]
-        if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
-          redirect_to checkout_state_path(@order.state)
-        end
+        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
         @order.state = params[:state]
       end
     end
@@ -155,18 +153,16 @@ module Spree
         packages = @order.shipments.map(&:to_package)
         @differentiator = Spree::Stock::Differentiator.new(@order, packages)
         @differentiator.missing.each do |variant, quantity|
-          @order.contents.remove(variant, quantity)
+          Spree::Cart::RemoveItem.call(order: @order, variant: variant, quantity: quantity)
         end
       end
 
-      if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
-        @payment_sources = try_spree_current_user.payment_sources
-      end
+      @payment_sources = try_spree_current_user.payment_sources if try_spree_current_user&.respond_to?(:payment_sources)
     end
 
     def add_store_credit_payments
       if params.key?(:apply_store_credit)
-        @order.add_store_credit_payments
+        Spree::Checkout::AddStoreCredit.call(order: @order)
 
         # Remove other payment method parameters.
         params[:order].delete(:payments_attributes)
@@ -174,15 +170,13 @@ module Spree
         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
+        redirect_to checkout_state_path(@order.state) and return if @order.payments.valid.sum(:amount) < @order.total
       end
     end
 
     def remove_store_credit_payments
       if params.key?(:remove_store_credit)
-        @order.remove_store_credit_payments
+        Spree::Checkout::RemoveStoreCredit.call(order: @order)
         redirect_to checkout_state_path(@order.state) and return
       end
     end
@@ -194,7 +188,7 @@ module Spree
     end
 
     def check_authorization
-      authorize!(:edit, current_order, cookies.signed[:guest_token])
+      authorize!(:edit, current_order, cookies.signed[:token])
     end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -1,9 +1,7 @@
 module Spree
   class LocaleController < Spree::StoreController
     def set
-      if request.referer && request.referer.starts_with?('http://' + request.host)
-        session['user_return_to'] = request.referer
-      end
+      session['user_return_to'] = request.referer if request.referer&.starts_with?('http://' + request.host)
       if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
         session[:locale] = I18n.locale = params[:locale]
         flash.notice = Spree.t(:locale_changed)

data/app/controllers/spree/orders_controller.rb

@@ -14,7 +14,7 @@ module Spree
 
     def update
       @variant = Spree::Variant.find(params[:variant_id]) if params[:variant_id]
-      if @order.contents.update_cart(order_params)
+      if Cart::Update.call(order: @order, params: order_params).success?
         respond_with(@order) do |format|
           format.html do
             if params.key?(:checkout)
@@ -34,12 +34,18 @@ module Spree
     def edit
       @order = current_order || Order.incomplete.
                includes(line_items: [variant: [:images, :option_values, :product]]).
-               find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+               find_or_initialize_by(token: cookies.signed[:token])
       associate_user
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        OrdersController#populate is deprecated and will be removed in Spree 4.0.
+        Please use `/api/v2/storefront/cart/add_item` endpoint instead.
+        See documentation: https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
+      DEPRECATION
+
       order    = current_order(create_order_if_necessary: true)
       variant  = Spree::Variant.find(params[:variant_id])
       quantity = params[:quantity].to_i
@@ -48,10 +54,14 @@ module Spree
       # 2,147,483,647 is crazy. See issue #2695.
       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!
+          result = Spree::Cart::AddItem.call(order: order, variant: variant, quantity: quantity, options: options)
+          if result.failure?
+            error = result.value.errors.full_messages.join(', ')
+          else
+            order.update_line_item_prices!
+            order.create_tax_charge!
+            order.update_with_updater!
+          end
         rescue ActiveRecord::RecordInvalid => e
           error = e.record.errors.full_messages.join(', ')
         end
@@ -70,6 +80,11 @@ module Spree
     end
 
     def populate_redirect
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        OrdersController#populate is deprecated and will be removed in Spree 4.0.
+        Please use `/api/v2/storefront/cart/add_item` endpoint instead.
+        See documentation: https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
+      DEPRECATION
       flash[:error] = Spree.t(:populate_get_error)
       redirect_to cart_path
     end
@@ -83,7 +98,7 @@ module Spree
     private
 
     def accurate_title
-      if @order && @order.completed?
+      if @order&.completed?
         Spree.t(:order_number, number: @order.number)
       else
         Spree.t(:shopping_cart)
@@ -92,12 +107,12 @@ module Spree
 
     def check_authorization
       order = Spree::Order.find_by(number: params[:id]) if params[:id].present?
-      order = current_order unless order
+      order ||= current_order
 
       if order && action_name.to_sym == :show
-        authorize! :show, order, cookies.signed[:guest_token]
+        authorize! :show, order, cookies.signed[:token]
       elsif order
-        authorize! :edit, order, cookies.signed[:guest_token]
+        authorize! :edit, order, cookies.signed[:token]
       else
         authorize! :create, Spree::Order
       end

data/app/controllers/spree/store_controller.rb

@@ -3,6 +3,7 @@ module Spree
     include Spree::Core::ControllerHelpers::Order
 
     skip_before_action :set_current_order, only: :cart_link
+    skip_before_action :verify_authenticity_token, only: :ensure_cart
 
     def forbidden
       render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403
@@ -17,6 +18,17 @@ module Spree
       fresh_when(simple_current_order)
     end
 
+    def api_tokens
+      render json: {
+        order_token: current_order&.token,
+        oauth_token: current_oauth_token&.token
+      }
+    end
+
+    def ensure_cart
+      render json: current_order(create_order_if_necessary: true) # force creation of order if doesn't exists
+    end
+
     protected
 
     def config_locale

data/app/helpers/spree/frontend_helper.rb

@@ -7,6 +7,7 @@ module Spree
 
     def spree_breadcrumbs(taxon, separator = ' ')
       return '' if current_page?('/') || taxon.nil?
+
       separator = raw(separator)
       crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')]
       if taxon
@@ -20,14 +21,6 @@ module Spree
       content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
     end
 
-    def breadcrumbs(taxon, separator = ' ')
-      ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        Spree::FrontendHelper#breadcrumbs was renamed to Spree::FrontendHelper#spree_breadcrumbs
-        and will be removed in Spree 3.6. Please update your code to avoid problems after update
-      EOS
-      spree_breadcrumbs(taxon, separator)
-    end
-
     def checkout_progress(numbers: false)
       states = @order.checkout_steps
       items = states.each_with_index.map do |state, i|
@@ -62,9 +55,7 @@ module Spree
       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
+        concat(content_tag(:div, text, class: "alert alert-#{msg_type}")) unless ignore_types.include?(msg_type)
       end
       nil
     end
@@ -86,13 +77,18 @@ module Spree
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
       return '' if max_level < 1 || root_taxon.leaf?
+
       content_tag :div, class: 'list-group' do
         taxons = root_taxon.children.map do |taxon|
-          css_class = current_taxon && current_taxon.self_and_ancestors.include?(taxon) ? 'list-group-item active' : 'list-group-item'
+          css_class = 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
         safe_join(taxons, "\n")
       end
     end
+
+    def set_image_alt(image, size)
+      image.alt.present? ? image.alt : image_alt(main_app.url_for(image.url(size)))
+    end
   end
 end

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

@@ -21,12 +21,12 @@
             <tbody>
               <% @payment_sources.each do |card| %>
                 <tr id="<%= dom_id(card,'spree')%>" class="<%= cycle('even', 'odd') %>">
-                  <td><%= card.name %></td>
-                  <td><%= card.display_number %></td>
-                  <td><%= card.month %> / <%= card.year %></td>
                   <td>
                     <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
                   </td>
+                  <td><%= card.name %></td>
+                  <td><%= card.display_number %></td>
+                  <td><%= card.month %> / <%= card.year %></td>
                 </tr>
               <% end %>
             </tbody>

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

@@ -39,5 +39,5 @@
 
 <script>
   Spree.current_order_id = "<%= @order.number %>"
-  Spree.current_order_token = "<%= @order.guest_token %>"
+  Spree.current_order_token = "<%= @order.token %>"
 </script>

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

@@ -54,6 +54,5 @@
 </div>
 
 <script>
-  Spree.current_order_id = "<%= @order.number %>"
-  Spree.current_order_token = "<%= @order.guest_token %>"
+  Spree.current_order_token = "<%= @order.token %>"
 </script>

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

@@ -1,4 +1,4 @@
-<%= form_for :order, url: populate_orders_path do |f| %>
+<%= form_for :order, html: { id: 'add-to-cart-form' } do |f| %>
   <div class="row" id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
     <% if @product.variants_and_option_values(current_currency).any? %>
       <div id="product-variants" class="col-md-6">
@@ -8,11 +8,12 @@
             <li>
               <%= radio_button_tag "variant_id", variant.id, index == 0,
                   'data-price' => variant.price_in(current_currency).money,
-                  'data-in-stock' => variant.can_supply?
+                  'data-in-stock' => variant.can_supply?,
+                  'data-backordered' => variant.backordered?
               %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
-                  <%= variant_options variant %>
+                  <%= variant.options_text %>
                 </span>
                 <% if variant_price variant %>
                   <span class="price diff"><%= variant_price variant %></span>
@@ -46,6 +47,11 @@
             <br />
             <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
           <% end %>
+          <% if @product.backordered? %>
+            <div class="alert alert-warning" id="cart-backordered-info">
+              <%= Spree.t(:backordered_info) %>
+            </div>
+          <% end %>
         </div>
 
         <% if @product.can_supply? %>
@@ -54,7 +60,7 @@
             <div class="input-group">
               <%= number_field_tag :quantity, 1, class: 'title form-control', min: 1 %>
               <span class="input-group-btn">
-                <%= button_tag class: 'btn btn-success', id: 'add-to-cart-button', type: :submit do %>
+                <%= button_tag class: 'btn btn-success', id: 'add-to-cart-button', type: :submit, disabled: true do %>
                   <%= Spree.t(:add_to_cart) %>
                 <% end %>
               </span>

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

@@ -1,4 +1,4 @@
-<% unless @product_properties.empty? %>  
+<% unless @product_properties.blank? %>  
   <h3 class="product-section-title"><%= Spree.t('properties')%></h3>
   <table id="product-properties" class="table table-striped" data-hook>
     <tbody>

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

@@ -3,7 +3,8 @@
   <ul id="product-thumbnails" class="thumbnails list-inline" data-hook>
     <% @product.images.each do |i| %>
       <li class='tmb-all tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
+        <% img_tag = image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail", alt: set_image_alt(i, :mini)) %>
+        <%= link_to(img_tag, main_app.url_for(i.url(:product))) %>
       </li>
     <% end %>
 
@@ -11,7 +12,8 @@
       <% @product.variant_images.each do |i| %>
         <% next if @product.images.include?(i) %>
         <li class='vtmb tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
+          <% img_tag = image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail", alt: set_image_alt(i, :mini)) %>
+          <%= link_to(img_tag, main_app.url_for(i.url(:product))) %>
         </li>
       <% end %>
     <% end %>

data/config/routes.rb

@@ -27,4 +27,7 @@ Spree::Core::Engine.add_routes do
   get '/content/cvv', to: 'content#cvv', as: :cvv
   get '/content/test', to: 'content#test'
   get '/cart_link', to: 'store#cart_link', as: :cart_link
+
+  get '/api_tokens', to: 'store#api_tokens'
+  post '/ensure_cart', to: 'store#ensure_cart'
 end

data/lib/generators/spree/frontend/copy_views/copy_views_generator.rb

@@ -4,7 +4,7 @@ module Spree
       desc 'Copies views from spree frontend to your application'
 
       def self.source_paths
-        [File.expand_path('../../../../../../app/', __FILE__)]
+        [File.expand_path('../../../../../app', __dir__)]
       end
 
       def copy_views

data/spree_frontend.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Frontend e-commerce functionality for the Spree project.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 2.2.7'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', s.version
   s.add_dependency 'spree_core', s.version
 
-  s.add_dependency 'bootstrap-sass',  '>= 3.3.5.1', '< 3.4'
+  s.add_dependency 'bootstrap-sass',  '~> 3.4'
   s.add_dependency 'canonical-rails', '~> 0.2.3'
   s.add_dependency 'jquery-rails',    '~> 4.3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.7.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,46 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.6
+        version: 3.7.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.6
+        version: 3.7.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.6
+        version: 3.7.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.6
+        version: 3.7.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
@@ -136,12 +130,13 @@ files:
 - app/assets/images/favicon.ico
 - app/assets/images/logo/spree_50.png
 - app/assets/javascripts/spree/frontend.js
-- app/assets/javascripts/spree/frontend/cart.js.coffee
-- app/assets/javascripts/spree/frontend/checkout.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/address.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/payment.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/shipment.js.coffee
-- app/assets/javascripts/spree/frontend/coupon_manager.js.coffee
+- app/assets/javascripts/spree/frontend/api_tokens.js
+- app/assets/javascripts/spree/frontend/cart.js
+- app/assets/javascripts/spree/frontend/checkout.js
+- app/assets/javascripts/spree/frontend/checkout/address.js
+- app/assets/javascripts/spree/frontend/checkout/payment.js
+- app/assets/javascripts/spree/frontend/checkout/shipment.js
+- app/assets/javascripts/spree/frontend/coupon_manager.js
 - app/assets/javascripts/spree/frontend/product.js
 - app/assets/stylesheets/spree/frontend.css
 - app/assets/stylesheets/spree/frontend/_variables.scss
@@ -239,12 +234,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.7
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: