solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -134,9 +134,8 @@ table {
       border-top: 1px solid $color-border;
       border-bottom: none;
       background-color: $color-tbl-thead;
-      text-transform: uppercase;
       text-align: center;
-      font-size: 85%;
+      font-size: 90%;
       font-weight: $font-weight-bold;
     }
   }
@@ -202,7 +201,6 @@ table {
     &.grand-total {
       td {
         border-color: $color-2 !important;
-        text-transform: uppercase;
         font-size: 110%;
         font-weight: $font-weight-bold;
         background-color: lighten($color-2, 50);

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

@@ -102,7 +102,6 @@ dl {
     width: 40%;
     font-weight: $font-weight-bold;
     padding-left: 0;
-    text-transform: uppercase;
     font-size: 85%;
     clear: left;
   }
@@ -136,7 +135,6 @@ dl {
 .no-objects-found {
   text-align: center;
   font-size: 120%;
-  text-transform: uppercase;
   padding: 40px 0px;
   color: lighten($color-body-text, 15);
 }

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

@@ -7,7 +7,7 @@
 @import 'bootstrap_custom';
 @import 'solidus_admin/bootstrap/bootstrap';
 
-@import 'spree/backend/globals/mixins/caret';
+@import 'spree/backend/globals/mixins';
 
 @import 'spree/backend/shared/skeleton';
 @import 'spree/backend/shared/typography';
@@ -20,7 +20,9 @@
 
 @import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
+@import 'spree/backend/components/breadcrumb';
 @import 'spree/backend/components/date-picker';
+@import 'spree/backend/components/hint';
 @import 'spree/backend/components/list_group';
 @import 'spree/backend/components/messages';
 @import 'spree/backend/components/progress';

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class CancellationsController < Spree::Admin::BaseController
-      before_filter :load_order, only: [:index, :short_ship]
+      before_action :load_order, only: [:index, :short_ship]
 
       def index
         @inventory_units = @order.inventory_units.cancelable

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

@@ -17,12 +17,6 @@ module Spree
         end
       end
 
-      def clear_cache
-        Rails.cache.clear
-        invoke_callbacks(:clear_cache, :after)
-        head :no_content
-      end
-
       private
 
       def store_params

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

@@ -2,6 +2,8 @@ module Spree
   module Admin
     module Orders
       class CustomerDetailsController < Spree::Admin::BaseController
+        rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
+
         before_action :load_order
 
         def show
@@ -59,6 +61,11 @@ module Spree
         def should_associate_user?
           params[:guest_checkout] == "false" && params[:user_id] && params[:user_id].to_i != @order.user_id
         end
+
+        def insufficient_stock_error
+          flash[:error] = Spree.t(:insufficient_stock_for_order)
+          redirect_to edit_admin_order_customer_url(@order)
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Spree
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
       before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
-      around_filter :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
+      around_action :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 

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

@@ -25,8 +25,7 @@ module Spree
         @payment_method = @payment_method.becomes(@payment_method_type)
         invoke_callbacks(:update, :before)
 
-        update_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        attributes = payment_method_params.merge(update_params)
+        attributes = payment_method_params
         attributes.each do |k, _v|
           if k.include?("password") && attributes[k].blank?
             attributes.delete(k)
@@ -65,7 +64,13 @@ module Spree
       end
 
       def payment_method_params
-        params.require(:payment_method).permit!
+        superclass_params = params.require(:payment_method).permit!
+        subclass_params = params[ActiveModel::Naming.param_key(@payment_method_type)] || ActionController::Parameters.new
+
+        superclass_params = superclass_params.permit!
+        subclass_params = subclass_params.permit!
+
+        superclass_params.to_h.merge(subclass_params.to_h)
       end
     end
   end

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

@@ -1,11 +1,13 @@
 module Spree
   module Admin
     class PaymentsController < Spree::Admin::BaseController
-      before_filter :load_order, only: [:create, :new, :index, :fire]
-      before_filter :load_payment, except: [:create, :new, :index, :fire]
-      before_filter :load_payment_for_fire, only: :fire
-      before_filter :load_data
-      before_filter :require_bill_address, only: [:index]
+      rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
+
+      before_action :load_order, only: [:create, :new, :index, :fire]
+      before_action :load_payment, except: [:create, :new, :index, :fire]
+      before_action :load_payment_for_fire, only: :fire
+      before_action :load_data
+      before_action :require_bill_address, only: [:index]
 
       respond_to :html
 
@@ -109,6 +111,11 @@ module Spree
           redirect_to edit_admin_order_customer_url(@order)
         end
       end
+
+      def insufficient_stock_error
+        flash[:error] = Spree.t(:insufficient_stock_for_order)
+        redirect_to new_admin_order_payment_url(@order)
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Spree
     class ProductsController < ResourceController
       helper 'spree/products'
 
-      before_filter :load_data, except: [:index]
+      before_action :load_data, except: [:index]
       create.before :create_before
       update.before :update_before
       helper_method :clone_object_url

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

@@ -6,7 +6,7 @@ module Spree
 
       helper_method :refund_reasons
 
-      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :create
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       private
 

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

@@ -6,7 +6,7 @@ module Spree
       before_action :load_stock_locations, only: :edit
       before_action :load_simulated_refunds, only: :edit
 
-      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :perform
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def perform
         @reimbursement.perform!

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class RootController < Spree::Admin::BaseController
-      skip_before_filter :authorize_admin
+      skip_before_action :authorize_admin
 
       def index
         redirect_to admin_root_redirect_path

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

@@ -12,14 +12,6 @@ module Spree
 
       private
 
-      def location_after_destroy
-        :back
-      end
-
-      def location_after_save
-        :back
-      end
-
       def build_resource
         variant = Variant.accessible_by(current_ability, :read).find(params[:variant_id])
         stock_location = StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])

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

@@ -7,12 +7,12 @@ module Spree
         { translation_key: :name, attr_name: :name }
       ]
 
-      before_filter :load_viewable_stock_locations, only: :index
-      before_filter :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
-      before_filter :load_source_stock_locations, only: :new
-      before_filter :load_destination_stock_locations, only: :edit
-      before_filter :ensure_access_to_stock_location, only: :create
-      before_filter :ensure_receivable_stock_transfer, only: :receive
+      before_action :load_viewable_stock_locations, only: :index
+      before_action :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
+      before_action :load_source_stock_locations, only: :new
+      before_action :load_destination_stock_locations, only: :edit
+      before_action :ensure_access_to_stock_location, only: :create
+      before_action :ensure_receivable_stock_transfer, only: :receive
 
       create.before :authorize_transfer_attributes!
 

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

@@ -5,7 +5,7 @@ module Spree
 
       after_action :sign_in_if_change_own_password, only: :update
 
-      before_filter :load_roles, :load_stock_locations, only: [:edit, :new]
+      before_action :load_roles, :load_stock_locations, only: [:edit, :new]
 
       def index
         respond_with(@collection) do |format|
@@ -38,9 +38,13 @@ module Spree
           set_roles
           set_stock_locations
           flash[:success] = Spree.t(:account_updated)
-        end
+          redirect_to edit_admin_user_url(@user)
+        else
+          load_roles
+          load_stock_locations
 
-        redirect_to edit_admin_user_url(@user)
+          render :edit, status: :unprocessable_entity
+        end
       end
 
       def addresses

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

@@ -22,6 +22,12 @@ module Spree
         end
       end
 
+      def admin_hint(title, text)
+        content_tag(:span, class: 'hint-tooltip', title: title, data: { content: text }) do
+          content_tag(:i, '', class: 'fa fa-info-circle')
+        end
+      end
+
       def datepicker_field_value(date)
         unless date.blank?
           l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
@@ -155,6 +161,11 @@ module Spree
         dom_id(record, 'spree')
       end
 
+      def admin_layout(layout = nil)
+        @admin_layout = layout if layout
+        @admin_layout
+      end
+
       private
 
       def attribute_name_for(field_name)

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

@@ -1,6 +1,41 @@
 module Spree
   module Admin
     module NavigationHelper
+      def admin_breadcrumbs
+        @admin_breadcrumbs ||= []
+      end
+
+      # Add items to current page breadcrumb heirarchy
+      def admin_breadcrumb(*ancestors, &block)
+        admin_breadcrumbs.concat(ancestors) if ancestors.present?
+        admin_breadcrumbs.push(capture(&block)) if block_given?
+      end
+
+      # Render Bootstrap style breadcrumbs
+      def render_admin_breadcrumbs
+        if content_for?(:page_title)
+          admin_breadcrumb(content_for(:page_title))
+        end
+
+        content_tag :ol, class: 'breadcrumb' do
+          safe_join admin_breadcrumbs.map { |level|
+            content_tag(:li, level, class: "separator #{level == admin_breadcrumbs.last ? 'active' : ''}")
+          }
+        end
+      end
+
+      def admin_page_title
+        if content_for?(:title)
+          content_for(:title)
+        elsif content_for?(:page_title)
+          content_for(:page_title)
+        elsif admin_breadcrumbs.any?
+          strip_tags(admin_breadcrumbs.last)
+        else
+          Spree.t(controller.controller_name, default: controller.controller_name.titleize)
+        end
+      end
+
       # Make an admin tab that coveres one or more resources supplied by symbols
       # Option hash may follow. Valid options are
       #   * :label to override link text, otherwise based on the first resource name (translated)
@@ -29,7 +64,7 @@ module Spree
         selected = if options[:match_path].is_a? Regexp
           request.fullpath =~ options[:match_path]
         elsif options[:match_path]
-          request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
+          request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
         else
           request.fullpath.starts_with?(destination_url) ||
             args.include?(controller.controller_name.to_sym)
@@ -66,8 +101,9 @@ module Spree
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t('actions.delete')
+        confirm = options[:confirm] || Spree.t(:are_you_sure)
         options[:class] = "delete-resource"
-        options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
+        options[:data] = { confirm: confirm, action: 'remove' }
         link_to_with_icon 'trash', name, url, options
       end
 
@@ -85,7 +121,12 @@ module Spree
       end
 
       def button(text, icon_name = nil, button_type = 'submit', options = {})
-        button_tag(text, options.merge(type: button_type, class: "fa fa-#{icon_name} button"))
+        class_names = "button"
+        if icon_name
+          Spree::Deprecation.warn "Using icon_name arg is deprecated. Icons could not be visible in future versions.", caller
+          class_names.prepend "fa fa-#{icon_name} "
+        end
+        button_tag(text, options.merge(type: button_type, class: class_names))
       end
 
       def button_link_to(text, url, html_options = {})
@@ -100,6 +141,7 @@ module Spree
           html_options[:class] += ' button'
 
           if html_options[:icon]
+            Spree::Deprecation.warn "Using :icon option is deprecated. Icons could not be visible in future versions.", caller
             html_options[:class] += " fa fa-#{html_options[:icon]}"
           end
           link_to(text, url, html_options)
@@ -135,6 +177,7 @@ module Spree
           link_to(link_text, url)
         end
       end
+
     end
   end
 end

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

@@ -8,7 +8,6 @@ module Spree
           next unless @order.send("can_#{event}?")
           links << button_link_to(Spree.t(event), [event, :admin, @order],
                                   method: :put,
-                                  icon: event.to_s,
                                   data: { confirm: Spree.t(:order_sure_want_to, event: Spree.t(event)) })
         end
         safe_join(links, '&nbsp;'.html_safe)

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

@@ -1,15 +1,11 @@
 module Spree
   module Admin
     module StockLocationsHelper
-      def display_name(stock_location)
+      def admin_stock_location_display_name(stock_location)
         name_parts = [stock_location.admin_name, stock_location.name]
         name_parts.delete_if(&:blank?)
         name_parts.join(' / ')
       end
-
-      def state(stock_location)
-        stock_location.active? ? 'active' : 'inactive'
-      end
     end
   end
 end

data/app/models/spree/backend_configuration.rb

@@ -17,5 +17,105 @@ module Spree
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     STOCK_TABS         ||= [:stock_items, :stock_transfers]
     USER_TABS          ||= [:users, :store_credits]
+
+    # An item which should be drawn in the admin menu
+    class MenuItem
+      attr_reader :icon, :label, :partial, :condition, :sections, :url
+
+      # @param sections [Array<Symbol>] The sections which are contained within
+      #   this admin menu section.
+      # @param icon [String] The icon to draw for this menu item
+      # @param condition [Proc] A proc which returns true if this menu item
+      #   should be drawn. If nil, it will be replaced with a proc which always
+      #   returns true.
+      # @param label [Symbol] The translation key for a label to use for this
+      #   menu item.
+      # @param partial [String] A partial to draw within this menu item for use
+      #   in declaring a submenu
+      # @param url [String] A url where this link should send the user to
+      def initialize(
+        sections,
+        icon,
+        condition: nil,
+        label: nil,
+        partial: nil,
+        url: nil
+      )
+
+        @condition = condition || -> { true }
+        @sections = sections
+        @icon = icon
+        @label = label || sections.first
+        @partial = partial
+        @url = url
+      end
+    end
+
+    # Items can be added to the menu by using code like the following:
+    #
+    # Spree::Backend::Config.configure do |config|
+    #   config.menu_items << config.class::MenuItem.new(
+    #     [:section],
+    #     'icon-name',
+    #     url: 'https://solidus.io/'
+    #   )
+    # end
+    #
+    # @!attribute menu_items
+    #   @return [Array<Spree::BackendConfiguration::MenuItem>]
+    attr_writer :menu_items
+
+    # Return the menu items which should be drawn in the menu
+    #
+    # @api public
+    # @return [Array<Spree::BackendConfiguration::MenuItem>]
+    def menu_items
+      @menu_items ||= [
+        MenuItem.new(
+          ORDER_TABS,
+          'shopping-cart',
+          condition: -> { can?(:admin, Spree::Order) },
+        ),
+        MenuItem.new(
+          PRODUCT_TABS,
+          'th-large',
+          condition: -> { can?(:admin, Spree::Product) },
+          partial: 'spree/admin/shared/product_sub_menu'
+        ),
+        MenuItem.new(
+          REPORT_TABS,
+          'file',
+          condition: -> { can?(:admin, :reports) },
+        ),
+        MenuItem.new(
+          CONFIGURATION_TABS,
+          'wrench',
+          condition: -> { can?(:admin, :general_settings) },
+          label: :settings,
+          partial: 'spree/admin/shared/settings_sub_menu',
+          url: :edit_admin_general_settings_path
+        ),
+        MenuItem.new(
+          PROMOTION_TABS,
+          'bullhorn',
+          condition: -> { can?(:admin, Spree::Promotion) },
+          url: :admin_promotions_path
+        ),
+        MenuItem.new(
+          STOCK_TABS,
+          'cubes',
+          condition: -> { can?(:admin, Spree::StockItem) },
+          label: :stock,
+          partial: 'spree/admin/shared/stock_sub_menu',
+          url: :admin_stock_items_path
+        ),
+        MenuItem.new(
+          USER_TABS,
+          'user',
+          condition: -> { Spree.user_class && can?(:admin, Spree.user_class) },
+          url: :admin_users_path
+        )
+      ]
+    end
   end
 end