solidus_frontend 2.6.5 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0afc7f4b4eedf6436cc5522b2dafda85c15464cbd604fdfc44c0cebaa1f26359
-  data.tar.gz: cfec130241aaeeea4bb874778801e6fe04fc631a25f235a4e2ef82797168961f
+  metadata.gz: '021429976db5161133e0b99d6fe493da794d0b8c1a54062a3fe1f0dec420fb41'
+  data.tar.gz: 89e3e0326e2aced1f9d1107442816b64a2c554c719f883e408cfc0cb4597b820
 SHA512:
-  metadata.gz: 88de1ce45b86e5a00d00c6ee8b900b0f0e9af70fae5bcfd4e375f43bac130ff67d57fe569d4f207ad647e8fe575dd99828032c25ea0d4dc72502fa632cbbf209
-  data.tar.gz: b2a5c4a1514cc2254c0cba837929fade6773140f537d0a37f8228249cc678afcb3a6e4230bdcacf456fdae531e8f961c920f2f8434abad98396189ff03626cc9
+  metadata.gz: 274a3dceabef1220e03a11f56081ecfb9501076ef83b7a85b5efb7eaa1ee8858612dbcb516aa73451d89141f195dcfa55a64ef4a7601adedb77762ff7047655e
+  data.tar.gz: 53f65dd4e588101f31592f22401617e8cf871fa58c6e3ff1d025e9af0c533890e39cffe65d8e5cde3f8fdd60da845a027bf95ed6a462d209e03c71bd4a07666b

data/README.md

@@ -11,19 +11,19 @@ Solidus provides a generator to help with copying the right view into your host
 
 Simply call the generator to copy all views into your host app.
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override
 ```
 
 If you only want to copy certain views into your host app, you can provide the `--only` argument:
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override --only products/show
 ```
 
 The argument to `--only` can also be a substring of the name of the view from the `app/views/spree` folder:
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override --only product
 ```
 
@@ -31,10 +31,12 @@ This will copy all views whose directory or filename contains the string "produc
 
 ### Handle upgrades
 
-After upgrading solidus to a new version run the generator again and follow on screen instructions.
+After upgrading Solidus to a new version run the generator again and follow on screen instructions.
 
 ## Testing
 
 Run the tests
 
-    bundle exec rspec
+```bash
+bundle exec rspec
+```

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js

@@ -1,4 +1,5 @@
 Spree.onCouponCodeApply = function(e) {
+  e.preventDefault();
   var couponCodeField = $("#order_coupon_code");
   var couponCode = $.trim(couponCodeField.val());
   if (couponCode === "") {
@@ -13,7 +14,7 @@ Spree.onCouponCodeApply = function(e) {
     coupon_code: couponCode
   };
   var req = Spree.ajax({
-    method: "PUT",
+    method: 'POST',
     url: Spree.routes.apply_coupon_code(Spree.current_order_id),
     data: JSON.stringify(data),
     contentType: "application/json"

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

@@ -948,9 +948,35 @@ p[data-hook="use_billing"] {
   padding: 5px;
 }
 
+.coupon-code {
+  margin-top: 20px;
+  padding: 10px;
+
+  form {
+    display: flex;
+    flex-flow: row wrap;
+  }
+
+  label {
+    flex: 1 100%;
+    text-align: left;
+  }
+
+  input[type="text"] {
+    flex: 3 0;
+    width: 100%;
+    margin-right: 5px;
+  }
+
+  &-apply-button {
+    white-space: nowrap;
+  }
+}
+
 #coupon_status {
+  margin-top: 10px;
   font-weight: bold;
-  font-size: 125%;
+  font-size: 100%;
   &.success {
     color: $c_green;
   }
@@ -1066,6 +1092,9 @@ div[data-hook="inside_cart_form"] {
 /*--------------------------------------*/
 #order_summary {
   margin-top: 0;
+  h1 {
+    padding-left: 10px;
+  }
 }
 #order {
   p[data-hook="links"] {
@@ -1236,6 +1265,15 @@ table.order-summary {
 
 }
 
+// # Logo
+#logo {
+  padding: 20px 0;
+  
+  > a {
+    display: inline-block;
+  }
+}
+
 @media only screen and (max-width: 767px) {
   #empty-cart {
     clear: both;

data/app/controllers/spree/checkout_controller.rb

@@ -24,6 +24,7 @@ module Spree
     helper 'spree/orders'
 
     rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
+    rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
     # Updates the order and advances to the next state (when possible.)
     def update
@@ -166,6 +167,24 @@ module Spree
       spree.order_path(@order)
     end
 
+    def apply_coupon_code
+      if update_params[:coupon_code].present?
+        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
+        @order.coupon_code = update_params[:coupon_code]
+
+        handler = PromotionHandler::Coupon.new(@order).apply
+
+        if handler.error.present?
+          flash.now[:error] = handler.error
+        elsif handler.success
+          flash[:success] = handler.success
+        end
+
+        setup_for_current_state
+        respond_with(@order) { |format| format.html { render :edit } } && return
+      end
+    end
+
     def setup_for_current_state
       method_name = :"before_#{@order.state}"
       send(method_name) if respond_to?(method_name, true)
@@ -200,9 +219,14 @@ module Spree
         @wallet_payment_sources = try_spree_current_user.wallet.wallet_payment_sources
         @default_wallet_payment_source = @wallet_payment_sources.detect(&:default) ||
                                          @wallet_payment_sources.first
-        # TODO: How can we deprecate this instance variable?  We could try
-        # wrapping it in a delegating object that produces deprecation warnings.
-        @payment_sources = try_spree_current_user.wallet.wallet_payment_sources.map(&:payment_source).select { |ps| ps.is_a?(Spree::CreditCard) }
+
+        @payment_sources = Spree::DeprecatedInstanceVariableProxy.new(
+          self,
+          :deprecated_payment_sources,
+          :@payment_sources,
+          Spree::Deprecation,
+          "Please, do not use @payment_sources anymore, use @wallet_payment_sources instead."
+        )
       end
     end
 
@@ -215,5 +239,39 @@ module Spree
     def check_authorization
       authorize!(:edit, current_order, cookies.signed[:guest_token])
     end
+
+    def insufficient_stock_error
+      packages = @order.shipments.map(&:to_package)
+      if packages.empty?
+        flash[:error] = I18n.t('spree.insufficient_stock_for_order')
+        redirect_to cart_path
+      else
+        availability_validator = Spree::Stock::AvailabilityValidator.new
+        unavailable_items = @order.line_items.reject { |line_item| availability_validator.validate(line_item) }
+        if unavailable_items.any?
+          item_names = unavailable_items.map(&:name).to_sentence
+          flash[:error] = t('spree.inventory_error_flash_for_insufficient_shipment_quantity', unavailable_items: item_names)
+          @order.restart_checkout_flow
+          redirect_to spree.checkout_state_path(@order.state)
+        end
+      end
+    end
+
+    # This method returns payment sources of the current user. It is no more
+    # used into our frontend. We used to assign the content of this method
+    # into an ivar (@payment_sources) into the checkout payment step. This
+    # method is here only to be able to deprecate this ivar and will be removed.
+    #
+    # DO NOT USE THIS METHOD!
+    #
+    # @return [Array<Spree::PaymentSource>] Payment sources connected to
+    #   current user wallet.
+    # @deprecated This method has been added to deprecate @payment_sources
+    #   ivar and will be removed. Use @wallet_payment_sources instead.
+    def deprecated_payment_sources
+      try_spree_current_user.wallet.wallet_payment_sources
+        .map(&:payment_source)
+        .select { |ps| ps.is_a?(Spree::CreditCard) }
+    end
   end
 end

data/app/controllers/spree/coupon_codes_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Spree
+  class CouponCodesController < Spree::StoreController
+    before_action :load_order, only: :create
+    around_action :lock_order, only: :create
+
+    def create
+      authorize! :update, @order, cookies.signed[:guest_token]
+
+      if params[:coupon_code].present?
+        @order.coupon_code = params[:coupon_code]
+        handler = PromotionHandler::Coupon.new(@order).apply
+
+        respond_with(@order) do |format|
+          format.html do
+            if handler.successful?
+              flash[:success] = handler.success
+              redirect_to cart_path
+            else
+              flash.now[:error] = handler.error
+              render 'spree/coupon_codes/new'
+            end
+          end
+        end
+      end
+    end
+
+    private
+
+    def load_order
+      @order = current_order
+    end
+  end
+end

data/app/controllers/spree/locale_controller.rb

@@ -7,7 +7,7 @@ module Spree
       requested_locale = params[:switch_to_locale] || params[:locale]
 
       if requested_locale && available_locales.map(&:to_s).include?(requested_locale)
-        session[:locale] = requested_locale
+        session[set_user_language_locale_key] = requested_locale
         I18n.locale = requested_locale
         flash.notice = t('spree.locale_changed')
       else

data/app/controllers/spree/orders_controller.rb

@@ -2,11 +2,11 @@
 
 module Spree
   class OrdersController < Spree::StoreController
-    before_action :check_authorization
     helper 'spree/products', 'spree/orders'
 
     respond_to :html
 
+    before_action :store_guest_token
     before_action :assign_order, only: :update
     # note: do not lock the #edit action because that's where we redirect when we fail to acquire a lock
     around_action :lock_order, only: :update
@@ -15,9 +15,11 @@ module Spree
 
     def show
       @order = Spree::Order.find_by!(number: params[:id])
+      authorize! :read, @order, cookies.signed[:guest_token]
     end
 
     def update
+      authorize! :update, @order, cookies.signed[:guest_token]
       if @order.contents.update_cart(order_params)
         @order.next if params.key?(:checkout) && @order.cart?
 
@@ -38,12 +40,15 @@ module Spree
     # Shows the current incomplete order from the session
     def edit
       @order = current_order || Spree::Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+      authorize! :read, @order, cookies.signed[:guest_token]
       associate_user
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
-      @order   = current_order(create_order_if_necessary: true)
+      @order = current_order(create_order_if_necessary: true)
+      authorize! :update, @order, cookies.signed[:guest_token]
+
       variant  = Spree::Variant.find(params[:variant_id])
       quantity = params[:quantity].present? ? params[:quantity].to_i : 1
 
@@ -78,6 +83,7 @@ module Spree
 
     def empty
       if @order = current_order
+        authorize! :update, @order, cookies.signed[:guest_token]
         @order.empty!
       end
 
@@ -92,19 +98,12 @@ module Spree
       end
     end
 
-    def check_authorization
-      cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
-      order = Spree::Order.find_by(number: params[:id]) || current_order
+    private
 
-      if order
-        authorize! :edit, order, cookies.signed[:guest_token]
-      else
-        authorize! :create, Spree::Order
-      end
+    def store_guest_token
+      cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
     end
 
-    private
-
     def order_params
       if params[:order]
         params[:order].permit(*permitted_order_attributes)
@@ -120,5 +119,21 @@ module Spree
         redirect_to(root_path) && return
       end
     end
+
+    def apply_coupon_code
+      if order_params[:coupon_code].present?
+        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
+        @order.coupon_code = order_params[:coupon_code]
+
+        handler = PromotionHandler::Coupon.new(@order).apply
+
+        if handler.error.present?
+          flash.now[:error] = handler.error
+          respond_with(@order) { |format| format.html { render :edit } } && return
+        elsif handler.success
+          flash[:success] = handler.success
+        end
+      end
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -16,24 +16,6 @@ module Spree
 
     private
 
-    # This method is placed here so that the CheckoutController
-    # and OrdersController can both reference it (or any other controller
-    # which needs it)
-    def apply_coupon_code
-      if params[:order] && params[:order][:coupon_code]
-        @order.coupon_code = params[:order][:coupon_code]
-
-        handler = PromotionHandler::Coupon.new(@order).apply
-
-        if handler.error.present?
-          flash.now[:error] = handler.error
-          respond_with(@order) { |format| format.html { render :edit } } && return
-        elsif handler.success
-          flash[:success] = handler.success
-        end
-      end
-    end
-
     def config_locale
       Spree::Frontend::Config[:locale]
     end

data/app/controllers/spree/taxons_controller.rb

@@ -4,12 +4,11 @@ module Spree
   class TaxonsController < Spree::StoreController
     helper 'spree/products', 'spree/taxon_filters'
 
+    before_action :load_taxon, only: [:show]
+
     respond_to :html
 
     def show
-      @taxon = Spree::Taxon.find_by!(permalink: params[:id])
-      return unless @taxon
-
       @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
       @products = @searcher.retrieve_products
       @taxonomies = Spree::Taxonomy.includes(root: :children)
@@ -17,6 +16,10 @@ module Spree
 
     private
 
+    def load_taxon
+      @taxon = Spree::Taxon.find_by!(permalink: params[:id])
+    end
+
     def accurate_title
       if @taxon
         @taxon.seo_title

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

@@ -0,0 +1,12 @@
+<div class="coupon-code" data-hook='coupon_code'>
+  <%= form_for order, url: update_checkout_path(order.state) do |form| %>
+    <%= form.label :coupon_code %>
+    <%= form.text_field :coupon_code, placeholder: true %>
+
+    <button type="submit" class="button coupon-code-apply-button" id="coupon-code-apply-button">
+      <%= t('spree.apply_code') %>
+    </button>
+  <% end %>
+
+  <div id='coupon_status'></div>
+</div>

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

@@ -27,7 +27,9 @@
               <% ship_form.object.manifest.each do |item| %>
                 <tr class="stock-item">
                   <td class="item-image">
-                    <%= render 'spree/shared/image', image: item.variant.display_image, size: :mini %>
+                    <%= render 'spree/shared/image',
+                      image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                      size: :mini %>
                   </td>
                   <td class="item-name"><%= item.variant.name %></td>
                   <td class="item-qty"><%= item.quantity %></td>
@@ -75,7 +77,9 @@
               <% @differentiator.missing.each do |variant, quantity| %>
                 <tr class="stock-item">
                   <td class="item-image">
-                    <%= render 'spree/shared/image', image: variant.display_image, size: :mini %>
+                    <%= render 'spree/shared/image',
+                      image: (variant.gallery.images.first || variant.product.gallery.images.first),
+                      size: :mini %>
                   </td>
                   <td class="item-name"><%= variant.name %></td>
                   <td class="item-qty"><%= quantity %></td>