solidus_backend 2.10.0.beta1 → 2.10.0

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/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,9 +28,9 @@ 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
 

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

@@ -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

@@ -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/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

@@ -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/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/edit.html.erb

@@ -18,7 +18,7 @@
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
-<div data-hook="admin_order_edit_sub_header" />
+<div data-hook="admin_order_edit_sub_header"></div>
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">

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/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>

data/app/views/spree/admin/shared/_calculator_fields.html.erb

@@ -4,6 +4,11 @@
   <div id="preference-settings">
     <div class="field">
       <%= f.label(:calculator_type, Spree::Calculator.model_name.human) %>
+
+      <% if local_assigns.has_key? :hint %>
+        <%= admin_hint t("spree.#{hint}"), t(hint, scope: [:spree, :hints, "spree/calculator"]) %>
+      <% end %>
+
       <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'custom-select fullwidth js-calculator-type'}) %>
     </div>
 

data/app/views/spree/admin/shared/_navigation.html.erb

@@ -3,6 +3,9 @@
   <div class="admin-nav-sticky">
     <%= render partial: 'spree/admin/shared/menu' %>
     <div class="admin-nav-footer">
+      <%= button_tag class: 'btn fa fa-chevron-circle-left', id: 'admin-nav-toggle', type: :button do %>
+        <span class="text"><%= t('spree.minimize_menu') %></span>
+      <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
       <%= render partial: 'spree/admin/shared/navigation_footer' %>
     </div>

data/app/views/spree/admin/shared/_new_resource_links.html.erb

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+  <%= submit_tag t('spree.actions.create'), class: 'btn btn-primary' %>
   <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -13,7 +13,7 @@
 
   <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
     can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons) %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -100,7 +100,7 @@
   </div>
   <div class="col-5">
     <div data-hook="admin_shipping_method_form_calculator_fields">
-      <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, hint: :shipping_methods } %>
     </div>
     <div>
       <fieldset class="tax_categories no-border-bottom">

data/app/views/spree/admin/tax_rates/_form.html.erb

@@ -58,5 +58,5 @@
 
   <div class="clear"></div>
 
-  <%= render 'spree/admin/shared/calculator_fields', f: f %>
+  <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, hint: :tax_rates } %>
 </div>

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

@@ -12,7 +12,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="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' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/taxons/_form.html.erb

@@ -20,11 +20,7 @@
       </div>
     <% end %>
 
-    <%= f.field_container :icon do %>
-      <%= f.label :icon %><br />
-      <%= f.file_field :icon %>
-      <%= image_tag f.object.icon(:mini) if f.object.icon_present? %>
-    <% end %>
+    <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
   </div>
 
   <div class="col-5">

data/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb

@@ -0,0 +1,16 @@
+<% f.object.class.attachment_definitions.each do |attachment, definition| %>
+  <%= f.field_container attachment do %>
+    <%= f.label attachment %><br>
+    <%= f.file_field attachment %>
+    <% if f.object.send(attachment).exists? %>
+      <%= image_tag f.object.send(attachment, definition[:default_style]) %>
+      <%= link_to t('spree.actions.remove'),
+                  admin_taxonomy_taxon_attachment_path(@taxonomy,
+                                                       @taxon.id,
+                                                       attachment_definition: attachment,
+                                                       authenticity_token: form_authenticity_token),
+                  method: :delete,
+                  class: 'btn btn-sm btn-danger' %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/users/_form.html.erb

@@ -60,18 +60,20 @@
   </div>
 
   <div data-hook="admin_user_form_password_fields" class="col-6">
-    <%= f.field_container :password do %>
-      <%= f.label :password %>
-      <%= f.password_field :password, class: 'fullwidth' %>
-      <%= f.error_message_on :password %>
-    <% end %>
+    <% if can? :update_password, @user %>
+      <%= f.field_container :password do %>
+        <%= f.label :password %>
+        <%= f.password_field :password, class: 'fullwidth' %>
+        <%= f.error_message_on :password %>
+      <% end %>
 
 
-    <% if f.object.respond_to?(:password_confirmation) %>
-      <%= f.field_container :password do %>
-        <%= f.label :password_confirmation %>
-        <%= f.password_field :password_confirmation, class: 'fullwidth' %>
-        <%= f.error_message_on :password_confirmation %>
+      <% if f.object.respond_to?(:password_confirmation) %>
+        <%= f.field_container :password do %>
+          <%= f.label :password_confirmation %>
+          <%= f.password_field :password_confirmation, class: 'fullwidth' %>
+          <%= f.error_message_on :password_confirmation %>
+        <% end %>
       <% end %>
     <% end %>
   </div>

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

@@ -1,6 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
-<% admin_breadcrumb(@user.email) %>
-
+<% admin_breadcrumb(@user.valid? ? @user.email : @user.email_was) %>
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :account %>