solidus_backend 2.10.3 → 2.11.4

data/app/assets/stylesheets/spree/backend/components/_messages.scss

@@ -44,16 +44,16 @@
   color: $body-color;
 
   &.notice {
-    background-color: rgba(lighten($color-notice, 15), .95);
-    border-top-color: $color-notice;
+    background-color: rgba(theme-color-level(warning, -8), .95);
+    border-top-color: theme-color(warning);
   }
   &.success {
-    background-color: rgba(lighten($color-success, 30), .95);
-    border-top-color: $color-success;
+    background-color: rgba(theme-color-level(success, -10), .95);
+    border-top-color: theme-color(success);
   }
   &.error {
-    background-color: rgba(lighten($color-error, 30), .95);
-    border-top-color: $color-error;
+    background-color: rgba(theme-color-level(danger, -8), .95);
+    border-top-color: theme-color(danger);
   }
 }
 

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -64,10 +64,6 @@ $padding-y-navbar-submenu: 9px;
 
   .brand-link {
     overflow: hidden;
-
-    img {
-      max-width: 125px;
-    }
   }
 
   .admin-nav-menu {
@@ -355,8 +351,11 @@ nav.menu {
 
 .brand-link {
   display: block;
+  height: $main-header-height - 1px;
+  overflow: hidden;
 
   img {
-    max-width: 125px;
+    max-height: 100%;
+    max-width: 100%;
   }
 }

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

@@ -11,7 +11,7 @@ $output-solidus-deprecation-warnings: true !default;
   @if $output-solidus-deprecation-warnings == true {
     @if global-variable-exists($variable) {
       @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
-        "removed in 3.0.0. Please use Bootstraps $#{$replacement} instead";
+        "removed in 3.0.0. Please use Bootstraps #{$replacement} instead";
     }
   }
 }

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

@@ -62,11 +62,11 @@ $color-tab-active-bg:           $color-white !default;
 $color-tab-active-border:       $color-white !default;
 
 // Basic flash colors
-@include bs-deprecated-variable("color-success", "brand-success");
+@include bs-deprecated-variable("color-success", "theme-color(success)");
 $color-success:                 $color-green !default;
-@include bs-deprecated-variable("color-notice", "brand-warning");
+@include bs-deprecated-variable("color-notice", "theme-color(warning)");
 $color-notice:                  $color-yellow !default;
-@include bs-deprecated-variable("color-error", "brand-danger");
+@include bs-deprecated-variable("color-error", "theme-color(danger)");
 $color-error:                   $color-red !default;
 
 // Breadcrumb custom variable
@@ -113,26 +113,6 @@ $color-pill-warning-text: $color-pill-text;
 $color-pill-error: #ff967b;
 $color-pill-error-text: $color-pill-text;
 
-// Actions colors
-$color-action-edit-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-edit-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-clone-bg:          lighten($color-notice,  (5 * 5)  ) !default;
-$color-action-clone-brd:         lighten($color-notice,  (15 * 5) ) !default;
-$color-action-remove-bg:         lighten($color-error,   (5 * 5)  ) !default;
-$color-action-remove-brd:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-bg:           lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-brd:          lighten($color-error,   (20 * 5) ) !default;
-$color-action-cancel-bg:         lighten($color-notice,  (10 * 5) ) !default;
-$color-action-cancel-brd:        lighten($color-notice,  (20 * 5) ) !default;
-$color-action-capture-bg:        lighten($color-success, (5 * 5)  ) !default;
-$color-action-capture-brd:       lighten($color-success, (20 * 5) ) !default;
-$color-action-save-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-save-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-mail-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-mail-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-failure-bg:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-failure-brd:       lighten($color-error,   (20 * 5) ) !default;
-
 // Available states
 $states: (
   active,
@@ -160,11 +140,6 @@ $states: (
   void
 ) !default;
 
-// Available actions
-$actions: edit, clone, remove, void, capture, save, cancel, mail, failure !default;
-$actions-bg-colors: $color-action-edit-bg, $color-action-clone-bg, $color-action-remove-bg, $color-action-void-bg, $color-action-capture-bg, $color-action-save-bg, $color-action-cancel-bg, $color-action-mail-bg, $color-action-failure-bg !default;
-$actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-action-remove-brd, $color-action-void-brd, $color-action-capture-brd, $color-action-save-brd, $color-action-cancel-brd, $color-action-mail-brd, $color-action-failure-brd !default;
-
 // Sidebar
 //--------------------------------------------------------------
 $width-sidebar:                  200px !default;

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

@@ -65,7 +65,11 @@
 }
 
 label[for="order_bill_address_attributes_firstname"] {
-  margin-top: 45px;
+  margin-top: 53.5px;
+}
+
+label[for="order_bill_address_attributes_name"] {
+  margin-top: 53.5px;
 }
 
 #risk_analysis legend {

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

@@ -122,6 +122,10 @@
 .style-guide-code,
 .style-guide-result {
   margin: 1rem 0;
+
+  img {
+    max-width: none;
+  }
 }
 
 .color-variables {

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

@@ -3,6 +3,7 @@ input[type="password"],
 input[type="email"],
 input[type="date"],
 input[type="datetime"],
+input[type="datetime-local"],
 input[type="time"],
 input[type="url"],
 input[type="number"],

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

@@ -62,6 +62,12 @@ module Spree
       def order_mutex_redirect_path
         edit_admin_order_path(@order)
       end
+
+      def resource_not_found(flash_class:, redirect_url:)
+        flash[:error] = flash_message_for(flash_class.new, :not_found)
+        redirect_to redirect_url
+        nil
+      end
     end
   end
 end

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

@@ -36,6 +36,8 @@ module Spree
       def load_order
         @order = Spree::Order.find_by!(number: params[:order_id])
         authorize! action, @order
+      rescue ActiveRecord::RecordNotFound
+        resource_not_found(flash_class: Spree::Order, redirect_url: admin_orders_path)
       end
 
       def model_class

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

@@ -37,13 +37,15 @@ 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
+        return unless @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
@@ -70,8 +72,6 @@ module Spree
           return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
           return_item.assign_attributes(item_params)
 
-          return_item.skip_customer_return_processing = true
-
           if item_params[:reception_status_event].blank?
             return redirect_to(new_object_url, flash: { error: 'Reception status choice required' })
           end

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

@@ -4,7 +4,6 @@ module Spree
   module Admin
     class ImagesController < ResourceController
       before_action :load_data
-
       create.before :set_viewable
       update.before :set_viewable
 
@@ -24,6 +23,8 @@ module Spree
           [variant.sku_and_options_text, variant.id]
         end
         @variants.insert(0, [t('spree.all'), @product.master.id])
+      rescue ActiveRecord::RecordNotFound
+        resource_not_found(flash_class: Spree::Product, redirect_url: admin_products_path)
       end
 
       def set_viewable

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

@@ -61,6 +61,8 @@ module Spree
 
         def load_order
           @order = Spree::Order.includes(:adjustments).find_by!(number: params[:order_id])
+        rescue ActiveRecord::RecordNotFound
+          resource_not_found(flash_class: Spree::Order, redirect_url: admin_orders_path)
         end
 
         def model_class

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

@@ -10,7 +10,6 @@ module Spree
       around_action :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
-
       respond_to :html
 
       def index
@@ -61,7 +60,11 @@ module Spree
 
       def new
         user = Spree.user_class.find_by(id: params[:user_id]) if params[:user_id]
-        @order = Spree::Core::Importer::Order.import(user, order_params)
+        order_importer_params = order_params
+        order_importer_params[:bill_address] = user&.bill_address
+        order_importer_params[:ship_address] = user&.ship_address
+
+        @order = Spree::Core::Importer::Order.import(user, order_importer_params)
         redirect_to cart_admin_order_url(@order)
       end
 
@@ -164,6 +167,8 @@ module Spree
       def load_order
         @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
         authorize! action, @order
+      rescue ActiveRecord::RecordNotFound
+        resource_not_found(flash_class: Spree::Order, redirect_url: admin_orders_path)
       end
 
       # Used for extensions which need to provide their own custom event links on the order details view.

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

@@ -80,7 +80,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = Spree::PaymentMethod.active.available_to_admin
+        @payment_methods = Spree::PaymentMethod.active.available_to_admin.ordered_by_position
         if @payment && @payment.payment_method
           @payment_method = @payment.payment_method
         else
@@ -92,6 +92,8 @@ module Spree
         @order = Spree::Order.find_by!(number: params[:order_id])
         authorize! action, @order
         @order
+      rescue ActiveRecord::RecordNotFound
+        resource_not_found(flash_class: Spree::Order, redirect_url: admin_orders_path)
       end
 
       def load_payment

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

@@ -15,7 +15,7 @@ module Spree
       end
 
       def setup_property
-        @product.product_properties.build
+        @product.product_properties.build if @product.product_properties.empty?
       end
 
       def setup_variant_property_rules

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

@@ -9,6 +9,7 @@ module Spree
       update.before :update_before
       helper_method :clone_object_url
       before_action :split_params, only: [:create, :update]
+      before_action :normalize_variant_property_rules, only: [:update]
 
       def show
         redirect_to action: :edit
@@ -19,29 +20,6 @@ module Spree
         respond_with(@collection)
       end
 
-      def update
-        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(',')
-          end
-        end
-        invoke_callbacks(:update, :before)
-        if @object.update(permitted_resource_params)
-          invoke_callbacks(:update, :after)
-          flash[:success] = flash_message_for(@object, :successfully_updated)
-          respond_with(@object) do |format|
-            format.html { redirect_to location_after_save }
-            format.js   { render layout: false }
-          end
-        else
-          # Stops people submitting blank slugs, causing errors when they try to
-          # update the product again
-          @product.slug = @product.slug_was if @product.slug.blank?
-          invoke_callbacks(:update, :fails)
-          respond_with(@object)
-        end
-      end
-
       def destroy
         @product = Spree::Product.friendly.find(params[:id])
         @product.discard
@@ -78,7 +56,7 @@ module Spree
       end
 
       def find_resource
-        Spree::Product.with_deleted.friendly.find(params[:id])
+        Spree::Product.with_discarded.friendly.find(params[:id])
       end
 
       def location_after_save
@@ -96,6 +74,7 @@ module Spree
 
       def load_data
         @tax_categories = Spree::TaxCategory.order(:name)
+        @default_tax_category = @tax_categories.detect(&:is_default)
         @shipping_categories = Spree::ShippingCategory.order(:name)
       end
 
@@ -138,6 +117,21 @@ module Spree
       def updating_variant_property_rules?
         params[:product][:variant_property_rules_attributes].present?
       end
+
+      def render_after_update_error
+        # Stops people submitting blank slugs, causing errors when they try to
+        # update the product again
+        @product.slug = @product.slug_was if @product.slug.blank?
+        render action: 'edit'
+      end
+
+      def normalize_variant_property_rules
+        return unless 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(',')
+        end
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Spree
   module Admin
     class PromotionCodesController < Spree::Admin::ResourceController
       def index
-        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
         @promotion_codes = @promotion.promotion_codes.order(:value)
 
         respond_to do |format|
@@ -22,12 +22,17 @@ module Spree
       end
 
       def new
-        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
-        @promotion_code = @promotion.promotion_codes.build
+        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
+        if @promotion.apply_automatically
+          flash[:error] = t('activerecord.errors.models.spree/promotion_code.attributes.base.disallowed_with_apply_automatically')
+          redirect_to admin_promotion_promotion_codes_url(@promotion)
+        else
+          @promotion_code = @promotion.promotion_codes.build
+        end
       end
 
       def create
-        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
         @promotion_code = @promotion.promotion_codes.build(value: params[:promotion_code][:value])
 
         if @promotion_code.save

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

@@ -10,6 +10,22 @@ module Spree
 
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
+      def create
+        @refund.attributes = refund_params
+
+        if @refund.valid? && @refund.perform!
+          flash[:success] = flash_message_for(@refund, :successfully_created)
+          respond_with(@refund) do |format|
+            format.html { redirect_to location_after_save }
+          end
+        else
+          flash.now[:error] = @refund.errors.full_messages.join(", ")
+          respond_with(@refund) do |format|
+            format.html { render action: 'new' }
+          end
+        end
+      end
+
       private
 
       def location_after_save
@@ -25,6 +41,10 @@ module Spree
         @refund_reasons ||= Spree::RefundReason.active.all
       end
 
+      def refund_params
+        params.require(:refund).permit!
+      end
+
       def build_resource
         super.tap do |refund|
           refund.amount = refund.payment.credit_allowed

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

@@ -5,7 +5,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
   before_action :load_resource, except: :update_positions
-  rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
+  rescue_from ActiveRecord::RecordNotFound do |exception|
+    resource_not_found(flash_class: exception.model.constantize)
+  end
+  rescue_from ActiveRecord::RecordInvalid, with: :resource_invalid
 
   respond_to :html
 
@@ -76,7 +79,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def update_positions
     ActiveRecord::Base.transaction do
       params[:positions].each do |id, index|
-        model_class.find(id).set_list_position(index)
+        model_class.find_by(id: id)&.set_list_position(index)
       end
     end
 
@@ -133,9 +136,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
   end
 
-  def resource_not_found
-    flash[:error] = flash_message_for(model_class.new, :not_found)
-    redirect_to collection_url
+  def resource_not_found(flash_class: model_class, redirect_url: collection_url)
+    super
   end
 
   def model_class
@@ -192,12 +194,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     if parent?
       @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"])
+                    .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"
       nil
     end
+  rescue ActiveRecord::RecordNotFound => e
+    resource_not_found(flash_class: e.model.constantize, redirect_url: spree.polymorphic_url([:admin, parent_model_name.pluralize]))
   end
 
   def parent?
@@ -221,7 +225,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def collection
-    return parent.send(controller_name) if parent?
+    return parent.send(controller_name) if parent? && parent
+
     if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
       model_class.accessible_by(current_ability, action)
     else
@@ -299,4 +304,19 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def render_after_update_error
     render action: 'edit'
   end
+
+  def resource_invalid(exception)
+    invoke_callbacks(action, :fails)
+    respond_with(@object) do |format|
+      format.html do
+        flash.now[:error] = exception.message
+        if @object.new_record?
+          render_after_create_error
+        else
+          render_after_update_error
+        end
+      end
+      format.js { render layout: false }
+    end
+  end
 end