solidus_backend 2.10.2 → 2.11.3

data/app/controllers/spree/admin/taxons_controller.rb

@@ -3,6 +3,7 @@
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
+      rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
       respond_to :html, :json, :js
 
       def index
@@ -62,7 +63,13 @@ module Spree
         end
 
         respond_with(@taxon) do |format|
-          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+          format.html do
+            if @taxon.valid?
+              redirect_to edit_admin_taxonomy_url(@taxonomy)
+            else
+              render :edit
+            end
+          end
         end
       end
 
@@ -77,6 +84,10 @@ module Spree
       def taxon_params
         params.require(:taxon).permit(permitted_taxon_attributes)
       end
+
+      def resource_not_found
+        super(flash_class: Taxon, redirect_url: admin_taxonomies_path)
+      end
     end
   end
 end

data/app/controllers/spree/admin/users/api_key_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module Users
+      class ApiKeyController < Spree::Admin::BaseController
+        def create
+          if user.generate_spree_api_key!
+            flash[:success] = t('spree.admin.api.key_generated')
+          end
+          redirect_to edit_admin_user_path(user)
+        end
+
+        def destroy
+          if user.clear_spree_api_key!
+            flash[:success] = t('spree.admin.api.key_cleared')
+          end
+          redirect_to edit_admin_user_path(user)
+        end
+
+        private
+
+        def user
+          @user ||= Spree.user_class.find(params[:user_id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/users_controller.rb

@@ -82,6 +82,16 @@ module Spree
       end
 
       def generate_api_key
+        Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
+          The route or controller action you are using is deprecated.
+
+          Instead of:
+          generate_api_key_admin_user PUT    /admin/users/:id/generate_api_key
+
+          Please use:
+          admin_user_api_key          POST   /admin/users/:user_id/api_key
+        WARN
+
         if @user.generate_spree_api_key!
           flash[:success] = t('spree.admin.api.key_generated')
         end
@@ -89,6 +99,16 @@ module Spree
       end
 
       def clear_api_key
+        Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
+          The route or controller action you are using is deprecated.
+
+          Instead of:
+          clear_api_key_admin_user PUT    /admin/users/:id/clear_api_key
+
+          Please use:
+          admin_user_api_key       DELETE /admin/users/:user_id/api_key
+        WARN
+
         if @user.clear_spree_api_key!
           flash[:success] = t('spree.admin.api.key_cleared')
         end
@@ -103,21 +123,11 @@ module Spree
 
       def collection
         return @collection if @collection
-        if request.xhr? && params[:q].present?
-          @collection = Spree.user_class.includes(:bill_address, :ship_address)
-                            .where("#{Spree.user_class.table_name}.email #{LIKE} :search
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.bill_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.bill_address_id)
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.ship_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.ship_address_id)",
-                                  { search: "#{params[:q].strip}%" })
-                            .limit(params[:limit] || 100)
-        else
-          @search = Spree.user_class.ransack(params[:q])
-          @collection = @search.result.includes(:spree_roles)
-          @collection = @collection.includes(:spree_orders)
-          @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-        end
+
+        @search = super.ransack(params[:q])
+        @collection = @search.result.includes(:spree_roles)
+        @collection = @collection.includes(:spree_orders)
+        @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
       def user_params
@@ -131,6 +141,10 @@ module Spree
           attributes += [{ spree_role_ids: [] }]
         end
 
+        if can? :manage, Spree::StockLocation
+          attributes += [{ stock_location_ids: [] }]
+        end
+
         unless can? :update_password, @user
           attributes -= [:password, :password_confirmation]
         end
@@ -151,24 +165,27 @@ module Spree
       end
 
       def load_roles
-        @roles = Spree::Role.all
+        @roles = Spree::Role.accessible_by(current_ability)
         if @user
           @user_roles = @user.spree_roles
         end
       end
 
       def load_stock_locations
-        @stock_locations = Spree::StockLocation.all
+        @stock_locations = Spree::StockLocation.accessible_by(current_ability)
       end
 
       def set_roles
-        if user_params[:spree_role_ids] && can?(:manage, Spree::Role)
-          @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
+        if user_params[:spree_role_ids]
+          @user.spree_roles = Spree::Role.accessible_by(current_ability).where(id: user_params[:spree_role_ids])
         end
       end
 
       def set_stock_locations
-        @user.stock_locations = Spree::StockLocation.where(id: (params[:user][:stock_location_ids] || []))
+        if user_params[:stock_location_ids]
+          @user.stock_locations =
+            Spree::StockLocation.accessible_by(current_ability).where(id: user_params[:stock_location_ids])
+        end
       end
     end
   end

data/app/controllers/spree/admin/variants_controller.rb

@@ -21,7 +21,7 @@ module Spree
 
       def collection
         if params[:deleted] == "on"
-          base_variant_scope ||= super.with_deleted
+          base_variant_scope ||= super.with_discarded
         else
           base_variant_scope ||= super
         end
@@ -43,8 +43,10 @@ module Spree
       end
 
       def parent
-        @parent ||= Spree::Product.with_deleted.find_by(slug: params[:product_id])
+        @parent ||= Spree::Product.with_discarded.find_by!(slug: params[:product_id])
         @product = @parent
+      rescue ActiveRecord::RecordNotFound
+        resource_not_found(flash_class: Spree::Product, redirect_url: admin_products_path)
       end
     end
   end

data/app/controllers/spree/admin/zones_controller.rb

@@ -20,7 +20,7 @@ module Spree
 
       def load_data
         @countries = Spree::Country.order(:name)
-        @states = Spree::State.order(:name)
+        @states = Spree::State.includes(:country).order(:name)
         @zones = Spree::Zone.order(:name)
       end
     end

data/app/helpers/spree/admin/base_helper.rb

@@ -120,6 +120,8 @@ module Spree
         css_classes = options[:class] ? options[:class] + " spree_add_fields" : "spree_add_fields"
         link_to_with_icon('plus', name, 'javascript:', data: { target: target }, class: css_classes)
       end
+      deprecate link_to_add_fields: "Please use button_tag instead, Example: \n" \
+        "button_tag \"Name\", type: \"button\", data: { target: \"tbody#div\" }", deprecator: Spree::Deprecation
 
       # renders hidden field and link to remove record using nested_attributes
       def link_to_remove_fields(name, form, options = {})
@@ -130,6 +132,8 @@ module Spree
         link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: t('spree.actions.remove')) +
           form.hidden_field(:_destroy)
       end
+      deprecate link_to_remove_fields: "Please use link_to_delete instead, Example: \n" \
+        "link_to_delete \"form.object\"", deprecator: Spree::Deprecation
 
       def spree_dom_id(record)
         dom_id(record, 'spree')

data/app/helpers/spree/admin/customer_returns_helper.rb

@@ -4,7 +4,7 @@ module Spree
   module Admin
     module CustomerReturnsHelper
       def reimbursement_types
-        @reimbursement_types ||= Spree::ReimbursementType.accessible_by(current_ability, :read).active
+        @reimbursement_types ||= Spree::ReimbursementType.accessible_by(current_ability).active
       end
     end
   end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -7,7 +7,7 @@ module Spree
         @admin_breadcrumbs ||= []
       end
 
-      # Add items to current page breadcrumb heirarchy
+      # Add items to current page breadcrumb hierarchy
       def admin_breadcrumb(*ancestors, &block)
         admin_breadcrumbs.concat(ancestors) if ancestors.present?
         admin_breadcrumbs.push(capture(&block)) if block_given?

data/app/helpers/spree/admin/orders_helper.rb

@@ -8,11 +8,15 @@ module Spree
         links = []
         @order_events.sort.each do |event|
           next unless @order.send("can_#{event}?")
-          links << button_to(t(event, scope: 'spree'), [event, :admin, @order],
-                             method: :put,
-                             data: { confirm: t('spree.order_sure_want_to', event: t(event, scope: 'spree')) })
+          translated_event = t(event, scope: [:spree, :admin, :order, :events])
+          links << button_to(
+            translated_event,
+            [event, :admin, @order],
+            method: :put,
+            data: { confirm: t(:order_sure_want_to, event: translated_event, scope: :spree) }
+          )
         end
-        safe_join(links, '&nbsp;'.html_safe)
+        safe_join(links, "&nbsp;".html_safe)
       end
 
       def line_item_shipment_price(line_item, quantity)

data/app/helpers/spree/admin/stock_movements_helper.rb

@@ -4,12 +4,16 @@ module Spree
   module Admin
     module StockMovementsHelper
       def pretty_originator(stock_movement)
-        if stock_movement.originator.respond_to?(:number)
-          if stock_movement.originator.respond_to?(:order)
-            link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+        originator = stock_movement.originator
+
+        if originator.respond_to?(:number)
+          if originator.respond_to?(:order)
+            link_to originator.number, [:edit, :admin, originator.order]
           else
-            stock_movement.originator.number
+            originator.number
           end
+        elsif originator.respond_to?(:email)
+          originator.email
         else
           ""
         end

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -1,8 +1,7 @@
-<table class="index return-items-table">
+<table class="index return-items-table selectable-table">
   <thead>
     <tr>
       <th>
-        <%= check_box_tag 'select-all' %>
       </th>
       <th><%= Spree::Product.model_name.human %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
@@ -25,7 +24,7 @@
             <%= item_fields.hidden_field :return_authorization_id %>
             <%= item_fields.hidden_field :amount %>
           </div>
-          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.amount}, '1', '0' %>
+          <%= item_fields.check_box :returned, {checked: false, class: 'selectable add-item', "data-price" => return_item.amount}, '1', '0' %>
         </td>
         <td>
           <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>

data/app/views/spree/admin/images/index.html.erb

@@ -5,7 +5,9 @@
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary') %></li>
+    <li>
+      <%= link_to t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary' %>
+    </li>
   <% end %>
 <% end %>
 
@@ -13,29 +15,31 @@
   <%= render 'new', product: @product, image: Spree::Image.new(viewable: @product) %>
 </div>
 
-<fieldset class="no-border-bottom">
-  <legend align="center"><%= t(".upload_images") %></legend>
+<% if can?(:create, Spree::Image) %>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= t(".upload_images") %></legend>
 
-  <div id="upload-zone">
-    <%= form_for [:admin, @product, Spree::Image.new],
-        html: { multipart: true, id: 'upload-form' } do |f| %>
-      <label class="upload">
-        <i class="fa fa-5x fa-cloud-upload"></i>
-        <p>
-          <span class="button"><%= t(".choose_files") %></span>
-        </p>
-        <p>
-          <%= t(".drag_and_drop") %>
-        </p>
+    <div id="upload-zone">
+      <%= form_for [:admin, @product, Spree::Image.new],
+          html: { multipart: true, id: 'upload-form' } do |f| %>
+        <label class="upload">
+          <i class="fa fa-5x fa-cloud-upload"></i>
+          <p>
+            <span class="button"><%= t(".choose_files") %></span>
+          </p>
+          <p>
+            <%= t(".drag_and_drop") %>
+          </p>
 
-        <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
-        <%= f.hidden_field :viewable_id, value: @product.master.id %>
-      </label>
-    <% end %>
-  </div>
+          <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
+          <%= f.hidden_field :viewable_id, value: @product.master.id %>
+        </label>
+      <% end %>
+    </div>
 
-  <div id="progress-zone" class="row"></div>
-</fieldset>
+    <div id="progress-zone" class="row"></div>
+  </fieldset>
+<% end %>
 
 <% no_images = @product.gallery.images.empty? %>
 

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -7,5 +7,12 @@
   </td>
   <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
-  <td class="actions"><%= link_to_remove_fields t('spree.actions.remove'), f, no_text: true %></td>
+  <td class="actions">
+    <% if f.object.persisted? %>
+      <%= link_to_delete f.object, no_text: true %>
+    <% else %>
+      <%= link_to_with_icon('trash', 'remove', '#', no_text: true, class: "spree_remove_fields",
+            data: { action: 'remove' }, title: t('spree.actions.remove')) %>
+    <% end %>
+  </td>
 </tr>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -6,7 +6,9 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'btn btn-primary' %>
+      <%= button_tag t('spree.add_option_value'), type: 'button',
+            data: { target: 'tbody#option_values' },
+            class: 'btn btn-primary spree_add_fields' %>
     </span>
   </li>
 <% end %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -41,6 +41,19 @@
   </fieldset>
 
   <div class="row">
+    <% if Spree::Config[:order_bill_address_used] %>
+      <div class="col-6" data-hook="bill_address_wrapper">
+        <fieldset class="no-border-bottom">
+          <legend align="center"><%= t('spree.billing_address') %></legend>
+          <div class="js-billing-address">
+            <%= f.fields_for :bill_address do |ba_form| %>
+              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
+            <% end %>
+          </div>
+        </fieldset>
+      </div>
+    <% end %>
+
     <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= t('spree.shipping_address') %></legend>
@@ -62,19 +75,6 @@
         </div>
       </fieldset>
     </div>
-
-    <% if Spree::Config[:order_bill_address_used] %>
-      <div class="col-6" data-hook="bill_address_wrapper">
-        <fieldset class="no-border-bottom">
-          <legend align="center"><%= t('spree.billing_address') %></legend>
-          <div class="js-billing-address">
-            <%= f.fields_for :bill_address do |ba_form| %>
-              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
-            <% end %>
-          </div>
-        </fieldset>
-      </div>
-    <% end %>
   </div>
 
   <div class="clear"></div>

data/app/views/spree/admin/orders/index.html.erb

@@ -7,7 +7,7 @@
   <li>
     <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
   </li>
-<% end if can? :create, Spree::Order %>
+<% end if can? :manage, Spree::Order %>
 
 <% content_for :table_filter_title do %>
   <%= t('spree.filter') %>
@@ -65,14 +65,21 @@
             </div>
 
             <div class="col-12 col-xl-6">
-              <div class="field">
-                <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
-                <%= f.text_field :bill_address_firstname_start, size: 25 %>
-              </div>
-              <div class="field">
-                <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
-                <%= f.text_field :bill_address_lastname_start, size: 25%>
-              </div>
+              <% if Spree::Config.use_combined_first_and_last_name_in_address %>
+                <div class="field">
+                  <%= label_tag :q_bill_address_firstname_or_lastname_start, t('spree.name_contains') %>
+                  <%= f.text_field :bill_address_firstname_or_lastname_start, size: 25 %>
+                </div>
+              <% else %>
+                <div class="field">
+                  <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
+                  <%= f.text_field :bill_address_firstname_start, size: 25 %>
+                </div>
+                <div class="field">
+                  <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
+                  <%= f.text_field :bill_address_lastname_start, size: 25 %>
+                </div>
+              <% end %>
             </div>
 
             <div class="col-12 col-xl-6">
@@ -177,8 +184,9 @@
           <% if order.user %>
             <%= link_to order.email, edit_admin_user_path(order.user) %>
           <% else %>
-            <%= mail_to order.email %>
+            <%= order.email %>
           <% end %>
+          <%= link_to_with_icon('email', t('spree.actions.send_email'), "mailto:#{order.email}", no_text: true) %>
         </td>
         <td class="align-right"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
@@ -190,9 +198,11 @@
   </table>
 <% else %>
   <div class="no-objects-found">
-    <%= render 'spree/admin/shared/no_objects_found',
-                 resource: Spree::Order,
-                 new_resource_url: spree.new_admin_order_path %>
+    <% if can? :manage, Spree::Order %>
+      <%= render 'spree/admin/shared/no_objects_found',
+                   resource: Spree::Order,
+                   new_resource_url: spree.new_admin_order_path %>
+    <% end %>
   </div>
 <% end %>