spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -1,11 +1,3 @@
-body {
-  padding-top: $navbar-height + 2px;
-}
-
-.table-wrapper {
-  overflow: auto;
-}
-
 .row {
   padding: 0 0 15px 0;
 }

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

@@ -1,16 +1,8 @@
-.form-control {
-  box-shadow: none;
-}
-
 label {
-  text-transform: uppercase;
-  font-size: $font-size-base - 3;
-  letter-spacing: 1px;
-  color: $gray;
-  font-weight: 500;
+  font-size: $font-size-sm;
 
-  input[type="radio"], input[type="checkbox"] {
-    margin-top: 2px;
+  &:hover {
+    cursor: pointer;
   }
 }
 
@@ -20,40 +12,15 @@ span.or {
   padding: 0 10px;
 }
 
-input.form-control {
-  &:active, &:focus {
-    border-color: lighten($brand-success, 20);
-    box-shadow: none;
-  }
-}
-
 .form-group {
   &.withError {
     label, .formError, .required {
-      color: $brand-danger;
+      color: $danger;
     }
 
     input,
     .select2-choice {
-      border-color: $brand-danger;
+      border-color: $danger;
     }
   }
 }
-
-.fullwidth-input {
-  display: block;
-  width: 100%;
-}
-
-.help-block {
-  color: lighten($gray-light, 20);
-  font-weight: 300;
-}
-
-.checkbox > .help-block {
-  margin-top: 0;
-}
-
-.display-inline {
-  display: inline;
-}

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

@@ -1,25 +1,22 @@
 @import 'global/variables';
 
-@import 'bootstrap-sprockets';
 @import 'bootstrap';
+@import 'glyphicons';
 
+@import 'components/navbar';
 @import 'components/sidebar';
 @import 'components/tables';
-@import 'components/labels';
+@import 'components/badges';
 @import 'components/main';
 @import 'components/page_header';
 @import 'components/icons';
 @import 'components/buttons';
-@import 'components/wells';
 @import 'components/filters';
-@import 'components/panels';
 @import 'components/navigation';
 @import 'components/taxon_products_view';
 @import 'components/progress';
 @import 'components/spinner';
 
-@import 'sections/account';
-
 @import 'plugins/select2';
 @import 'plugins/jquery_ui';
 

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

@@ -31,13 +31,13 @@ module Spree
       end
 
       def find_resource
-        Spree::CustomerReturn.accessible_by(current_ability, :read).find(params[:id])
+        Spree::CustomerReturn.accessible_by(current_ability, :show).find(params[:id])
       end
 
       def collection
         parent # trigger loading the order
         @collection ||= Spree::ReturnItem.
-                        accessible_by(current_ability, :read).
+                        accessible_by(current_ability).
                         where(inventory_unit_id: @order.inventory_units.pluck(:id)).
                         map(&:customer_return).uniq.compact
         @customer_returns = @collection

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -20,7 +20,7 @@ module Spree
         end
 
         def update
-          if @order.update_attributes(order_params)
+          if @order.update(order_params)
             @order.associate_user!(@user, @order.email.blank?) unless guest_checkout?
             @order.next if @order.address?
             @order.refresh_shipment_rates(Spree::ShippingMethod::DISPLAY_ON_BACK_END)

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

@@ -80,7 +80,7 @@ module Spree
       end
 
       def update
-        if @order.update_attributes(params[:order]) && @order.line_items.present?
+        if @order.update(params[:order]) && @order.line_items.present?
           @order.update_with_updater!
           unless @order.completed?
             # Jump to next step if order is not completed.
@@ -135,7 +135,7 @@ module Spree
       end
 
       def set_store
-        if @order.update_attributes(store_id: params[:order][:store_id])
+        if @order.update(store_id: params[:order][:store_id])
           flash[:success] = flash_message_for(@order, :successfully_updated)
         else
           flash[:error] = @order.errors.full_messages.join(', ')

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

@@ -37,7 +37,7 @@ module Spree
           attributes.delete(k) if k.include?('password') && attributes[k].blank?
         end
 
-        if @payment_method.update_attributes(attributes)
+        if @payment_method.update(attributes)
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
           redirect_to edit_admin_payment_method_path(@payment_method)

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

@@ -26,7 +26,7 @@ module Spree
           params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
         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|
@@ -81,7 +81,7 @@ module Spree
       def stock
         @variants = @product.variants.includes(*variant_stock_includes)
         @variants = [@product.master] if @variants.empty?
-        @stock_locations = StockLocation.accessible_by(current_ability, :read)
+        @stock_locations = StockLocation.accessible_by(current_ability)
         if @stock_locations.empty?
           flash[:error] = Spree.t(:stock_management_requires_a_stock_location)
           redirect_to admin_stock_locations_path

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

@@ -3,7 +3,7 @@ module Spree
     class ReimbursementTypesController < ResourceController
       def update
         invoke_callbacks(:update, :before)
-        if @object.update_attributes(permitted_resource_params_for_update)
+        if @object.update(permitted_resource_params_for_update)
           invoke_callbacks(:update, :after)
           respond_with(@object) do |format|
             format.html do

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

@@ -24,7 +24,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

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

@@ -36,7 +36,7 @@ module Spree
       end
 
       def load_reimbursement_types
-        @reimbursement_types = Spree::ReimbursementType.accessible_by(current_ability, :read).active
+        @reimbursement_types = Spree::ReimbursementType.accessible_by(current_ability).active
       end
 
       def load_return_authorization_reasons

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

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class StoresController < Spree::Admin::BaseController
       before_action :load_store, only: [:new, :edit, :update]
+      before_action :set_default_currency, only: :new
 
       def index
         @stores = Spree::Store.all
@@ -74,6 +75,10 @@ module Spree
       def load_store
         @store = Spree::Store.find_by(id: params[:id]) || Spree::Store.new
       end
+
+      def set_default_currency
+        @store.default_currency = Spree::Config[:currency]
+      end
     end
   end
 end

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

@@ -42,7 +42,7 @@ module Spree
           @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
           @taxon.create_icon(attachment: taxon_params[:icon]) if taxon_params[:icon]
-          @taxon.update_attributes(taxon_params.except(:icon))
+          @taxon.update(taxon_params.except(:icon))
         end
         if successful
           flash[:success] = flash_message_for(@taxon, :successfully_updated)

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

@@ -25,7 +25,7 @@ module Spree
           params[:user].delete(:password_confirmation)
         end
 
-        if @user.update_attributes(user_params)
+        if @user.update(user_params)
           flash[:success] = Spree.t(:account_updated)
           redirect_to edit_admin_user_path(@user)
         else
@@ -35,7 +35,7 @@ module Spree
 
       def addresses
         if request.put?
-          if @user.update_attributes(user_params)
+          if @user.update(user_params)
             flash.now[:success] = Spree.t(:account_updated)
           end
 

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

@@ -11,7 +11,7 @@ module Spree
           flash_class = 'info' if flash[:notice]
           flash_class = 'success' if flash[:success]
           flash_div = content_tag(:div, (close_button + message), class: "alert alert-#{flash_class} alert-auto-disappear")
-          content_tag(:div, flash_div, class: 'col-xs-12')
+          content_tag(:div, flash_div, class: 'col-12')
         end
       end
 
@@ -130,9 +130,14 @@ module Spree
       # renders hidden field and link to remove record using nested_attributes
       def link_to_icon_remove_fields(form)
         url = form.object.persisted? ? [:admin, form.object] : '#'
-        css_class = 'spree_remove_fields btn btn-sm btn-danger'
-        title = Spree.t(:remove)
-        link_to_with_icon('delete', '', url, class: css_class, data: { action: 'remove' }, title: title) + form.hidden_field(:_destroy)
+        link_to_with_icon('delete', '', url,
+                          class: 'spree_remove_fields btn btn-sm btn-danger',
+                          data: {
+                            action: 'remove'
+                          },
+                          title: Spree.t(:remove),
+                          no_text: true
+                         ) + form.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

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

@@ -2,7 +2,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

@@ -27,13 +27,7 @@ module Spree
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
         titleized_label = Spree.t(options[:label], default: options[:label], scope: [:admin, :tab]).titleize
 
-        css_classes = ['sidebar-menu-item']
-
-        link = if options[:icon]
-                 link_to_with_icon(options[:icon], titleized_label, destination_url)
-               else
-                 link_to(titleized_label, destination_url)
-               end
+        css_classes = ['sidebar-menu-item d-block w-100 position-relative']
 
         selected = if options[:match_path].is_a? Regexp
                      request.fullpath =~ options[:match_path]
@@ -42,6 +36,22 @@ module Spree
                    else
                      args.include?(controller.controller_name.to_sym)
                    end
+
+        link = if options[:icon]
+                 link_to_with_icon(
+                   options[:icon],
+                   titleized_label,
+                   destination_url,
+                   class: 'w-100 p-3 d-flex align-items-center'
+                 )
+               else
+                 link_to(
+                   titleized_label,
+                   destination_url,
+                   class: "sidebar-submenu-item w-100 py-1 px-3 d-block #{'text-success' if selected}"
+                 )
+               end
+
         css_classes << 'selected' if selected
 
         css_classes << options[:css_class] if options[:css_class]
@@ -50,16 +60,16 @@ module Spree
 
       # Single main menu item
       def main_menu_item(text, url: nil, icon: nil)
-        link_to url, 'data-toggle': 'collapse', 'data-parent': '#sidebar' do
-          content_tag(:span, nil, class: "icon icon-#{icon}") +
+        link_to url, 'data-toggle': 'collapse', class: 'd-flex w-100 p-3 position-relative align-items-center' do
+          content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
             content_tag(:span, " #{text}", class: 'text') +
-            content_tag(:span, nil, class: 'icon icon-chevron-left pull-right')
+            content_tag(:span, nil, class: 'icon icon-chevron-left position-absolute')
         end
       end
 
       # Main menu tree menu
       def main_menu_tree(text, icon: nil, sub_menu: nil, url: '#')
-        content_tag :li, class: 'sidebar-menu-item' do
+        content_tag :li, class: 'sidebar-menu-item d-block w-100' do
           main_menu_item(text, url: url, icon: icon) +
             render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
         end
@@ -148,13 +158,12 @@ module Spree
 
       def link_to_with_icon(icon_name, text, url, options = {})
         options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
-        options[:class] += ' no-text' if options[:no_text]
         options[:title] = text if options[:no_text]
         text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
         options.delete(:no_text)
         if icon_name
-          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
-          text.insert(0, icon + ' ')
+          icon = content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+          text = "#{icon} #{text}"
         end
         link_to(text.html_safe, url, options)
       end
@@ -167,16 +176,23 @@ module Spree
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
           icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
-          text.insert(0, icon + ' ')
+          text = "#{icon} #{text}"
         end
-        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", 'data-disable-with' => "#{Spree.t(:saving)}..."))
+        button_tag(
+          text.html_safe,
+          options.merge(
+            type: button_type,
+            class: "btn btn-primary #{options[:class]}",
+            'data-disable-with' => "#{Spree.t(:saving)}..."
+          )
+        )
       end
 
       def button_link_to(text, url, html_options = {})
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
-          form_tag(url, method: html_options.delete(:method), class: 'display-inline') do
+          form_tag(url, method: html_options.delete(:method), class: 'd-inline') do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else
@@ -187,11 +203,11 @@ module Spree
 
           html_options.delete('data-update') unless html_options['data-update']
 
-          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-default'
+          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-outline-secondary'
 
           if html_options[:icon]
             icon = content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
-            text.insert(0, icon + ' ')
+            text = "#{icon} #{text}"
           end
 
           link_to(text.html_safe, url, html_options)
@@ -203,26 +219,26 @@ module Spree
           url.ends_with?("#{controller.controller_name}/edit") ||
           url.ends_with?("#{controller.controller_name.singularize}/edit")
 
-        options[:class] = 'sidebar-menu-item'
+        options[:class] = 'sidebar-menu-item d-block w-100'
         options[:class] << ' selected' if is_selected
         content_tag(:li, options) do
-          link_to(link_text, url)
+          link_to(link_text, url, class: "#{'text-success' if is_selected} py-1 px-3 d-block sidebar-submenu-item")
         end
       end
 
       def main_part_classes
         if cookies['sidebar-minimized'] == 'true'
-          'col-xs-12 sidebar-collapsed'
+          'col-12 sidebar-collapsed'
         else
-          'col-xs-9 col-xs-offset-3 col-md-10 col-md-offset-2'
+          'col-9 offset-3 col-md-10 offset-md-2'
         end
       end
 
       def main_sidebar_classes
         if cookies['sidebar-minimized'] == 'true'
-          'col-xs-3 col-md-2 hidden-xs sidebar'
+          'col-3 col-md-2 sidebar'
         else
-          'col-xs-3 col-md-2 sidebar'
+          'p-0 col-3 col-md-2 sidebar'
         end
       end
 

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

@@ -4,13 +4,13 @@ module Spree
       # Renders all the extension partials that may have been specified in the extensions
       def event_links(order, events)
         links = []
-        events.sort.each do |event|
+        events.each do |event|
           next unless order.send("can_#{event}?")
 
           label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
           links << button_link_to(
             label.capitalize,
-            [event.to_sym, :admin, order],
+            [event, :admin, order],
             method: :put,
             icon: event.to_s,
             data: { confirm: Spree.t(:order_sure_want_to, event: label) }