spree_backend 4.3.0 → 4.5.0

data/app/assets/stylesheets/spree/backend/plugins/_select2_bootstrap4.scss

@@ -4,7 +4,7 @@ $s2bs-border-radius-base: $border-radius !default;
 $s2bs-border-radius-large: $border-radius-lg !default;
 $s2bs-border-radius-small: $border-radius-sm !default;
 $s2bs-btn-default-bg: transparent !default;
-$s2bs-btn-default-border: $dark !default;
+$s2bs-btn-default-border: $border-color !default;
 $s2bs-btn-default-color: $dark !default;
 $s2bs-caret-padding: $custom-select-indicator-padding !default;
 $s2bs-caret-width-base: 0.25rem !default;
@@ -31,7 +31,7 @@ $s2bs-input-bg: $input-bg !default;
 $s2bs-input-bg-disabled: $input-disabled-bg !default;
 $s2bs-input-color: $input-color !default;
 $s2bs-input-color-placeholder: $input-placeholder-color !default;
-$s2bs-input-border: $input-border-color !default;
+$s2bs-input-border: $border-color !default;
 $s2bs-input-border-width: $input-border-width !default;
 $s2bs-input-border-focus: $input-focus-border-color !default;
 $s2bs-input-border-radius: $input-border-radius !default;
@@ -557,15 +557,15 @@ $s2bs-form-control-transition: border-color ease-in-out .15s, box-shadow ease-in
 }
 
 .has-warning {
-  @include validation-state-focus($warning);
+  @include validation-state-focus(theme-color('warning'));
 }
 
 .has-error {
-  @include validation-state-focus($danger);
+  @include validation-state-focus(theme-color('danger'));
 }
 
 .has-success {
-  @include validation-state-focus($success);
+  @include validation-state-focus(theme-color('success'));
 }
 
 .input-group > .select2-container--bootstrap4 {

data/app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss

@@ -3,7 +3,7 @@
   z-index: 1028;
 }
 
-// Hides the empty <li> tag highligted in open select2-dropdown.
+// Hides the empty <li> tag highlighted in open select2-dropdown.
 ul.select2-results__options {
   li:empty  {
     display: none;

data/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss

@@ -42,7 +42,7 @@ body.swal2-toast-shown .swal2-container.swal2-bottom {
   max-width: 500px;
 
   .swal2-popup.swal2-toast {
-    border-width: 3px;
+    border-width: 1px;
     border-style: solid;
     box-shadow: none !important;
     margin-bottom: 50px;

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

@@ -81,9 +81,9 @@ div.admin-product-image-container {
 }
 
 .js-remove-promo-rule-option-value {
-  color: $primary !important;
+  color: theme-color('primary') !important;
   &:hover {
-    color: darken($primary, 10) !important;
+    color: darken(theme-color('primary'), 10) !important;
   }
 }
 

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

@@ -15,12 +15,12 @@ span.or {
 .form-group {
   &.withError {
     label, .formError, .required {
-      color: $danger;
+      color: theme-color('danger');
     }
 
     input,
     .select2-choice {
-      border-color: $danger;
+      border-color: theme-color('danger');
     }
   }
 }
@@ -45,28 +45,7 @@ input[type="file"] {
   text-overflow: ellipsis;
 }
 
-
-// Remove the default 5px outlines and box-shadows
-// from all inputs on focus.
-.form-control:focus {
-  box-shadow: none !important;
-}
-
-*:focus {
-    outline: none;
-}
-
-:-webkit-direct-focus {
-  outline-color: transparent;
-  outline-style: auto;
-  outline-width: 0;
-}
-
 .custom-select {
   background: $input-bg url(asset-path("backend-chevron-down.svg")) no-repeat right 0.5rem center/8px 10px;
   background-size: 0.7em;
-  &:focus{
-    outline: none;
-    box-shadow: none;
-  }
 }

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

@@ -0,0 +1,62 @@
+#itemImgContainer {
+  width: 200px;
+  img {
+    max-width: 100%;
+  }
+}
+
+#sortableTreeArea {
+  .space-buttons {
+    box-shadow: -11px 0 16px 6px white;
+    z-index: 9;
+    a {
+      margin: 2px;
+    }
+  }
+
+  .sortable-tree-item-row {
+    overflow: hidden;
+    border: 1px solid $border-color;
+    margin: 2px;
+    background-color: white;
+  }
+
+  .sortable-tree-item {
+    border: solid 1px transparent;
+    padding: 0;
+    background-color: var(--light);
+
+    [data-sortable-tree-parent-id-value] {
+      margin-left: 25px;
+      background-color: var(--light);
+    }
+
+    @include media-breakpoint-up(sm) {
+      [data-sortable-tree-parent-id-value] {
+        margin-left: 50px;
+      }
+    }
+  }
+
+  .sortable-chosen {
+    border: 1px dashed var(--gray);
+    border-radius: 5px;
+  }
+
+  .item_image_holder {
+    position: relative;
+    border: 1px solid $border-color;
+    border-radius: 7px;
+    overflow: hidden;
+    width: 45px;
+    height: 45px;
+    img {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      height: 100%;
+      width: auto;
+      transform: translate(-50%,-50%);
+    }
+  }
+}

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

@@ -1,37 +1,39 @@
-@import 'global/variables';
-@import 'global/mixins';
+@import 'spree/backend/global/variables';
+@import 'spree/backend/global/mixins';
 
 @import 'bootstrap';
 @import 'glyphicons';
-@import 'shared/glyphicons_urls_fix';
+@import 'spree/backend/shared/glyphicons_urls_fix';
+@import 'flag-icon';
 
-@import 'components/navbar';
-@import 'components/sidebar';
-@import 'components/tables';
-@import 'components/badges';
-@import 'components/main';
-@import 'components/page_header';
-@import 'components/icons';
-@import 'components/buttons';
-@import 'components/filters';
-@import 'components/navigation';
-@import 'components/taxon_products_view';
-@import 'components/progress';
-@import 'components/spinner';
+@import 'spree/backend/components/navbar';
+@import 'spree/backend/components/sidebar';
+@import 'spree/backend/components/tables';
+@import 'spree/backend/components/badges';
+@import 'spree/backend/components/main';
+@import 'spree/backend/components/page_header';
+@import 'spree/backend/components/icons';
+@import 'spree/backend/components/buttons';
+@import 'spree/backend/components/filters';
+@import 'spree/backend/components/navigation';
+@import 'spree/backend/components/taxon_products_view';
 
-@import 'plugins/sweetalert2_custom';
-@import 'plugins/jquery_ui';
-@import 'plugins/flatpickr';
-@import 'plugins/select2_bootstrap4';
-@import 'plugins/select2_custom';
-@import 'plugins/tinymce_custom';
-@import 'plugins/nav_x';
+@import 'spree/backend/plugins/sweetalert2_custom';
+@import 'spree/backend/plugins/jquery_ui';
+@import 'spree/backend/plugins/flatpickr';
+@import 'spree/backend/plugins/select2_bootstrap4';
+@import 'spree/backend/plugins/select2_custom';
+@import 'spree/backend/plugins/tinymce_custom';
+@import 'spree/backend/plugins/nav_x';
 
-@import 'shared/base';
-@import 'shared/forms';
+@import 'spree/backend/shared/base';
+@import 'spree/backend/shared/forms';
+@import 'spree/backend/shared/sortable_tree';
 
-@import 'views/menus';
-@import 'views/cms_pages';
-@import 'views/order_payments';
-@import 'views/product_properties';
-@import 'views/prototypes';
+@import 'spree/backend/views/menus';
+@import 'spree/backend/views/cms_pages';
+@import 'spree/backend/views/digitals';
+@import 'spree/backend/views/order_payments';
+@import 'spree/backend/views/product_properties';
+@import 'spree/backend/views/prototypes';
+@import 'spree/backend/views/taxonomies'

data/app/assets/stylesheets/spree/backend/views/_digitals.scss

@@ -0,0 +1,33 @@
+div.digital-container {
+  border: 1px solid $gray-500;
+  background-color: #fefefe;
+  border-radius: $border-radius;
+  overflow: hidden;
+  display: flex;
+  justify-content: center;
+  margin: auto;
+
+  .delete-digital-info-container {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .delete-digital-button-container {
+    min-width: 44px;
+    flex-grow: 0;
+    a {
+      padding: 3px;
+      height: 32px;
+    }
+  }
+
+  .delete-digital-icon-container {
+    width: 50px;
+    flex-grow: 0;
+    svg {
+      color: $gray-600;
+      align-self: center;
+    }
+  }
+}

data/app/assets/stylesheets/spree/backend/views/_taxonomies.scss

@@ -0,0 +1,3 @@
+form.edit_taxonomy {
+  width: 100%;
+}

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

@@ -17,7 +17,6 @@ module Spree
       layout 'spree/layouts/admin'
 
       before_action :authorize_admin
-      before_action :generate_admin_api_key
       before_action :load_stores
 
       helper_method :admin_oauth_token
@@ -56,14 +55,6 @@ module Spree
         end
       end
 
-      # Need to generate an API key for a user due to some backend actions
-      # requiring authentication to the Spree API
-      def generate_admin_api_key
-        if (user = try_spree_current_user) && user.spree_api_key.blank?
-          user.generate_spree_api_key!
-        end
-      end
-
       def flash_message_for(object, event_sym)
         resource_desc  = object.class.model_name.human
         resource_desc += " \"#{object.name}\"" if (object.persisted? || object.destroyed?) && object.respond_to?(:name) && object.name.present? && !object.is_a?(Spree::Order)
@@ -95,7 +86,7 @@ module Spree
 
       def admin_oauth_application
         @admin_oauth_application ||= begin
-          Doorkeeper::Application.find_or_create_by!(name: 'Admin Panel', scopes: 'admin', redirect_uri: '')
+          Spree::OauthApplication.find_or_create_by!(name: 'Admin Panel', scopes: 'admin', redirect_uri: '')
         end
       end
 
@@ -105,9 +96,9 @@ module Spree
         return unless user
 
         @admin_oauth_token ||= begin
-          Doorkeeper::AccessToken.active_for(user).where(application_id: admin_oauth_application.id).last ||
-            Doorkeeper::AccessToken.create!(
-              resource_owner_id: user.id,
+          Spree::OauthAccessToken.active_for(user).where(application_id: admin_oauth_application.id).last ||
+            Spree::OauthAccessToken.create!(
+              resource_owner: user,
               application_id: admin_oauth_application.id,
               scopes: admin_oauth_application.scopes
             )

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class DashboardController < BaseController
+      def show
+        @products_added = current_store.products.any?
+        @shipping_methods_added = Spree::ShippingMethod.any?
+        @payment_methods_added = current_store.payment_methods.any?
+        @taxes_added = Spree::TaxRate.any?
+
+        @onboarding_complete = @products_added && @shipping_methods_added && @payment_methods_added && @taxes_added
+
+        @shippable_countries = Spree::ShippingMethod.all.collect(&:zones).flatten.uniq.compact.collect(&:countries).flatten.uniq.sort_by(&:name)
+
+        @active_tab = if !@products_added
+                        'products'
+                      elsif !@shipping_methods_added
+                        'shipping'
+                      elsif !@payment_methods_added
+                        'payment'
+                      else
+                        'taxes'
+                      end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Spree
+  module Admin
+    class DigitalsController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      def create
+        invoke_callbacks(:create, :before)
+        @object.attributes = permitted_resource_params
+
+        if @object.valid?
+          super
+        else
+          invoke_callbacks(:create, :fails)
+          flash[:error] = @object.errors.full_messages.join(', ')
+          respond_with(@object) do |format|
+            format.html { render action: :index, status: :unprocessable_entity }
+            format.js { render layout: false, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      private
+
+      def permitted_resource_params
+        params.require(:digital).permit(permitted_digital_attributes)
+      end
+
+      def permitted_digital_attributes
+        %i[variant_id attachment attachment_file_name attachment_content_type]
+      end
+    end
+  end
+end

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

@@ -41,7 +41,7 @@ module Spree
         spree.admin_product_images_url
       end
 
-      def modle_class
+      def model_class
         Spree::Image
       end
 

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

@@ -0,0 +1,17 @@
+module Spree
+  module Admin
+    class OauthApplicationsController < ResourceController
+      before_action :set_default_scopes, only: [:new, :edit]
+
+      private
+
+      def create_turbo_stream_enabled?
+        true
+      end
+
+      def set_default_scopes
+        @object.scopes = 'admin' if @object.scopes.blank?
+      end
+    end
+  end
+end

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

@@ -19,11 +19,7 @@ module Spree
       protected
 
       def location_after_save
-        if @option_type.created_at == @option_type.updated_at
-          edit_admin_option_type_url(@option_type)
-        else
-          admin_option_types_url
-        end
+        edit_admin_option_type_url(@option_type)
       end
 
       private

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

@@ -28,10 +28,10 @@ module Spree
               flash[:success] = Spree.t('customer_details_updated')
               redirect_to spree.edit_admin_order_url(@order)
             else
-              render action: :edit
+              render action: :edit, status: :unprocessable_entity
             end
           else
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
 

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

@@ -13,7 +13,7 @@ module Spree
 
       def index
         params[:q] ||= {}
-        params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
+        params[:q][:completed_at_not_null] ||= '1' if Spree::Backend::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
         params[:q][:completed_at_not_null] = '' unless @show_only_completed
@@ -54,7 +54,7 @@ module Spree
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).
                   page(params[:page]).
-                  per(params[:per_page] || Spree::Config[:admin_orders_per_page])
+                  per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -119,12 +119,20 @@ module Spree
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
+      def reset_digitals
+        load_order
+        @order.digital_links.each(&:reset!)
+        flash[:notice] = Spree.t('admin.digitals.downloads_reset')
+
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
+      end
+
       def open_adjustments
         adjustments = @order.all_adjustments.finalized
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
       def close_adjustments
@@ -132,7 +140,7 @@ module Spree
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
       def set_channel

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

@@ -15,10 +15,10 @@ module Spree
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to location_after_create
         else
           invoke_callbacks(:create, :fails)
-          respond_with(@payment_method)
+          respond_with(@payment_method, status: :unprocessable_entity)
         end
       end
 
@@ -45,7 +45,7 @@ module Spree
           redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
-          respond_with(@payment_method)
+          respond_with(@payment_method, status: :unprocessable_entity)
         end
       end
 
@@ -89,6 +89,10 @@ module Spree
 
         params.require(key).permit!
       end
+
+      def location_after_create
+        spree.edit_admin_payment_method_path(@payment_method)
+      end
     end
   end
 end

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

@@ -54,7 +54,7 @@ module Spree
             @payment ||= @order.payments.build(object_params)
             invoke_callbacks(:create, :fails)
             flash[:error] = Spree.t(:payment_could_not_be_created)
-            render :new
+            render :new, status: :unprocessable_entity
           end
         rescue Spree::Core::GatewayError => e
           invoke_callbacks(:create, :fails)

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

@@ -3,12 +3,15 @@ module Spree
     class ProductsController < ResourceController
       include Spree::Admin::ProductConcern
 
-      helper 'spree/products'
+      helper 'spree/admin/products'
 
       before_action :load_data, except: :index
+      before_action :set_product_defaults, only: :new
 
       create.before :create_before
       update.before :update_before
+      update.before :skip_updating_status
+      update.after :update_status
       helper_method :clone_object_url
 
       def show
@@ -42,7 +45,9 @@ module Spree
           # update the product again
           @product.slug = @product.slug_was if @product.slug.blank?
           invoke_callbacks(:update, :fails)
-          respond_with(@object)
+          respond_with(@object) do |format|
+            format.html { render :edit, status: :unprocessable_entity }
+          end
         end
       end
 
@@ -99,7 +104,11 @@ module Spree
       end
 
       def location_after_save
-        spree.edit_admin_product_url(@product)
+        if params[:product][:product_properties_attributes].present?
+          spree.admin_product_product_properties_path(@product)
+        else
+          spree.edit_admin_product_url(@product)
+        end
       end
 
       def load_data
@@ -109,12 +118,27 @@ module Spree
         @shipping_categories = ShippingCategory.order(:name)
       end
 
+      def set_product_defaults
+        @product.shipping_category ||= @shipping_categories&.first
+      end
+
+      def skip_updating_status
+        @new_status = params[:product].delete(:status)
+      end
+
+      def update_status
+        return if @new_status == @product.status
+        return if cannot?(:activate, Spree::Product) && @new_status&.to_sym == :active
+
+        event_to_fire = @product.status_transitions.find { |transition| transition.from == @product.status && transition.to == @new_status }&.event
+        @product.send(event_to_fire) if event_to_fire
+      end
+
       def collection
         return @collection if @collection.present?
 
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= '1'
-        params[:q][:not_discontinued] ||= '1'
 
         params[:q][:s] ||= 'name asc'
 
@@ -132,7 +156,8 @@ module Spree
         @collection = @search.result.
                       includes(product_includes).
                       page(params[:page]).
-                      per(params[:per_page] || Spree::Config[:admin_products_per_page])
+                      per(params[:per_page] || Spree::Backend::Config[:admin_products_per_page])
+
         @collection
       end
 
@@ -163,6 +188,14 @@ module Spree
         clone_admin_product_url resource
       end
 
+      def permitted_resource_params
+        if cannot?(:activate, @product) && @new_status&.to_sym == :active
+          super.except(:status, :make_active_at).permit!
+        else
+          super
+        end
+      end
+
       private
 
       def variant_stock_includes

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

@@ -27,6 +27,8 @@ module Spree
       end
 
       def load_data
+        @actions = Rails.application.config.spree.promotions.actions
+
         @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
         @promotion_categories = Spree::PromotionCategory.order(:name)
       end
@@ -42,7 +44,7 @@ module Spree
         @collection = @search.result(distinct: true).
                       includes(promotion_includes).
                       page(params[:page]).
-                      per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
+                      per(params[:per_page] || Spree::Backend::Config[:admin_promotions_per_page])
       end
 
       def promotion_includes

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

@@ -17,7 +17,7 @@ module Spree
         @search = @collection.ransack(params[:q])
         @collection = @search.result.
                       page(params[:page]).
-                      per(Spree::Config[:admin_properties_per_page])
+                      per(Spree::Backend::Config[:admin_properties_per_page])
       end
     end
   end