solidus_backend 2.7.4 → 2.8.0

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

@@ -1,5 +1,5 @@
 // Make color very close to white
-@function very-light($color, $adjust: 3){
+@function very-light($color, $adjust: 3){  
   @if type-of($adjust) == 'number' and $adjust > 0 {
     @for $i from 0 through 100 {
       @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
@@ -10,7 +10,6 @@
   @else {
     @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
   }
-  @return $color;
 };
 
 // Quick fix for dynamic variables missing in SASS

data/app/assets/stylesheets/spree/backend/sections/_orders.scss

@@ -49,6 +49,14 @@
   margin-bottom: 18px;
 }
 
+[data-hook="complete-order-button"] {
+  margin-bottom: 15px;
+}
+
+label[for="order_bill_address_attributes_firstname"] {
+  margin-top: 45px;
+}
+
 #risk_analysis legend {
   background-color: #c00;
   color: #FFF;

data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss

@@ -1,11 +1,33 @@
-#listing_product_stock {
+.stock-table {
 
   tbody + tbody {
     border-top-width: 1px;
   }
 
+  .stock-item-edit-row {
+    &.changed {
+      .submit, .cancel {
+        display: inline-block;
+      }
+    }
+
+    td {
+      vertical-align: middle;
+
+      &:not(.actions) {
+        padding: 0.5rem 0.75rem;
+      }
+    }
+  }
+
+  .actions {
+    .submit, .cancel {
+      display: none;
+    }
+  }
+
   td {
-    input.error {
+    .error {
       border-color: theme-color("danger");
     }
 
@@ -14,4 +36,57 @@
       border: 1px solid theme-color("danger");
     }
   }
+
+  .variant-stock-items {
+    border: 0 none;
+  }
+
+  table {
+    td {
+      padding: 4px 0;
+      border: none;
+    }
+
+    &.stock-variant-field-table {
+      margin-bottom: 0;
+
+      td {
+        text-align: left;
+
+        &:first-child {
+          font-weight: bold;
+          text-align: left;
+          padding-right: 0.5rem;
+          width: 15%;
+        }
+      }
+    }
+  }
+
+  > tbody {
+    .variant-image {
+      width: 31%;
+      padding: 0 2%;
+      img { width: 100%; }
+    }
+    .variant-details {
+      width: 65%;
+      padding: 0px 5px;
+    }
+    .variant-image,
+    .variant-details {
+      float: left;
+    }
+    .variant-container {
+      overflow: hidden;
+    }
+  }
+}
+
+.stock-location-items-cell {
+  padding: 0;
+}
+
+.stock-location-items-table {
+  margin-bottom: 0;
 }

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

@@ -29,7 +29,6 @@
 @import 'spree/backend/components/table-filter';
 @import 'spree/backend/components/navigation';
 @import 'spree/backend/components/sidebar';
-@import 'spree/backend/components/stock_table';
 @import 'spree/backend/components/editable_table';
 @import 'spree/backend/components/pills';
 @import 'spree/backend/components/tabs';

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

@@ -20,7 +20,7 @@ module Spree
           flash[:error] = t('spree.no_inventory_selected')
           redirect_to admin_order_cancellations_path(@order)
         else
-          @order.cancellations.short_ship(inventory_units, whodunnit: whodunnit)
+          @order.cancellations.short_ship(inventory_units, created_by: created_by)
 
           flash[:success] = t('spree.inventory_canceled')
           redirect_to edit_admin_order_url(@order)
@@ -29,7 +29,7 @@ module Spree
 
       private
 
-      def whodunnit
+      def created_by
         try_spree_current_user.try(:email)
       end
 

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

@@ -8,7 +8,7 @@ module Spree
 
         if locale && I18n.available_locales.include?(locale.to_sym)
           I18n.locale = locale
-          session[:locale] = locale
+          session[set_user_language_locale_key] = locale
 
           respond_to do |format|
             format.json { render json: { locale: locale, location: spree.admin_url } }

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

@@ -13,7 +13,8 @@ module Spree
         end
 
         def edit
-          country_id = Spree::Country.default.id
+          country_id = default_country_id
+
           @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
           @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 
@@ -43,6 +44,12 @@ module Spree
 
         private
 
+        def default_country_id
+          country_id = Spree::Country.default.id
+
+          country_id if Spree::Country.available.pluck(:id).include?(country_id)
+        end
+
         def order_params
           params.require(:order).permit(
             :email,

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

@@ -51,17 +51,7 @@ module Spree
         end
 
         @search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
-
-        # lazy loading other models here (via includes) may result in an invalid query
-        # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
-        # see https://github.com/spree/spree/pull/3919
-        @orders = if query_present
-          @search.result(distinct: true)
-        else
-          @search.result
-        end
-
-        @orders = @orders.
+        @orders = @search.result.includes([:user]).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])
 

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

@@ -8,6 +8,7 @@ module Spree
       before_action :load_data, except: [:index]
       update.before :update_before
       helper_method :clone_object_url
+      before_action :split_params, only: [:create, :update]
 
       def show
         redirect_to action: :edit
@@ -19,12 +20,6 @@ module Spree
       end
 
       def update
-        if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
-        end
-        if params[:product][:option_type_ids].present?
-          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
-        end
         if updating_variant_property_rules?
           params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
             param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
@@ -73,6 +68,15 @@ module Spree
 
       private
 
+      def split_params
+        if params[:product][:taxon_ids].present?
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+        end
+        if params[:product][:option_type_ids].present?
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+        end
+      end
+
       def find_resource
         Spree::Product.with_deleted.friendly.find(params[:id])
       end

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

@@ -7,7 +7,7 @@ module Spree
     class PromotionCodesController < Spree::Admin::ResourceController
       def index
         @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
-        @promotion_codes = @promotion.promotion_codes
+        @promotion_codes = @promotion.promotion_codes.order(:value)
 
         respond_to do |format|
           format.html do
@@ -20,6 +20,24 @@ module Spree
           end
         end
       end
+
+      def new
+        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion_code = @promotion.promotion_codes.build
+      end
+
+      def create
+        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion_code = @promotion.promotion_codes.build(value: params[:promotion_code][:value])
+
+        if @promotion_code.save
+          flash[:success] = flash_message_for(@promotion_code, :successfully_created)
+          redirect_to admin_promotion_promotion_codes_url(@promotion)
+        else
+          flash.now[:error] = @promotion_code.errors.full_messages.to_sentence
+          render_after_create_error
+        end
+      end
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Spree
           flash[:success] = t('spree.promotion_successfully_created')
           redirect_to location_after_save
         else
-          flash[:error] = @promotion.errors.full_messages.join(", ")
+          flash[:error] = @promotion.errors.full_messages.to_sentence
           render action: 'new'
         end
       end

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

@@ -9,16 +9,21 @@ module Spree
 
       before_action :load_stock_locations, only: :edit
       before_action :load_simulated_refunds, only: :edit
+      create.after :recalculate_order
 
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def perform
-        @reimbursement.perform!
+        @reimbursement.perform!(created_by: try_spree_current_user)
         redirect_to location_after_save
       end
 
       private
 
+      def recalculate_order
+        @reimbursement.order.recalculate
+      end
+
       def build_resource
         if params[:build_from_customer_return_id].present?
           customer_return = Spree::CustomerReturn.find(params[:build_from_customer_return_id])
@@ -57,7 +62,7 @@ module Spree
       end
 
       def load_simulated_refunds
-        @reimbursement_objects = @reimbursement.simulate
+        @reimbursement_objects = @reimbursement.simulate(created_by: try_spree_current_user)
       end
 
       def spree_core_gateway_error(error)

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

@@ -108,6 +108,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       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(', ') }
       end
     end
   end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class StoreCreditReasonsController < ResourceController
+    end
+  end
+end

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

@@ -5,8 +5,8 @@ module Spree
     class StoreCreditsController < ResourceController
       belongs_to 'spree/user', model_class: Spree.user_class
       before_action :load_categories, only: [:new]
-      before_action :load_update_reasons, only: [:edit_amount, :edit_validity]
-      before_action :ensure_update_reason, only: [:update_amount, :invalidate]
+      before_action :load_reasons, only: [:edit_amount, :edit_validity]
+      before_action :ensure_store_credit_reason, only: [:update_amount, :invalidate]
 
       helper Spree::Admin::StoreCreditEventsHelper
 
@@ -50,7 +50,7 @@ module Spree
       def update_amount
         @store_credit = @user.store_credits.find(params[:id])
         amount = params.require(:store_credit).require(:amount)
-        if @store_credit.update_amount(amount, @update_reason, try_spree_current_user)
+        if @store_credit.update_amount(amount, @store_credit_reason, try_spree_current_user)
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
@@ -60,7 +60,7 @@ module Spree
 
       def invalidate
         @store_credit = @user.store_credits.find(params[:id])
-        if @store_credit.invalidate(@update_reason, try_spree_current_user)
+        if @store_credit.invalidate(@store_credit_reason, try_spree_current_user)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
           render_edit_page
@@ -78,18 +78,18 @@ module Spree
         @collection = super.reverse_order
       end
 
-      def load_update_reasons
-        @update_reasons = Spree::StoreCreditUpdateReason.all.order(:name)
+      def load_reasons
+        @store_credit_reasons = Spree::StoreCreditReason.active.order(:name)
       end
 
       def load_categories
         @credit_categories = Spree::StoreCreditCategory.all.order(:name)
       end
 
-      def ensure_update_reason
-        @update_reason = Spree::StoreCreditUpdateReason.find_by(id: params[:update_reason_id])
-        unless @update_reason
-          @store_credit.errors.add(:base, t('spree.admin.store_credits.errors.update_reason_required'))
+      def ensure_store_credit_reason
+        @store_credit_reason = Spree::StoreCreditReason.find_by(id: params[:store_credit_reason_id])
+        unless @store_credit_reason
+          @store_credit.errors.add(:base, t('spree.admin.store_credits.errors.store_credit_reason_required'))
           render_edit_page
         end
       end
@@ -103,7 +103,7 @@ module Spree
           translation_key = 'invalidate'
         end
 
-        load_update_reasons
+        load_reasons
         flash[:error] = "#{t("spree.admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
         render(template) && return
       end

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

@@ -39,7 +39,7 @@ module Spree
         end
       end
 
-      # Make an admin tab that coveres one or more resources supplied by symbols
+      # Make an admin tab that covers 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)
       #   * :route to override automatically determining the default route

data/app/models/spree/backend_configuration.rb

@@ -10,19 +10,21 @@ module Spree
     PRODUCT_TABS       ||= [:products, :option_types, :properties,
                             :variants, :product_properties, :taxonomies,
                             :taxons]
-    REPORT_TABS        ||= [:reports]
     CONFIGURATION_TABS ||= [:stores, :tax_categories,
                             :tax_rates, :zones,
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
-                            :refund_reasons, :reimbursement_types, :return_authorization_reasons]
+                            :refund_reasons, :reimbursement_types,
+                            :return_reasons, :adjustment_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     STOCK_TABS         ||= [:stock_items]
     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
+      attr_reader :icon, :label, :partial, :condition, :sections, :url, :match_path
+
+      attr_accessor :position
 
       # @param sections [Array<Symbol>] The sections which are contained within
       #   this admin menu section.
@@ -35,13 +37,19 @@ module Spree
       # @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
+      # @param position [Integer] The position in which the menu item should render
+      #   nil will cause the item to render last
+      # @param match_path [String, Regexp] (nil) If the {url} to determine the active tab is ambigous
+      #   you can pass a String or Regexp to identify this menu item
       def initialize(
         sections,
         icon,
         condition: nil,
         label: nil,
         partial: nil,
-        url: nil
+        url: nil,
+        position: nil,
+        match_path: nil
       )
 
         @condition = condition || -> { true }
@@ -50,6 +58,8 @@ module Spree
         @label = label || sections.first
         @partial = partial
         @url = url
+        @position = position
+        @match_path = match_path
       end
     end
 
@@ -65,6 +75,11 @@ module Spree
     #
     # @!attribute menu_items
     #   @return [Array<Spree::BackendConfiguration::MenuItem>]
+    #
+    # Positioning can be determined by setting the position attribute to
+    # an Integer or nil. Menu Items will be rendered with smaller lower values
+    # first and higher values last. A position value of nil will cause the menu
+    # item to be rendered at the end of the list.
     attr_writer :menu_items
 
     # Return the menu items which should be drawn in the menu
@@ -77,45 +92,47 @@ module Spree
           ORDER_TABS,
           'shopping-cart',
           condition: -> { can?(:admin, Spree::Order) },
+          position: 0
         ),
         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, Spree::Store) },
-          label: :settings,
-          partial: 'spree/admin/shared/settings_sub_menu',
-          url: :admin_stores_path
+          partial: 'spree/admin/shared/product_sub_menu',
+          position: 1
         ),
         MenuItem.new(
           PROMOTION_TABS,
           'bullhorn',
           partial: 'spree/admin/shared/promotion_sub_menu',
           condition: -> { can?(:admin, Spree::Promotion) },
-          url: :admin_promotions_path
+          url: :admin_promotions_path,
+          position: 2
         ),
         MenuItem.new(
           STOCK_TABS,
           'cubes',
           condition: -> { can?(:admin, Spree::StockItem) },
           label: :stock,
-          url: :admin_stock_items_path
+          url: :admin_stock_items_path,
+          match_path: '/stock_items',
+          position: 3
         ),
         MenuItem.new(
           USER_TABS,
           'user',
           condition: -> { Spree.user_class && can?(:admin, Spree.user_class) },
-          url: :admin_users_path
+          url: :admin_users_path,
+          position: 4
+        ),
+        MenuItem.new(
+          CONFIGURATION_TABS,
+          'wrench',
+          condition: -> { can?(:admin, Spree::Store) },
+          label: :settings,
+          partial: 'spree/admin/shared/settings_sub_menu',
+          url: :admin_stores_path,
+          position: 5
         )
       ]
     end