solidus_backend 2.3.1 → 2.4.0.beta1

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

@@ -3,38 +3,25 @@ table {
   @extend .table;
   border-spacing: 0;
 
-  th, td {
-    border-right: 1px solid $color-border;
-    border-bottom: 1px solid $color-border;
+  &.sortable td {
     vertical-align: middle;
-    text-overflow: ellipsis;
-
-    img {
-      border: 1px solid transparent;
-    }
-
-    &:first-child {
-      border-left: 1px solid $color-border;
-    }
-
-    a {
-      border-bottom: 1px dotted lighten($link-color, 10);
+  }
 
-      &:hover {
-        border-color: lighten($link-hover-color, 10);
-      }
-    }
+  th, td {
+    text-overflow: ellipsis;
 
     .handle {
+      @extend .fa;
+      @extend .fa-bars;
+      cursor: move;
       display: block !important;
       text-align: center;
-      padding-right: 0;
+      padding: 3px 0;
     }
 
     &.actions {
-      background-color: transparent;
-      border: none !important;
-      text-align: center;
+      text-align: right;
+      padding-left: 1.25rem;
 
       span.text {
         font-size: $font-size-base;
@@ -42,29 +29,29 @@ table {
 
       .fa {
         font-size: 120%;
-        background-color: very-light($color-3);
-        border: 1px solid $color-border;
-        border-radius: 15px;
-        width: 29px;
-        height: 29px;
         display: inline-block;
-        padding-top: 6px;
+        padding: 2px 0;
+        text-align: center;
+        border-bottom: none;
+        vertical-align: middle;
 
         &:before {
-          text-align: center !important;
           padding: 0;
           width: 27px;
           display: inline-block;
-        }
-
-        &:hover {
-          border-color: transparent;
+          vertical-align: middle;
         }
       }
 
       button[class*='fa-'] {
         color: $link-color;
+        background-color: transparent;
+        border: 0 none;
         padding: 0 !important;
+
+        &:hover {
+          background-color: transparent;
+        }
       }
 
       .fa-envelope-alt, .fa-eye-open {
@@ -72,33 +59,33 @@ table {
         padding-left: 0px;
 
         &:hover {
-          background-color: $color-3;
-          color: $color-1;
+          color: $color-3;
         }
       }
+
       .fa-trash:hover, .fa-void:hover, .fa-failure:hover {
-        background-color: $brand-danger;
-        color: $color-1;
+        color: theme-color("danger");
       }
+
       .fa-cancel:hover {
-        background-color: $brand-warning;
-        color: $color-1;
+        color: theme-color("warning");
       }
-      .fa-edit:hover, .fa-capture:hover, .fa-ok:hover, .fa-plus:hover, .fa-save:hover {
-        background-color: $brand-success;
-        color: $color-1;
+
+      .fa-edit:hover, .fa-capture:hover, .fa-ok:hover, .fa-plus:hover,
+      .fa-save:hover, .fa-arrows-h:hover, .fa-check:hover {
+        color: theme-color("success");
       }
+
       .fa-copy:hover {
-        background-color: $brand-warning;
-        color: $color-1;
+        color: theme-color("warning");
       }
+
       .fa-thumbs-up:hover {
-        background-color: $brand-success;
-        color: $color-1;
+        color: theme-color("success");
       }
+
       .fa-thumbs-down:hover {
-        background-color: $brand-danger;
-        color: $color-1;
+        color: theme-color("danger");
       }
     }
 
@@ -106,66 +93,27 @@ table {
     input[type="text"] {
       width: 100%;
     }
-
-    &.no-border {
-      border-right: none;
-    }
-
-    .handle {
-      @extend .fa;
-      @extend .fa-bars;
-      cursor: move;
-    }
-
   }
 
   &.no-borders {
     td, th {
       border: none !important;
     }
-
   }
 
   th:not(.wrap-text), td.actions, td.no-wrap, .state {
     white-space: nowrap;
   }
 
-  thead {
-    th {
-      border-top: 1px solid $color-border;
-      border-bottom: none;
-      background-color: $color-tbl-thead;
-      text-align: center;
-      font-weight: $font-weight-bold;
-      vertical-align: top;
-    }
+  th a {
+    color: $color-4;
   }
 
   tbody {
     tr {
-      &:first-child th,
-      &:first-child td {
-        border-top: 1px solid $color-border;
-      }
-      &.even td {
-        background-color: $color-tbl-even;
-
-        img {
-          border: 1px solid very-light($color-3, 6);
-        }
-      }
-
-      &:hover td {
-        background-color: very-light($color-3, 5);
-
-        img {
-          border: 1px solid $color-border;
-        }
-      }
-
       &.deleted td {
-        background-color: very-light($brand-danger, 6);
-        border-color: very-light($brand-danger, 15);
+        background-color: very-light(theme-color("danger"), 6);
+        border-color: very-light(theme-color("danger"), 15);
       }
 
       &.ui-sortable-placeholder td {

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

@@ -20,12 +20,12 @@ hr {
 // Headings
 //--------------------------------------------------------------
 
-h1 { line-height: $font-size-h1 + 6 }
-h2 { line-height: $font-size-h1 + 4 }
-h3 { line-height: $font-size-h1 + 2 }
-h4 { line-height: $font-size-h1 }
-h5 { line-height: $font-size-h1 }
-h6 { line-height: $font-size-h1 }
+h1 { line-height: $h1-font-size + 6 }
+h2 { line-height: $h1-font-size + 4 }
+h3 { line-height: $h1-font-size + 2 }
+h4 { line-height: $h1-font-size }
+h5 { line-height: $h1-font-size }
+h6 { line-height: $h1-font-size }
 
 
 // Lists

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -10,7 +10,6 @@
 
 @import 'spree/backend/globals/mixins';
 
-@import 'spree/backend/shared/skeleton';
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/images';
 @import 'spree/backend/shared/tables';
@@ -36,6 +35,7 @@
 @import 'spree/backend/components/number_field_update';
 @import 'spree/backend/components/stock_table';
 @import 'spree/backend/components/editable_table';
+@import 'spree/backend/components/pills';
 @import 'spree/backend/components/tabs';
 
 @import 'font-awesome';

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

@@ -25,7 +25,7 @@ module Spree
       end
 
       def update_totals
-        @order.reload.update!
+        @order.reload.recalculate
       end
 
       # Override method used to create a new instance to correctly

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

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class CustomerReturnsController < ResourceController
-      helper 'spree/admin/reimbursements'
       helper 'spree/admin/reimbursement_type'
       belongs_to 'spree/order', find_by: :number
 

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

@@ -3,7 +3,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
   before_action :validate_promotion_action_type, only: :create
 
   def create
-    @calculators = Spree::Promotion::Actions::CreateAdjustment.calculators
+    @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
     @promotion_action = @promotion_action_type.new(params[:promotion_action])
     @promotion_action.promotion = @promotion
     if @promotion_action.save

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

@@ -39,7 +39,7 @@ module Spree
       def load_data
         @available_zones = Spree::Zone.order(:name)
         @tax_categories = Spree::TaxCategory.order(:name)
-        @calculators = Spree::ShippingMethod.calculators.sort_by(&:name)
+        @calculators = Rails.application.config.spree.calculators.shipping_methods
       end
     end
   end

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

@@ -10,8 +10,7 @@ module Spree
             'fonts',
             'colors',
             'lists',
-            'icons',
-            'tags'
+            'icons'
           ],
           forms: [
             'building_forms',
@@ -22,6 +21,8 @@ module Spree
             'validation'
           ],
           components: [
+            'pills',
+            'modals',
             'tabs'
           ],
           messaging: [

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

@@ -8,7 +8,7 @@ module Spree
       def load_data
         @available_zones = Spree::Zone.order(:name)
         @available_categories = Spree::TaxCategory.order(:name)
-        @calculators = Spree::TaxRate.calculators.sort_by(&:name)
+        @calculators = Rails.application.config.spree.calculators.tax_rates
       end
     end
   end

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

@@ -1,11 +1,12 @@
 module Spree
   module Admin
     class UsersController < ResourceController
-      rescue_from Spree::Core::DestroyWithOrdersError, with: :user_destroy_with_orders_error
+      rescue_from ActiveRecord::DeleteRestrictionError, with: :user_destroy_with_orders_error
 
       after_action :sign_in_if_change_own_password, only: :update
 
-      before_action :load_roles, :load_stock_locations, only: [:edit, :new]
+      before_action :load_roles, only: [:index, :edit, :new]
+      before_action :load_stock_locations, only: [:edit, :new]
 
       def index
         respond_with(@collection) do |format|
@@ -108,7 +109,9 @@ module Spree
                             .limit(params[:limit] || 100)
         else
           @search = Spree.user_class.ransack(params[:q])
-          @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+          @collection = @search.result.includes(:spree_roles)
+          @collection = @collection.includes(:spree_orders)
+          @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
         end
       end
 
@@ -140,7 +143,9 @@ module Spree
 
       def load_roles
         @roles = Spree::Role.all
-        @user_roles = @user.spree_roles
+        if @user
+          @user_roles = @user.spree_roles
+        end
       end
 
       def load_stock_locations

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

@@ -34,41 +34,25 @@ module Spree
         end
       end
 
+      # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead
       def preference_field_tag(name, value, options)
-        case options[:type]
-        when :integer
-          text_field_tag(name, value, preference_field_options(options))
-        when :boolean
-          hidden_field_tag(name, 0, id: "#{name}_hidden") +
-            check_box_tag(name, 1, value, preference_field_options(options))
-        when :string
-          text_field_tag(name, value, preference_field_options(options))
-        when :password
-          password_field_tag(name, value, preference_field_options(options))
-        when :text
-          text_area_tag(name, value, preference_field_options(options))
-        else
-          text_field_tag(name, value, preference_field_options(options))
-        end
+        render "spree/admin/shared/preference_fields/#{options.delete(:type)}",
+          name: name, value: value, html_options: options
       end
+      deprecate preference_field_tag:
+        "Render `spree/admin/shared/preference_fields/\#{preference_type}' instead",
+        deprecator: Spree::Deprecation
 
+      # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead
       def preference_field_for(form, field, options)
-        case options[:type]
-        when :integer
-          form.text_field(field, preference_field_options(options))
-        when :boolean
-          form.check_box(field, preference_field_options(options))
-        when :string
-          form.text_field(field, preference_field_options(options))
-        when :password
-          form.password_field(field, preference_field_options(options))
-        when :text
-          form.text_area(field, preference_field_options(options))
-        else
-          form.text_field(field, preference_field_options(options))
-        end
+        render "spree/admin/shared/preference_fields/#{options[:type]}",
+          form: form, attribute: field, html_options: options
       end
+      deprecate preference_field_for:
+        "Render `spree/admin/shared/preference_fields/\#{preference_type}' instead",
+        deprecator: Spree::Deprecation
 
+      # @deprecated Pass an `html_options' hash into preference field partial instead
       def preference_field_options(options)
         field_options = case options[:type]
                         when :integer
@@ -97,16 +81,29 @@ module Spree
           size: options[:size]
         })
       end
+      deprecate preference_field_options: "Pass an `html_options' hash into " \
+        "`render('spree/admin/shared/preference_fields/\#{preference_type}')` instead)",
+        deprecator: Spree::Deprecation
 
+      # @deprecated Please render each preference keys partial instead. Example:
+      # <% @object.preferences.keys.each do |key| %>
+      #   <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(key)}",
+      #     form: f, attribute: "preferred_#{key}", label: Spree.t(key) %>
+      # <% end %>
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
-        fields = object.preferences.keys.map { |key|
-          form.label("preferred_#{key}", Spree.t(key)) +
-            "<br />".html_safe +
-            preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
-        }
-        safe_join(fields, "<br />".html_safe)
+        capture do
+          object.preferences.keys.each do |key|
+            concat render("spree/admin/shared/preference_fields/#{object.preference_type(key)}",
+              form: form, attribute: "preferred_#{key}", label: Spree.t(key))
+          end
+        end
       end
+      deprecate preference_fields: "Please render each preference key's partial instead. Example: \n" \
+        "<% @object.preferences.keys.each do |key| %>\n" \
+          "<%= render \"spree/admin/shared/preference_fields/\#{@object.preference_type(key)}\", \n" \
+             "form: f, attribute: \"preferred_\#{key}\", label: Spree.t(key) %>\n" \
+        "<% end %>", deprecator: Spree::Deprecation
 
       def link_to_add_fields(name, target, options = {})
         name = '' if options[:no_text]

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

@@ -17,10 +17,6 @@ module Spree
         end
       end
 
-      def stock_transfer_status(stock_transfer)
-        stock_transfer.closed? ? Spree.t(:closed) : Spree.t(:open)
-      end
-
       def deleted_variant_admin_hint(variant)
         newer_variant_with_same_sku = Spree::Variant.find_by(sku: variant.sku)
         hint_type = newer_variant_with_same_sku ? :deleted_explanation_with_replacement : :deleted_explanation

data/app/models/spree/backend_configuration.rb

@@ -10,7 +10,7 @@ module Spree
                             :taxons]
     REPORT_TABS        ||= [:reports]
     CONFIGURATION_TABS ||= [:stores, :tax_categories,
-                            :tax_rates, :zones, :countries, :states,
+                            :tax_rates, :zones,
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
                             :refund_reasons, :reimbursement_types, :return_authorization_reasons]

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

@@ -28,12 +28,14 @@
     </thead>
     <tbody>
       <% @adjustment_reasons.each do |adjustment_reason| %>
-        <tr id="<%= spree_dom_id adjustment_reason %>" data-hook="adjustment_reason_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center">
+        <tr id="<%= spree_dom_id adjustment_reason %>" data-hook="adjustment_reason_row">
+          <td>
             <%= adjustment_reason.name %>
           </td>
-          <td class="align-center">
-            <%= Spree.t(adjustment_reason.active? ? :active : :inactive) %>
+          <td>
+            <span class="pill pill-<%= adjustment_reason.active? ? 'active' : 'inactive' %>">
+              <%= Spree.t(adjustment_reason.active? ? :active : :inactive) %>
+            </span>
           </td>
           <td class="actions">
             <%= link_to_edit adjustment_reason, no_text: true %>

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -4,12 +4,12 @@
 %>
 <tr id="<%= spree_dom_id(adjustment) %>"
     data-hook="adjustment_row"
-    class="<%= cycle('odd', 'even')%> <%= "adjustment-ineligible" if !adjustment.eligible? %>"
+    class="<%= "adjustment-ineligible" if !adjustment.eligible? %>"
     >
-  <td class="align-center"><%= display_adjustable(adjustment.adjustable) %></td>
-  <td class="align-center"><%= adjustment.label %></td>
-  <td class="align-center"><%= adjustment.display_amount.to_html %></td>
-  <td class="align-center"><%= adjustment_state(adjustment) %></td>
+  <td><%= display_adjustable(adjustment.adjustable) %></td>
+  <td><%= adjustment.label %></td>
+  <td><%= adjustment.display_amount.to_html %></td>
+  <td><%= adjustment_state(adjustment) %></td>
   <td class='actions'>
     <% unless adjustment.finalized? %>
       <% if can?(:update, adjustment) %>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -11,14 +11,14 @@
   <tbody>
     <%= render partial: "adjustment", collection: @adjustments %>
     <tr data-hook="adjustment_buttons">
-      <td class="align-center" colspan='4'>
+      <td class="align-right" colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <div>
-            <%= button_to Spree.t(:unfinalize_all_adjustments), adjustments_unfinalize_admin_order_path(@order), method: :get %>
-          </div>
-          <div>
-            <%= button_to Spree.t(:finalize_all_adjustments), adjustments_finalize_admin_order_path(@order), method: :get %>
-          </div>
+          <%= button_to Spree.t(:unfinalize_all_adjustments), adjustments_unfinalize_admin_order_path(@order), method: :get %>
+        <% end %>
+      </td>
+      <td colspan="2" style="width: 50%">
+        <% if can? :update, Spree::Adjustment %>
+          <%= button_to Spree.t(:finalize_all_adjustments), adjustments_finalize_admin_order_path(@order), method: :get %>
         <% end %>
       </td>
       <td class='actions'>&nbsp;</td>

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

@@ -14,10 +14,10 @@
 
   <thead>
     <th colspan="2"><%= Spree::LineItem.human_attribute_name(:description) %></th>
-    <th><%= Spree::OrderCancellations.human_attribute_name(:quantity) %></th>
+    <th class="align-center"><%= Spree::OrderCancellations.human_attribute_name(:quantity) %></th>
     <th><%= Spree::OrderCancellations.human_attribute_name(:state) %></th>
     <th><%= Spree::OrderCancellations.human_attribute_name(:shipment) %></th>
-    <th><%= Spree::OrderCancellations.human_attribute_name(:cancel) %></th>
+    <th class="align-right"><%= Spree::OrderCancellations.human_attribute_name(:cancel) %></th>
   </thead>
 
   <tbody>
@@ -34,9 +34,13 @@
             <% end %>
           </td>
           <td class="inventory-unit-quantity align-center">1</td>
-          <td class="inventory-unit-state align-center"><%= inventory_unit.state %></td>
-          <td class="inventory-unit-shipment align-center"><%= inventory_unit.shipment.number %></td>
-          <td class="inventory-unit-cancel align-center">
+          <td class="inventory-unit-state">
+            <span class="pill pill-<%= inventory_unit.state %>">
+              <%= Spree.t(inventory_unit.state, scope: :inventory_states) %>
+            </span>
+          </td>
+          <td class="inventory-unit-shipment"><%= inventory_unit.shipment.number %></td>
+          <td class="inventory-unit-cancel align-right">
             <%= check_box_tag 'inventory_unit_ids[]', inventory_unit.id %>
           </td>
         </tr>

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

@@ -10,7 +10,7 @@
   </thead>
   <tbody>
     <% reimbursements.each do |reimbursement| %>
-      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row">
         <td>
           <% if reimbursement.reimbursed? %>
             <%= link_to reimbursement.number, url_for([:admin, @order, reimbursement]) %>
@@ -20,8 +20,11 @@
         </td>
         <td><%= reimbursement.display_total %></td>
         <td>
-          <span class="state <%= reimbursement_status_color(reimbursement) %>">
-            <%= reimbursement.reimbursement_status %>
+          <span class="pill pill-<%= reimbursement.reimbursement_status %>">
+            <%= Spree.t(
+              reimbursement.reimbursement_status,
+              scope: :reimbursement_states
+            ) %>
           </span>
         </td>
         <td><%= pretty_time(reimbursement.created_at) %></td>

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

@@ -26,23 +26,28 @@
         <td>
           <%= return_item.inventory_unit.variant.sku %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.display_amount %>
         </td>
-        <td class="align-center">
+        <td>
           <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.exchange_variant.try(:exchange_name) %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.acceptance_status_errors %>
         </td>
-        <td class-"align-center">
-          <%= return_item.reception_status.humanize %>
+        <td>
+          <span class="pill pill-<%= return_item.reception_status %>">
+            <%= Spree.t(
+              return_item.reception_status,
+              scope: :reception_states
+            ) %>
+          </span>
         </td>
         <% unless return_item.received? %>
-          <td class='align-center'>
+          <td>
             <%= form_for [:admin, return_item] do |f| %>
               <%= f.hidden_field 'reception_status_event', value: 'receive' %>
               <%= f.button Spree.t('actions.receive'), class: 'with-tip', "data-action" => 'save' %>

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

@@ -19,7 +19,7 @@
       <% return_item = item_fields.object %>
 
       <tr>
-        <td class="align-center inventory-unit-checkbox">
+        <td class="inventory-unit-checkbox">
           <div style="display:none">
             <%= item_fields.hidden_field :inventory_unit_id %>
             <%= item_fields.hidden_field :return_authorization_id %>
@@ -34,22 +34,27 @@
         <td>
           <%= return_item.inventory_unit.variant.sku %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.display_amount %>
         </td>
-        <td class="align-center">
-          <%= return_item.inventory_unit.state %>
+        <td>
+          <span class="pill pill-<%= return_item.inventory_unit.state %>">
+            <%= Spree.t(
+              return_item.inventory_unit.state,
+              scope: :inventory_states
+            ) %>
+          </span>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.exchange_variant.try(:exchange_name) %>
         </td>
-        <td class="align-center">
+        <td>
           <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
         </td>
-        <td class="align-center">
+        <td>
           <%= item_fields.select :reception_status_event, return_item.potential_reception_transitions, {include_blank: true}, {class: 'add-item custom-select fullwidth'} %>
         </td>
-        <td class="align-center">
+        <td>
           <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'custom-select fullwidth'} %>
         </td>
       </tr>