spree_frontend 4.0.8 → 4.1.0.rc1

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

@@ -0,0 +1,325 @@
+@mixin svg-sizes {
+  @include media-breakpoint-between(md, md) {
+    height: 41px;
+    width: 41px;
+  }
+}
+@mixin item-title-font-size {
+  font-size: font-px-to-rem(16px);
+  @include media-breakpoint-up(md) {
+    font-size: font-px-to-rem(29px);
+  }
+  @include media-breakpoint-up(lg) {
+    font-size: font-px-to-rem(24px);
+  }
+}
+.account-page {
+  font-weight: 500;
+  h3 {
+    color: theme-color('dark-text');
+    margin: 33px 0;
+    font-size: font-px-to-rem(32px);
+
+    @include media-breakpoint-down(md) {
+      text-align: center;
+      font-size: font-px-to-rem(34px);
+    }
+    @include media-breakpoint-down(sm) {
+      font-size: font-px-to-rem(18px);
+    }
+  }
+
+  > div {
+    @include media-breakpoint-up(md) {
+      margin-bottom: 85px;
+    }
+  }
+
+  thead {
+    border-bottom: 1px solid theme-color('borders');
+  }
+
+  th {
+    color: theme-color('secondary');
+    padding: 7.5px 0;
+  }
+
+  &-user-full-name {
+    width: 200px;
+    display: inline-block;
+  }
+
+  &-user-info {
+    border-bottom: 1px solid theme-color('borders');
+
+    &-item {
+      address {
+        font-size: font-px-to-rem(14px);
+        @include media-breakpoint-up(md) {
+          font-size: font-px-to-rem(26px);
+        }
+        @include media-breakpoint-up(lg) {
+          font-size: font-px-to-rem(18px);
+        }
+      }
+
+      .delete-address-img {
+        @include svg-sizes;
+        color: $primary-color;
+      }
+
+      margin-top: 20px;
+
+      @include media-breakpoint-up(lg) {
+        display: inline-block;
+        flex-basis: 30%;
+        margin-top: 34px;
+      }
+      &-title {
+        @include item-title-font-size;
+        color: theme-color('dark-text');
+        margin-top: 25px;
+        font-weight: 500;
+
+        &-edit {
+          position: relative;
+          float: right;
+          margin-top: -4px;
+
+          &-img {
+            height: initial;
+            @include svg-sizes;
+          }
+        }
+
+        &:first-child {
+          margin-top: 0;
+        }
+
+        @include media-breakpoint-up(lg) {
+          &-edit {
+            float: none;
+            margin: -4px 0 0 20px;
+            position: absolute;
+          }
+        }
+      }
+
+      &-definition {
+        margin-top: 10px;
+        font-size: font-px-to-rem(14px);
+
+        @include media-breakpoint-up(sm) {
+          margin-top: 28px;
+          font-size: font-px-to-rem(26px);
+        }
+        @include media-breakpoint-up(lg) {
+          margin-top: 10px;
+          font-size: font-px-to-rem(18px);
+        }
+
+        &:first-child {
+          margin-top: 0;
+        }
+      }
+
+      &-store-credits {
+        padding: 12px 20px;
+        margin-top: 30px;
+        margin-bottom: 30px;
+        background: $secondary-background;
+        color: $secondary-font-color;
+        @include media-breakpoint-up(sm) {
+          padding: 21px 35px;
+          margin-top: 43px;
+        }
+
+        font-size: font-px-to-rem(16px);
+        font-weight: 500;
+        letter-spacing: 0.4px;
+        @include media-breakpoint-up(sm) {
+          font-size: font-px-to-rem(20px);
+          letter-spacing: 0.5px;
+        }
+
+        &-amount {
+          font-weight: 600;
+          @include media-breakpoint-up(sm) {
+            font-size: font-px-to-rem(22px);
+          }
+        }
+      }
+
+      .delete-button-wrapper {
+        order: -1;
+
+        @include media-breakpoint-up(lg) {
+          order: 1;
+        }
+      }
+
+      .address-button {
+        float: right;
+        top: -3px;
+        position: relative;
+        text-decoration: none;
+
+        &.delete-button {
+          float: right;
+        }
+
+        @include media-breakpoint-up(md) {
+          float: none;
+          margin-top: 5px;
+
+          &.delete-button {
+            float: none;
+            margin-right: 0;
+          }
+        }
+      }
+    }
+
+    @include media-breakpoint-up(md) {
+      border-bottom: none;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+  }
+
+  &-orders {
+    border-top: 1px solid $global-border-style;
+    h3 {
+      @include media-breakpoint-down(sm) {
+        margin: 30px 0 0;
+        padding: 25px 0;
+      }
+    }
+    tr {
+      border-bottom: 1px solid $global-border-style;
+
+      @include media-breakpoint-down(md) {
+        &:last-child {
+          border-bottom: 0;
+        }
+      }
+    }
+
+    td {
+      padding: 25px 0;
+    }
+
+    table {
+      width: 100%;
+    }
+  }
+
+  &-order-number {
+    order: 3;
+    font-size: font-px-to-rem(16px);
+    a {
+      color: theme-color('dark-text');
+    }
+    @include media-breakpoint-up(md) {
+      font-size: font-px-to-rem(29px);
+    }
+    @include media-breakpoint-up(lg) {
+      font-size: font-px-to-rem(18px);
+    }
+  }
+
+  &-order-status {
+    order: 2;
+    font-size: font-px-to-rem(14px);
+    text-transform: uppercase;
+    @include media-breakpoint-up(md) {
+      font-size: font-px-to-rem(26px);
+    }
+    @include media-breakpoint-up(lg) {
+      font-size: font-px-to-rem(18px);
+      text-transform: initial;
+    }
+  }
+
+  &-order-date {
+    order: 1;
+    font-size: 14px;
+    font-size: font-px-to-rem(14px);
+    @include media-breakpoint-up(md) {
+      font-size: font-px-to-rem(26px);
+    }
+    @include media-breakpoint-up(lg) {
+      font-size: font-px-to-rem(18px);
+    }
+  }
+
+  &-order-total {
+    order: 4;
+    font-size: font-px-to-rem(16px);
+    @include media-breakpoint-up(md) {
+      font-size: font-px-to-rem(29px);
+    }
+    @include media-breakpoint-up(lg) {
+      font-size: font-px-to-rem(18px);
+    }
+  }
+
+  &-order-payment-state,
+  &-order-shipment-state {
+    @include media-breakpoint-up(md) {
+      font-size: font-px-to-rem(18px);
+    }
+  }
+
+  @include media-breakpoint-between(xs, md) {
+    thead,
+    .account-page-order-payment-state,
+    .account-page-order-shipment-state {
+      display: none;
+    }
+
+    tr {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 25px 0;
+
+      td {
+        width: 50%;
+        border: none;
+        padding: 0;
+      }
+    }
+
+    &-arrow-container {
+      right: $container-padding;
+      position: absolute;
+    }
+
+    & &-order-arrow {
+      right: 0px;
+      position: absolute;
+      width: 20px;
+      height: 20px;
+      margin: 10px;
+      border-top: 1px solid black;
+      border-right: 1px solid black;
+      transform: rotate(45deg);
+      @include media-breakpoint-up(md) {
+        margin-top: 25px;
+      }
+    }
+
+    &-text-primary {
+      color: theme-color('primary');
+    }
+
+    &-lead {
+      font-weight: 600;
+    }
+  }
+  &-new-address-link {
+    @include item-title-font-size;
+  }
+}

data/app/assets/stylesheets/spree/frontend.css

@@ -1,6 +1,6 @@
 /*
 * This is a manifest file that includes stylesheets for spree_frontend
- *= require spree/frontend/frontend_bootstrap
  *= require spree/frontend/address_book
+ *= require spree/frontend/application
  *= require_self
 */

data/app/controllers/concerns/spree/checkout/address_book.rb

@@ -32,23 +32,21 @@ module Spree
       end
 
       def normalize_addresses
-        return unless params[:state] == 'address' && @order.bill_address_id
+        return unless params[:state] == 'address' && @order.bill_address_id && @order.ship_address_id
 
-        if @order.checkout_steps.include?('delivery')
-          return unless @order.ship_address_id
-        end
+        # ensure that there is no validation errors and addresses were saved
+        return unless @order.bill_address && @order.ship_address
 
         bill_address = @order.bill_address
         ship_address = @order.ship_address
-
-        if params[:save_user_address].present? && try_spree_current_user.present?
-          [bill_address, ship_address].each { |address| address&.update_attribute(:user_id, try_spree_current_user&.id) }
-        end
-
         if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
           @order.update_column(:bill_address_id, ship_address.id)
           bill_address.destroy
+        elsif params[:save_user_address]
+          bill_address.update_attribute(:user_id, try_spree_current_user&.id)
         end
+
+        ship_address.update_attribute(:user_id, try_spree_current_user&.id) if params[:save_user_address]
       end
     end
   end

data/app/controllers/spree/addresses_controller.rb

@@ -5,16 +5,16 @@ module Spree
     load_and_authorize_resource class: Spree::Address
 
     def index
-      @addresses = spree_current_user.addresses
+      @addresses = try_spree_current_user.addresses
     end
 
     def create
-      @address = spree_current_user.addresses.build(address_params)
+      @address = try_spree_current_user.addresses.build(address_params)
       if @address.save
-        flash[:notice] = Spree.t(:successfully_created, scope: :address_book)
-        redirect_to :index
+        flash[:notice] = I18n.t(:successfully_created, scope: :address_book)
+        redirect_to spree.account_path
       else
-        render :new
+        render action: 'new'
       end
     end
 
@@ -37,7 +37,6 @@ module Spree
       else
         new_address = @address.clone
         new_address.attributes = address_params
-        new_address.user_id = @address.user_id
         @address.update_attribute(:deleted_at, Time.current)
         if new_address.save
           flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)

data/app/controllers/spree/checkout_controller.rb

@@ -7,6 +7,7 @@ module Spree
     include Spree::Checkout::AddressBook
 
     before_action :set_cache_header, only: [:edit]
+    before_action :set_current_order
     before_action :load_order_with_lock
     before_action :ensure_valid_state_lock_version, only: [:update]
     before_action :set_state_if_present
@@ -26,6 +27,8 @@ module Spree
 
     rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
 
+    layout 'spree/layouts/checkout'
+
     # Updates the order and advances to the next state (when possible.)
     def update
       if @order.update_from_params(params, permitted_checkout_attributes, request.headers.env)
@@ -37,7 +40,6 @@ module Spree
 
         if @order.completed?
           @current_order = nil
-          flash.notice = Spree.t(:order_processed_successfully)
           flash['order_completed'] = true
           redirect_to completion_route
         else

data/app/controllers/spree/home_controller.rb

@@ -1,13 +1,9 @@
 module Spree
   class HomeController < Spree::StoreController
-    helper 'spree/products'
     respond_to :html
 
     def index
-      @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products
-      @products = @products.includes(:possible_promotions) if @products.respond_to?(:includes)
-      @taxonomies = Spree::Taxonomy.includes(root: :children)
+      fresh_when etag: store_etag, last_modified: current_store.updated_at.utc, public: true
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   class OrdersController < Spree::StoreController
+    before_action :set_current_order
     before_action :check_authorization
+
     helper 'spree/products', 'spree/orders'
 
     respond_to :html
@@ -32,7 +34,7 @@ module Spree
     # Shows the current incomplete order from the session
     def edit
       @order = current_order || Order.incomplete.
-               includes(line_items: [variant: [:images, :option_values, :product]]).
+               includes(line_items: [variant: [:images, :product, option_values: :option_type]]).
                find_or_initialize_by(token: cookies.signed[:token])
       associate_user
     end

data/app/controllers/spree/products_controller.rb

@@ -1,27 +1,38 @@
 module Spree
   class ProductsController < Spree::StoreController
-    before_action :load_product, only: :show
-    before_action :load_taxon, only: :index
+    include Spree::ProductsHelper
 
-    helper 'spree/taxons'
+    before_action :load_product, only: [:show, :related]
+    before_action :load_taxon, only: :index
 
     respond_to :html
 
     def index
       @searcher = build_searcher(params.merge(include_images: true))
       @products = @searcher.retrieve_products
-      @products = @products.includes(:possible_promotions) if @products.respond_to?(:includes)
-      @taxonomies = load_taxonomies
     end
 
     def show
-      @variants = @product.variants_including_master.
-                  spree_base_scopes.
-                  active(current_currency).
-                  includes([:option_values, :images])
-      @product_properties = @product.product_properties.includes(:property)
-      @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
       redirect_if_legacy_path
+
+      @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
+
+      if stale?(etag: product_etag, last_modified: @product.updated_at.utc, public: true)
+        @product_summary = Spree::ProductSummaryPresenter.new(@product).call
+        @product_properties = @product.product_properties.includes(:property)
+        load_variants
+        @product_images = product_images(@product, @variants)
+      end
+    end
+
+    def related
+      @related_products = related_products
+
+      if @related_products.any?
+        render template: 'spree/products/related', layout: false
+      else
+        head :no_content
+      end
     end
 
     private
@@ -41,14 +52,27 @@ module Spree
                     Product.active(current_currency)
                   end
 
-      @product = @products.includes(:variants_including_master, variant_images: :viewable).
-                 friendly.distinct(false).find(params[:id])
+      @product = @products.includes(:master).
+                 friendly.
+                 find(params[:id])
     end
 
     def load_taxon
       @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
     end
 
+    def load_variants
+      @variants = @product.
+                  variants_including_master.
+                  spree_base_scopes.
+                  active(current_currency).
+                  includes(
+                    :default_price,
+                    option_values: [:option_value_variants],
+                    images: { attachment_attachment: :blob }
+                  )
+    end
+
     def redirect_if_legacy_path
       # If an old id or a numeric id was used to find the record,
       # we should do a 301 redirect that uses the current friendly id.
@@ -59,8 +83,14 @@ module Spree
       end
     end
 
-    def load_taxonomies
-      Spree::Taxonomy.includes(root: :children)
+    def product_etag
+      [
+        store_etag,
+        @product,
+        @taxon,
+        @product.possible_promotion_ids,
+        @product.possible_promotions.maximum(:updated_at),
+      ]
     end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -2,7 +2,6 @@ module Spree
   class StoreController < Spree::BaseController
     include Spree::Core::ControllerHelpers::Order
 
-    skip_before_action :set_current_order, only: :cart_link
     skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
     def forbidden
@@ -13,6 +12,11 @@ module Spree
       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)
+    end
+
     def cart_link
       render partial: 'spree/shared/link_to_cart'
       fresh_when(simple_current_order)
@@ -20,7 +24,7 @@ module Spree
 
     def api_tokens
       render json: {
-        order_token: current_order&.token,
+        order_token: simple_current_order&.token,
         oauth_token: current_oauth_token&.token
       }
     end
@@ -34,5 +38,13 @@ module Spree
     def config_locale
       Spree::Frontend::Config[:locale]
     end
+
+    def store_etag
+      [
+        current_store,
+        current_currency,
+        config_locale
+      ]
+    end
   end
 end

data/app/controllers/spree/taxons_controller.rb

@@ -2,15 +2,21 @@ module Spree
   class TaxonsController < Spree::StoreController
     helper 'spree/products'
 
+    before_action :load_taxon, :load_products
+
     respond_to :html
 
     def show
-      @taxon = Taxon.friendly.find(params[:id])
-      return unless @taxon
+    end
 
-      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
-      @products = @searcher.retrieve_products
-      @taxonomies = Spree::Taxonomy.includes(root: :children)
+    def product_carousel
+      if @products.any?
+        render template: 'spree/taxons/product_carousel', layout: false
+      else
+        head :no_content
+      end
+
+      fresh_when etag: "product-carousel/#{@taxon.cache_key_with_version}", last_modified: @taxon.updated_at.utc, public: true
     end
 
     private
@@ -18,5 +24,14 @@ module Spree
     def accurate_title
       @taxon.try(:seo_title) || super
     end
+
+    def load_taxon
+      @taxon = Spree::Taxon.friendly.find(params[:id])
+    end
+
+    def load_products
+      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
+      @products = @searcher.retrieve_products
+    end
   end
 end

data/app/helpers/spree/addresses_helper.rb

@@ -2,14 +2,15 @@
 module Spree
   module AddressesHelper
     def address_field(form, method, address_id = 'b', &handler)
-      content_tag :div, id: [address_id, method].join, class: 'form-group' do
+      content_tag :p, id: [address_id, method].join, class: 'form-group checkout-content-inner-field' do
         if handler
           yield
         else
           is_required = Spree::Address.required_fields.include?(method)
-          separator = is_required ? '<span class="required">*</span><br />' : '<br />'
-          form.label(method) + separator.html_safe +
-            form.text_field(method, class: [is_required ? 'required' : nil, 'form-control'].compact, required: is_required)
+          form.text_field(method,
+                          class: [is_required ? 'required' : nil, 'spree-flat-input'].compact,
+                          required: is_required,
+                          placeholder: I18n.t("activerecord.attributes.spree/address.#{method}"))
         end
       end
     end
@@ -20,17 +21,15 @@ module Spree
       state_elements = [
         form.collection_select(:state_id, country.states.order(:name),
                               :id, :name,
-                              { include_blank: true },
-                               class: have_states ? 'form-control' : 'hidden',
+                               { prompt: Spree.t(:state).upcase },
+                               class: have_states ? 'required form-control spree-flat-select' : 'hidden',
                                disabled: !have_states) +
-          form.text_field(:state_name,
-                          class: !have_states ? 'form-control' : 'hidden',
-                          disabled: have_states)
+          form.text_field(:state_name, class: !have_states ? 'required' : 'hidden', disabled: have_states) +
+          image_tag('arrow.svg', class: 'position-absolute spree-flat-select-arrow')
       ].join.tr('"', "'").delete("\n")
 
-      form.label(:state, Spree.t(:state)) + '<span class="req">*</span><br />'.html_safe +
-        content_tag(:noscript, form.text_field(:state_name, class: 'required form-control')) +
-        javascript_tag("document.write(\"#{state_elements.html_safe}\");")
+      content_tag(:noscript, form.text_field(:state_name, class: 'required')) +
+        javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
     end
   end
 end