solidus_backend 2.9.5 → 2.10.2

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -169,6 +169,8 @@ $actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-act
 //--------------------------------------------------------------
 $width-sidebar:                  200px !default;
 $width-sidebar-flyout:           225px !default;
+$width-sidebar-collapsed:        52px !default;
+$sidebar-transition:             250ms ease-in !default;
 $border-sidebar:                 1px solid $color-sidebar-border !default;
 
 // Main

data/app/assets/stylesheets/spree/backend/shared/_header.scss

@@ -1,11 +1,15 @@
 .main-header {
   display: flex;
   align-items: center;
-  padding: 15px $grid-gutter-width;
   background-color: $color-header-bg;
+  padding: ($grid-gutter-width / 2) $grid-gutter-width;
   border-bottom: 1px solid $color-border;
   height: $main-header-height;
 
+  .admin-nav-hidden & {
+    margin-left: ($width-sidebar - $width-sidebar-collapsed);
+  }
+
   @media print { display: none }
 }
 

data/app/assets/stylesheets/spree/backend/shared/_layout.scss

@@ -12,15 +12,6 @@ body {
   background-color: $admin-body-bg;
 }
 
-.admin-nav {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: $width-sidebar;
-  @media print { display: none }
-}
-
 .content-wrapper {
   background-color: $content-wrapper-bg;
   padding-top: 1rem;

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

@@ -40,7 +40,7 @@ module Spree
         [
           Spree::AdjustmentReason.active.to_a,
           @adjustment.adjustment_reason
-        ].flatten.compact.uniq.sort_by { |r| r.name.downcase }
+        ].flatten.compact.uniq.sort_by { |reason| reason.name.downcase }
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
-      layout '/spree/layouts/admin'
+      layout 'spree/layouts/admin'
 
       before_action :authorize_admin
 

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

@@ -105,8 +105,8 @@ module Spree
         @order.complete!
         flash[:success] = t('spree.order_completed')
         redirect_to edit_admin_order_url(@order)
-      rescue StateMachines::InvalidTransition => e
-        flash[:error] = e.message
+      rescue StateMachines::InvalidTransition => error
+        flash[:error] = error.message
         redirect_to confirm_admin_order_url(@order)
       end
 

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

@@ -28,13 +28,13 @@ module Spree
         invoke_callbacks(:update, :before)
 
         attributes = payment_method_params
-        attributes.each do |k, _v|
-          if k.include?("password") && attributes[k].blank?
-            attributes.delete(k)
+        attributes.each do |key, _value|
+          if key.include?("password") && attributes[key].blank?
+            attributes.delete(key)
           end
         end
 
-        if @payment_method.update_attributes(attributes)
+        if @payment_method.update(attributes)
           invoke_callbacks(:update, :after)
           flash[:success] = t('spree.successfully_updated', resource: t('spree.payment_method'))
           redirect_to edit_admin_payment_method_path(@payment_method)

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

@@ -46,8 +46,8 @@ module Spree
             flash[:error] = t('spree.payment_could_not_be_created')
             render :new
           end
-        rescue Spree::Core::GatewayError => e
-          flash[:error] = e.message.to_s
+        rescue Spree::Core::GatewayError => error
+          flash[:error] = error.message.to_s
           redirect_to new_admin_order_payment_path(@order)
         end
       end

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController
-      belongs_to 'spree/product', find_by: :slug
+      belongs_to 'spree/product', find_by: :slug, includes: { product_properties: :property }
       before_action :find_properties
       before_action :setup_property, only: :index, if: -> { can?(:create, model_class) }
       before_action :setup_variant_property_rules, only: :index

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

@@ -26,7 +26,7 @@ module Spree
           end
         end
         invoke_callbacks(:update, :before)
-        if @object.update_attributes(permitted_resource_params)
+        if @object.update(permitted_resource_params)
           invoke_callbacks(:update, :after)
           flash[:success] = flash_message_for(@object, :successfully_updated)
           respond_with(@object) do |format|
@@ -120,7 +120,7 @@ module Spree
       end
 
       def product_includes
-        [{ variants: [:images], master: [:images, :default_price] }]
+        [:variant_images, { variants: [:images], master: [:images, :default_price] }]
       end
 
       def clone_object_url(resource)

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

@@ -30,7 +30,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def update
     invoke_callbacks(:update, :before)
-    if @object.update_attributes(permitted_resource_params)
+    if @object.update(permitted_resource_params)
       invoke_callbacks(:update, :after)
       respond_with(@object) do |format|
         format.html do
@@ -107,8 +107,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     else
       invoke_callbacks(:destroy, :fails)
       respond_with(@object) do |format|
-        format.html { redirect_to location_after_destroy }
-        format.js { render status: :unprocessable_entity, plain: @object.errors.full_messages.join(', ') }
+        message = @object.errors.full_messages.to_sentence
+        format.html do
+          flash[:error] = message
+          redirect_to location_after_destroy
+        end
+        format.js do
+          render status: :unprocessable_entity, plain: message
+        end
       end
     end
   end
@@ -123,6 +129,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       @parent_data[:model_name] = model_name
       @parent_data[:model_class] = (options[:model_class] || model_name.to_s.classify.constantize)
       @parent_data[:find_by] = options[:find_by] || :id
+      @parent_data[:includes] = options[:includes]
     end
   end
 
@@ -183,7 +190,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def parent
     if parent?
-      @parent ||= self.class.parent_data[:model_class].find_by(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
+      @parent ||= self.class.parent_data[:model_class]
+                    .includes(self.class.parent_data[:includes])
+                    .find_by(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
       instance_variable_set("@#{parent_model_name}", @parent)
     else
       Spree::Deprecation.warn "Calling #parent is deprecated on a ResourceController which has not defined a belongs_to"

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

@@ -4,7 +4,7 @@ module Spree
   module Admin
     class StyleGuideController < Spree::Admin::BaseController
       respond_to :html
-      layout '/spree/layouts/admin_style_guide'
+      layout 'spree/layouts/admin_style_guide'
 
       def index
         @topics = {

data/app/controllers/spree/admin/taxons/attachment_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module Taxons
+      class AttachmentController < Spree::Admin::BaseController
+        def destroy
+          taxonomy = Spree::Taxonomy.find(params[:taxonomy_id])
+          taxon = taxonomy.taxons.find(params[:taxon_id])
+          if taxon.destroy_attachment(params[:attachment_definition])
+            flash[:success] = t('spree.successfully_removed', resource: params[:attachment_definition].titleize)
+          else
+            flash[:error] = t('spree.taxon_attachment_removal_error')
+          end
+          redirect_to edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)
+        end
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module Spree
       end
 
       def update
-        if @user.update_attributes(user_params)
+        if @user.update(user_params)
           set_roles
           set_stock_locations
 
@@ -55,7 +55,7 @@ module Spree
 
       def addresses
         if request.put?
-          if @user.update_attributes(user_params)
+          if @user.update(user_params)
             flash.now[:success] = t('spree.account_updated')
           end
 
@@ -131,6 +131,10 @@ module Spree
           attributes += [{ spree_role_ids: [] }]
         end
 
+        unless can? :update_password, @user
+          attributes -= [:password, :password_confirmation]
+        end
+
         params.require(:user).permit(attributes)
       end
 

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

@@ -33,7 +33,7 @@ module Spree
         elsif content_for?(:page_title)
           content_for(:page_title)
         elsif admin_breadcrumbs.any?
-          admin_breadcrumbs.map{ |x| strip_tags(x) }.reverse.join(' - ')
+          admin_breadcrumbs.map { |breadcrumb| strip_tags(breadcrumb) }.reverse.join(' - ')
         else
           t(controller.controller_name, default: controller.controller_name.titleize, scope: 'spree')
         end
@@ -181,7 +181,8 @@ module Spree
                     url.ends_with?("#{controller.controller_name.singularize}/edit")
         options[:class] = 'fa'
         options[:class] += ' active' if is_active
-        options[:datahook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
+        options[:data] ||= {}
+        options[:data][:hook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
         content_tag(:li, options) do
           link_to(link_text, url)
         end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -4,7 +4,7 @@ module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
-      rules = Rails.application.config.spree.promotions.rules.reject { |r| existing.include? r.name }
+      rules = Rails.application.config.spree.promotions.rules.reject { |rule| existing.include? rule.name }
       options = rules.map { |rule| [rule.model_name.human, rule.name] }
       options_for_select(options)
     end

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

@@ -40,7 +40,7 @@
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+        <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
         <%= link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order), class: 'btn btn-primary' %>
       </div>
     </fieldset>

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

@@ -9,7 +9,7 @@
       <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'btn btn-primary' %>
     </span>
   </li>
-  <% end %>
+<% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
 

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

@@ -7,6 +7,7 @@
 
   <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
     <button class="js-add-line-item btn btn-primary" disabled><%= t('spree.add_line_item') %></button>
+    <button class="js-empty-cart btn btn-primary" disabled><%= t('spree.empty_cart') %></button>
   <% end %>
 
   <%= render "spree/admin/orders/order_details", { order: order } %>

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

@@ -18,13 +18,12 @@
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
-<% if can?(:update, Spree::Shipment) && can?(:update, @order) && @order.shipment_state != "shipped" %>
-  <%= render partial: 'add_product' %>
-<% end %>
+<div data-hook="admin_order_edit_sub_header"></div>
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">
-    <%= t('spree.your_order_is_empty_add_product')%>
+    <p><%= t('spree.your_order_is_empty_add_product') %></p>
+    <%= link_to t('spree.cart'), spree.cart_admin_order_url(@order), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

data/app/views/spree/admin/payment_methods/new.html.erb

@@ -15,7 +15,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/prices/_master_variant_table.html.erb

@@ -1,41 +1,41 @@
-<div class="row">
-  <div class="col-12">
-    <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
-      <% if variants %>
-        <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
-      <% end %>
-      <table class="index master_prices">
-        <colgroup>
-          <col style="width: 30%">
-          <col style="width: 30%">
-          <col style="width: 20%">
-          <col style="width: 20%">
-        </colgroup>
-        <thead data-hook="master_prices_header">
-          <tr>
-            <th><%= Spree::Price.human_attribute_name(:country) %></th>
-            <th><%= Spree::Price.human_attribute_name(:currency) %></th>
-            <th><%= Spree::Price.human_attribute_name(:amount) %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <% master_prices.each do |price| %>
-          <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
-            <td><%= price.display_country %></td>
-            <td><%= price.currency %></td>
-            <td><%= price.money.to_html %></td>
-            <td class="actions">
-              <% if can?(:update, price) %>
-                <%= link_to_edit(price, no_text: true) unless price.deleted? %>
-              <% end %>
-              <% if can?(:destroy, price) %>
-                &nbsp;
-                <%= link_to_delete(price, no_text: true) unless price.deleted? %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    </fieldset>
-  </div>
-</div>
+<%= paginate master_prices, theme: "solidus_admin" %>
+
+<fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
+  <% if variants %>
+    <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
+  <% end %>
+  <table class="index master_prices">
+    <colgroup>
+      <col style="width: 30%">
+      <col style="width: 30%">
+      <col style="width: 20%">
+      <col style="width: 20%">
+    </colgroup>
+    <thead data-hook="master_prices_header">
+      <tr>
+        <th><%= Spree::Price.human_attribute_name(:country) %></th>
+        <th><%= Spree::Price.human_attribute_name(:currency) %></th>
+        <th><%= Spree::Price.human_attribute_name(:amount) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <% master_prices.each do |price| %>
+      <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
+        <td><%= price.display_country %></td>
+        <td><%= price.currency %></td>
+        <td><%= price.money.to_html %></td>
+        <td class="actions">
+          <% if can?(:update, price) %>
+            <%= link_to_edit(price, no_text: true) unless price.deleted? %>
+          <% end %>
+          <% if can?(:destroy, price) %>
+            &nbsp;
+            <%= link_to_delete(price, no_text: true) unless price.deleted? %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</fieldset>
+
+<%= paginate master_prices, theme: "solidus_admin" %>

data/app/views/spree/admin/promotion_code_batches/new.html.erb

@@ -24,5 +24,5 @@
     <%= f.label :email %>
     <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
   <% end %>
-  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+  <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
 <% end %>

data/app/views/spree/admin/promotion_codes/new.html.erb

@@ -24,7 +24,7 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_promotion_promotion_codes_url(@promotion), class: 'button' %>
     </div>
   </fieldset>

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -7,6 +7,7 @@
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :action_type, t('spree.adjustment_type')%>
+          <%= admin_hint t('spree.adjustment_type'), t(:promotions, scope: [:spree, :hints, "spree/calculator"]) %>
           <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
         </div>
         <div class="filter-actions actions">

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

@@ -78,7 +78,7 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">

data/app/views/spree/admin/return_authorizations/new.html.erb

@@ -13,7 +13,7 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order), class: 'btn btn-primary' %>
     </div>
   </fieldset>