spree_frontend 3.1.0 → 4.7.0

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

@@ -0,0 +1,319 @@
+@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: $font-color;
+    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 $global-border-style;
+  }
+
+  th {
+    color: theme-color("secondary");
+    padding: 7.5px 0;
+  }
+
+  &-user-full-name {
+    width: 200px;
+    display: inline-block;
+  }
+
+  &-user-info {
+    border-bottom: 1px solid $global-border-style;
+
+    &-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);
+        }
+      }
+      margin-top: 20px;
+
+      @include media-breakpoint-up(lg) {
+        display: inline-block;
+        flex-basis: 30%;
+        margin-top: 34px;
+      }
+      &-title {
+        @include item-title-font-size;
+        color: $font-color;
+        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: $font-color;
+    }
+    @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,5 +1,5 @@
 /*
 * This is a manifest file that includes stylesheets for spree_frontend
- *= require spree/frontend/frontend_bootstrap
+ *= require spree/frontend/application
  *= require_self
 */

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

@@ -0,0 +1,55 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/controllers/spree/checkout_controller_decorator.rb
+module Spree
+  module Checkout
+    module AddressBook
+      extend ActiveSupport::Concern
+
+      included do
+        after_action :normalize_addresses, only: :update
+        before_action :set_addresses, only: :update
+      end
+
+      protected
+
+      def set_addresses
+        return unless params[:order] && params[:state] == 'address'
+
+        if params[:order][:ship_address_id].to_i > 0
+          params[:order].delete(:ship_address_attributes)
+
+          Spree::Address.find(params[:order][:ship_address_id]).user_id != try_spree_current_user&.id && raise('Frontend address forging')
+        else
+          params[:order].delete(:ship_address_id)
+        end
+
+        if params[:order][:bill_address_id].to_i > 0
+          params[:order].delete(:bill_address_attributes)
+
+          Spree::Address.find(params[:order][:bill_address_id]).user_id != try_spree_current_user&.id && raise('Frontend address forging')
+        else
+          params[:order].delete(:bill_address_id)
+        end
+      end
+
+      def normalize_addresses
+        return unless params[:state] == 'address' && @order.bill_address_id
+
+        if @order.checkout_steps.include?('delivery')
+          return unless @order.ship_address_id
+        end
+
+        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
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/spree/locale_urls.rb

@@ -0,0 +1,21 @@
+module Spree
+  module LocaleUrls
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :redirect_to_default_locale
+    end
+
+    private
+
+    def default_url_options
+      super.merge(locale: locale_param, currency: currency_param)
+    end
+
+    def redirect_to_default_locale
+      return if params[:locale].blank? || supported_locale?(params[:locale])
+
+      redirect_to url_for(request.parameters.merge(locale: nil))
+    end
+  end
+end

data/app/controllers/spree/addresses_controller.rb

@@ -0,0 +1,55 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/controllers/spree/addresses_controller.rb
+module Spree
+  class AddressesController < Spree::StoreController
+    helper Spree::AddressesHelper
+    load_and_authorize_resource class: Spree::Address
+
+    def create
+      @address = try_spree_current_user.addresses.build(address_params)
+      if create_service.call(user: try_spree_current_user, address_params: @address.attributes).success?
+        flash[:notice] = I18n.t(:successfully_created, scope: :address_book)
+        redirect_to spree.account_path
+      else
+        render action: 'new', status: :unprocessable_entity
+      end
+    end
+
+    def edit
+      session['spree_user_return_to'] = request.env['HTTP_REFERER']
+    end
+
+    def new
+      @address = Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
+    end
+
+    def update
+      if update_service.call(address: @address, address_params: address_params).success?
+        flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
+        redirect_back_or_default(addresses_path)
+      else
+        render :edit, status: :unprocessable_entity
+      end
+    end
+
+    def destroy
+      @address.destroy
+
+      flash[:notice] = Spree.t(:successfully_removed, scope: :address_book)
+      redirect_to(request.env['HTTP_REFERER'] || addresses_path) unless request.xhr?
+    end
+
+    private
+
+    def address_params
+      params.require(:address).permit(permitted_address_attributes)
+    end
+
+    def create_service
+      Spree::Dependencies.address_create_service.constantize
+    end
+
+    def update_service
+      Spree::Dependencies.address_update_service.constantize
+    end
+  end
+end

data/app/controllers/spree/checkout_controller.rb

@@ -4,6 +4,10 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
+    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
@@ -15,34 +19,34 @@ module Spree
 
     before_action :associate_user
     before_action :check_authorization
-    before_action :apply_coupon_code
 
     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'
 
     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)
         @order.temporary_address = !params[:save_user_address]
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
-          redirect_to(checkout_state_path(@order.state)) && return
+          redirect_to(spree.checkout_state_path(@order.state)) && return
         end
 
         if @order.completed?
           @current_order = nil
-          flash.notice = Spree.t(:order_processed_successfully)
           flash['order_completed'] = true
           redirect_to completion_route
         else
-          redirect_to checkout_state_path(@order.state)
+          redirect_to spree.checkout_state_path(@order.state)
         end
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -54,7 +58,7 @@ module Spree
     end
 
     def insufficient_payment?
-      params[:state] == "confirm" &&
+      params[:state] == 'confirm' &&
         @order.payment_required? &&
         @order.payments.valid.sum(:amount) != @order.total
     end
@@ -73,7 +77,7 @@ module Spree
       if @order.state != correct_state && !skip_state_validation?
         flash.keep
         @order.update_column(:state, correct_state)
-        redirect_to checkout_state_path(@order.state)
+        redirect_to spree.checkout_state_path(@order.state)
       end
     end
 
@@ -90,29 +94,27 @@ module Spree
 
     def ensure_valid_state_lock_version
       if params[:order] && params[:order][:state_lock_version]
-        @order.with_lock do
+        changes = @order.changes if @order.changed?
+        @order.reload.with_lock do
           unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
             flash[:error] = Spree.t(:order_already_updated)
             redirect_to(checkout_state_path(@order.state)) && return
           end
           @order.increment!(:state_lock_version)
         end
+        @order.assign_attributes(changes) if changes
       end
     end
 
     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 spree.checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
         @order.state = params[:state]
       end
     end
 
     def ensure_checkout_allowed
-      unless @order.checkout_allowed?
-        redirect_to spree.cart_path
-      end
+      redirect_to spree.cart_path unless @order.checkout_allowed?
     end
 
     def ensure_order_not_completed
@@ -127,8 +129,8 @@ module Spree
     end
 
     # Provides a route to redirect after order completion
-    def completion_route(custom_params = nil)
-      spree.order_path(@order, custom_params)
+    def completion_route(custom_params = {})
+      spree.order_path(@order, custom_params.merge(locale: locale_param))
     end
 
     def setup_for_current_state
@@ -139,8 +141,8 @@ module Spree
     def before_address
       # if the user has a default address, a callback takes care of setting
       # that; but if he doesn't, we need to build an empty one here
-      @order.bill_address ||= Address.build_default
-      @order.ship_address ||= Address.build_default if @order.checkout_steps.include?('delivery')
+      @order.bill_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user)
+      @order.ship_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user) if @order.checkout_steps.include?('delivery')
     end
 
     def before_delivery
@@ -151,54 +153,60 @@ module Spree
     end
 
     def before_payment
-      if @order.checkout_steps.include? "delivery"
+      if @order.checkout_steps.include? 'delivery'
         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::Dependencies.cart_remove_item_service.constantize.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
+      return unless try_spree_current_user.respond_to?(:payment_sources)
+
+      @payment_sources = try_spree_current_user.payment_sources.where(payment_method: @order.available_payment_methods)
     end
 
     def add_store_credit_payments
-      if params.has_key?(:apply_store_credit)
-        @order.add_store_credit_payments
+      if params.key?(:apply_store_credit)
+        add_store_credit_service.call(order: @order)
 
         # Remove other payment method parameters.
         params[:order].delete(:payments_attributes)
+        params[:order].delete(:existing_card)
         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 spree.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)
+        remove_store_credit_service.call(order: @order)
+        redirect_to spree.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)
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
 
     def check_authorization
-      authorize!(:edit, current_order, cookies.signed[:guest_token])
+      authorize!(:edit, current_order, cookies.signed[:token])
+    end
+
+    def set_cache_header
+      response.headers['Cache-Control'] = 'no-store'
     end
 
-    def sanitize_zip_code
-      order_params = params[:order]
-      return unless order_params
-      strip_zip(order_params[:bill_address_attributes])
-      strip_zip(order_params[:ship_address_attributes])
+    def add_store_credit_service
+      Spree::Dependencies.checkout_add_store_credit_service.constantize
     end
 
-    def strip_zip(address_params)
-      return unless address_params
-      address_params[:zipcode] = address_params[:zipcode].strip if address_params[:zipcode]
+    def remove_store_credit_service
+      Spree::Dependencies.checkout_remove_store_credit_service.constantize
     end
   end
 end

data/app/controllers/spree/cms_pages_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  class CmsPagesController < Spree::StoreController
+    before_action :load_cms_page, only: [:show]
+
+    include Spree::FrontendHelper
+    include Spree::CacheHelper
+
+    def show
+      if @page&.visible?
+        @cms_page = @page
+      elsif @page&.draft_mode? && try_spree_current_user&.admin?
+        @cms_page = @page
+        @edit_mode = true
+      else
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
+    private
+
+    def accurate_title
+      @page&.seo_title || super
+    end
+
+    def load_cms_page
+      @page = Spree::CmsPage.for_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
+    end
+  end
+end