spree_frontend 4.2.0.rc4 → 4.2.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1477557578e6d8ef0fe52f5d0d8e96d45ede1291ef6d5e635d397ab3ba2b1d64
-  data.tar.gz: 4bf49f127a3c63fbf42d02e628157297029568a11eed608a2da64a6b7c6151cc
+  metadata.gz: 4c687a751a5affd4522bc602689a69466af4401bcda69b405b419dda929e737d
+  data.tar.gz: c8e4dbc7e128ab9d655ba9afdb60891d700224a9a5a8e62ab1f7d9720b30a9b2
 SHA512:
-  metadata.gz: b6c9a6e1456772e5a1a189e759e1503eb4a43c93c55546dc7acee0cfc24e0781dac0882220df9ce0b1a6d123e3817822838325e9da9873a9c168aa4a8cdba9bb
-  data.tar.gz: 9c9fe56b7f1a9c33241eecca1367d279a2a2f4207290a4922244b0eeaf9b04ee734a1b76f92625314d62ec63d52f0406e77dd4a12ac6a67e5864ee43de3a0ec6
+  metadata.gz: 238f9fb68b0c36b60aee012683d1d33854fc1c9ed28fefc94e080fb194974b8a75d9c91b2634be22b98efac96cf136a4a34228658844aec166d117c1d0d062d1
+  data.tar.gz: c34ae40194f58f11d2dfdf1b8f89dc57c61b84e97cc2a13b18e1f8670ce841e0c9d2e87d65e780936912bd2ef478d933de50e019830332bc57ec53bfffa46ede

data/app/assets/javascripts/spree/frontend/checkout/shipment.js

@@ -3,6 +3,7 @@ function ShippingTotalManager (input1) {
   this.input = input1
   this.shippingMethods = this.input.shippingMethods
   this.shipmentTotal = this.input.shipmentTotal
+  this.isFreeShipping = this.input.isFreeShipping
   this.taxTotal = this.input.taxTotal
   this.nonShipmentTax = $(this.taxTotal).data('non-shipment-tax')
   this.orderTotal = this.input.orderTotal
@@ -35,8 +36,19 @@ ShippingTotalManager.prototype.parseCurrencyToFloat = function (input) {
   return accounting.unformat(input, this.formatOptions.decimal)
 }
 
+ShippingTotalManager.prototype.totalShipmentAmount = function (newShipmentTotal, oldShipmentTotal) {
+  var totalShipmentAmount = 0;
+  if (!this.isFreeShipping.html()) {
+    totalShipmentAmount = newShipmentTotal - oldShipmentTotal
+
+    return totalShipmentAmount
+  } else {
+    return totalShipmentAmount
+  }
+}
+
 ShippingTotalManager.prototype.readjustSummarySection = function (orderTotal, newShipmentTotal, oldShipmentTotal, newTaxTotal, oldTaxTotal) {
-  var newOrderTotal = orderTotal + (newShipmentTotal - oldShipmentTotal) + (newTaxTotal - oldTaxTotal)
+  var newOrderTotal = orderTotal + this.totalShipmentAmount(newShipmentTotal, oldShipmentTotal) + (newTaxTotal - oldTaxTotal)
   this.taxTotal.html(accounting.formatMoney(newTaxTotal, this.formatOptions))
   this.shipmentTotal.html(accounting.formatMoney(newShipmentTotal, this.formatOptions))
   return this.orderTotal.html(accounting.formatMoney(accounting.toFixed(newOrderTotal, 10), this.formatOptions))
@@ -53,7 +65,8 @@ Spree.ready(function ($) {
     orderTotal: $('#summary-order-total'),
     taxTotal: $('[data-hook="tax-total"]'),
     shipmentTotal: $('[data-hook="shipping-total"]'),
-    shippingMethods: $('input[data-behavior="shipping-method-selector"]')
+    shippingMethods: $('input[data-behavior="shipping-method-selector"]'),
+    isFreeShipping: $('[data-hook="is-free-shipping"]')
   }
   return new ShippingTotalManager(input).bindEvent()
 })

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss

@@ -2,11 +2,6 @@
   display: flex;
   flex-direction: column;
 
-  div:first-child {
-    -webkit-flex: 0;
-    flex-shrink: 0;
-  }
-
   &-order-details {
     padding-bottom: 40px;
     font-weight: 500;
@@ -36,6 +31,9 @@
     }
 
     &-line-items {
+      @include media-breakpoint-down(sm) {
+        flex-basis: 100%;
+      }
       @include media-breakpoint-up(lg) {
         border: none;
         flex: 1 1 0;
@@ -48,15 +46,6 @@
       &-line-item {
         $self: &;
 
-        a {
-          max-width: 50%;
-          margin-right: 20px;
-
-          @include media-breakpoint-up(lg) {
-            margin-right: 40px;
-          }
-        }
-
         img {
           width: 90px;
           height: auto;
@@ -73,14 +62,28 @@
         &-name {
           font-size: font-px-to-rem(14px);
           border-top: 1px solid $global-border-style;
+          margin-right: 20px;
 
-          @include media-breakpoint-up(sm) {
-            font-size: font-px-to-rem(27px);
+          &-image {
+            padding-right: 16px;
           }
 
-          @include media-breakpoint-up(lg) {
-            font-size: font-px-to-rem(22px);
-            width: 55%;
+          &-link {
+            max-width: 50%;
+
+            @include media-breakpoint-up(lg) {
+              margin-right: 40px;
+            }
+
+
+            @include media-breakpoint-up(sm) {
+              font-size: font-px-to-rem(27px);
+            }
+
+            @include media-breakpoint-up(lg) {
+              font-size: font-px-to-rem(22px);
+              width: 55%;
+            }
           }
 
           &-options {
@@ -185,6 +188,8 @@
   }
 
   &-delivery-informations {
+    flex-basis: 100%;
+
     div:first-child {
       flex-shrink: unset;
       -webkit-flex: unset;
@@ -253,9 +258,9 @@
   }
 
   #checkout-summary {
-    margin-top: 20px;
-    @include media-breakpoint-up(sm) {
-      margin-top: 70px;
+    flex: 1 1 0;
+    @include media-breakpoint-down(sm) {
+      margin-top: 20px;
     }
   }
 }

data/app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss

@@ -261,6 +261,9 @@
   }
   #checkout-summary {
     margin-top: 30px;
+    @include media-breakpoint-down(sm) {
+      flex-basis: 100%;
+    }
     @include media-breakpoint-up(sm) {
       margin-top: 75px;
     }

data/app/controllers/spree/products_controller.rb

@@ -33,9 +33,7 @@ module Spree
     end
 
     def related
-      @related_products = related_products
-
-      if @related_products.any?
+      if product_relation_types.any?
         render template: 'spree/products/related', layout: false
       else
         head :no_content

data/app/controllers/spree/store_controller.rb

@@ -4,14 +4,6 @@ module Spree
 
     skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
-    def forbidden
-      render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403
-    end
-
-    def unauthorized
-      render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
-    end
-
     def account_link
       render partial: 'spree/shared/link_to_account'
       fresh_when(try_spree_current_user)

data/app/helpers/spree/frontend_helper.rb

@@ -16,7 +16,7 @@ module Spree
     end
 
     def stores
-      @stores ||= Spree::Store.includes(:default_country)
+      @stores ||= Spree::Store.includes(:default_country).order(:id)
     end
 
     def store_currency_symbol(store)
@@ -248,7 +248,7 @@ module Spree
     end
 
     def price_filter_values
-      [
+      @price_filter_values ||= [
         "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{formatted_price(50)}",
         "#{formatted_price(50)} - #{formatted_price(100)}",
         "#{formatted_price(101)} - #{formatted_price(150)}",
@@ -295,7 +295,11 @@ module Spree
     end
 
     def checkout_available_payment_methods
-      @order.available_payment_methods(current_store)
+      @checkout_available_payment_methods ||= @order.available_payment_methods(current_store)
+    end
+
+    def color_option_type_name
+      @color_option_type_name ||= Spree::OptionType.color&.name
     end
 
     private
@@ -314,7 +318,9 @@ module Spree
       end
     end
 
-    def checkout_edit_link(step = 'address')
+    def checkout_edit_link(step = 'address', order = @order)
+      return if order.complete?
+
       classes = 'align-text-bottom checkout-confirm-delivery-informations-link'
 
       link_to spree.checkout_state_path(step), class: classes, method: :get do

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
+      @spree_navigation_data ||= SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
     # safeguard for older Spree installs that don't have spree_navigation initializer
     # or spree.yml file present
     rescue

data/app/models/spree/frontend_configuration.rb

@@ -2,7 +2,7 @@ module Spree
   class FrontendConfiguration < Preferences::Configuration
     preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
     preference :http_cache_enabled, :boolean, default: true
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: nil
     preference :products_filters, :array, default: %w(keywords price sort_by)
     preference :additional_filters_partials, :array, default: %w()
     preference :remember_me_enabled, :boolean, default: true

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

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="first page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>

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

@@ -3,8 +3,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page gap disabled page-item d-none d-lg-flex">
   <a href="#" onclick="return false;" class="page-link">
     <%= raw(t 'views.pagination.truncate') %>

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

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>

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

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="next_page page-item">
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>

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

@@ -5,8 +5,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page<%= ' active' if page.current? %> page-item">
   <%= link_to page,
     url,

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

@@ -4,8 +4,8 @@
     total_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
--%>
+    paginator:     the paginator that renders the pagination tags inside -%>
+
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>

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

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="prev page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>

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

@@ -1,54 +1,54 @@
 <% address_id = address_type.chars.first %>
 
-<div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <div class="form-group" id=<%="#{address_id}firstname" %>>
+<div class="inner" data-hook='<%= "#{address_type}_inner" %>'>
+  <div class="form-group" id='<%= "#{address_id}firstname" %>'>
     <%= form.label :firstname do %>
       <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :firstname, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}lastname" %>>
+  <div class="form-group" id='<%= "#{address_id}lastname" %>'>
     <%= form.label :lastname do %>
       <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :lastname, class: 'form-control', required: true %>
   </div>
   <% if Spree::Config[:company] %>
-    <div class="form-group" id=<%="#{address_id}company" %>>
+    <div class="form-group" id='<%= "#{address_id}company" %>'>
       <%= form.label :company, Spree.t(:company) %>
       <%= form.text_field :company, class: 'form-control' %>
     </div>
   <% end %>
-  <div class="form-group" id=<%="#{address_id}address1" %>>
+  <div class="form-group" id='<%= "#{address_id}address1" %>'>
     <%= form.label :address1 do %>
       <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :address1, class: 'form-control required' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}address2" %>>
+  <div class="form-group" id='<%= "#{address_id}address2" %>'>
     <%= form.label :address2, Spree.t(:street_address_2) %>
     <%= form.text_field :address2, class: 'form-control' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}city" %>>
+  <div class="form-group" id='<%= "#{address_id}city" %>'>
     <%= form.label :city do %>
       <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :city, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}country" %>>
+  <div class="form-group" id='<%= "#{address_id}country" %>'>
     <%= form.label :country_id do %>
       <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <span id=<%="#{address_id}country-selection" %>>
+    <span id='<%= "#{address_id}country-selection" %>'>
       <%= form.collection_select :country_id, available_countries, :id, :name, {}, { class: 'form-control', required: true } %>
     </span>
   </div>
 
   <% if Spree::Config[:address_requires_state] %>
-    <div class="form-group" id=<%="#{address_id}state" %>>
+    <div class="form-group" id='<%= "#{address_id}state" %>'>
       <% have_states = !address.country.states.empty? %>
       <%= form.label :state do %>
-        <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
+        <%= Spree.t(:state) %><abbr class='required' title="required" id='<%= "#{address_id}state-required" %>'>*</abbr>
       <% end %>
 
       <%== state_elements = [
@@ -62,28 +62,27 @@
                             class: !have_states ? 'form-control' : 'form-control hidden',
                             required: !have_states,
                             disabled: have_states)
-         ].join.gsub('"', "'").gsub("\n", "")
-      %>
+         ].join.gsub('"', "'").gsub("\n", "") %>
     </div>
       <noscript>
         <%= form.text_field :state_name, class: 'form-control', required: true %>
       </noscript>
   <% end %>
 
-  <div class="form-group" id=<%="#{address_id}zipcode" %>>
+  <div class="form-group" id='<%= "#{address_id}zipcode" %>'>
     <%= form.label :zipcode do %>
       <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.text_field :zipcode, class: 'form-control', required: address.require_zipcode? %>
   </div>
-  <div class="form-group" id=<%="#{address_id}phone" %>>
+  <div class="form-group" id='<%= "#{address_id}phone" %>'>
     <%= form.label :phone do %>
       <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.phone_field :phone, class: 'form-control', required: address.require_phone? %>
   </div>
   <% if Spree::Config[:alternative_shipping_phone] %>
-    <div class="form-group" id=<%="#{address_id}altphone" %>>
+    <div class="form-group" id='<%= "#{address_id}altphone" %>'>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
       <%= form.phone_field :alternative_phone, class: 'form-control' %>
     </div>

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

@@ -11,8 +11,8 @@
     address_name: 'address',
     address_form: f,
     address_type: 'shipping',
-    address: @address
-  %>
+    address: @address %>
+
   <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>

data/app/views/spree/addresses/new.html.erb

@@ -10,8 +10,8 @@
       address_name: 'address',
       address_form: f,
       address_type: 'shipping',
-      address: @address
-    %>
+      address: @address %>
+
     <%= f.submit t(:save, scope: :address_book), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>