spree_backend 4.3.3 → 4.4.0.rc1

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/general_settings_controller.rb

@@ -26,11 +26,6 @@ module Spree
         head :no_content
       end
 
-      def render(*args)
-        @preferences_currency |= [:show_store_selector]
-        super
-      end
-
       private
 
       def update_currency_settings

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 turbo_enabled?
+        true
+      end
+
+      def set_default_scopes
+        @object.scopes = 'admin' if @object.scopes.blank?
+      end
+    end
+  end
+end

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,6 +119,14 @@ 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')

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

@@ -18,7 +18,7 @@ module Spree
           redirect_to spree.edit_admin_payment_method_path(@payment_method)
         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
 

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

@@ -42,7 +42,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
 
@@ -132,7 +134,7 @@ 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
 

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

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

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

@@ -39,8 +39,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     else
       invoke_callbacks(:update, :fails)
       respond_with(@object) do |format|
-        format.html { render action: :edit }
-        format.js { render layout: false }
+        format.html { render action: :edit, status: :unprocessable_entity }
+        format.js { render layout: false, status: :unprocessable_entity }
       end
     end
   end
@@ -53,13 +53,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       flash[:success] = flash_message_for(@object, :successfully_created)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
+        format.turbo_stream if turbo_enabled?
         format.js   { render layout: false }
       end
     else
       invoke_callbacks(:create, :fails)
       respond_with(@object) do |format|
-        format.html { render action: :new }
-        format.js { render layout: false }
+        format.html { render action: :new, status: :unprocessable_entity }
+        format.js { render layout: false, status: :unprocessable_entity }
       end
     end
   end
@@ -278,4 +279,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def new_actions
     [:new, :create]
   end
+
+  def turbo_enabled?
+    false
+  end
 end

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

@@ -21,7 +21,7 @@ module Spree
         @collection = resource.all
         # @search needs to be defined as this is passed to search_form_for
         @search = @collection.ransack(params[:q])
-        per_page = params[:per_page] || Spree::Config[:admin_customer_returns_per_page]
+        per_page = params[:per_page] || Spree::Backend::Config[:admin_customer_returns_per_page]
         @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
       end
     end

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

@@ -21,10 +21,10 @@ module Spree
       def create
         if params[:variant].nil?
           flash.now[:error] = Spree.t('stock_transfer.errors.must_have_variant')
-          render :new
+          render :new, status: :unprocessable_entity
         elsif any_missing_variants?(params[:variant])
           flash.now[:error] = Spree.t('stock_transfer.errors.variants_unavailable', stock: source_location.name)
-          render :new
+          render :new, status: :unprocessable_entity
         else
           variants = Hash.new(0)
           params[:variant].each_with_index do |variant_id, i|

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

@@ -27,7 +27,7 @@ module Spree
         else
           load_categories
           flash[:error] = Spree.t('store_credit.errors.unable_to_create')
-          render :new
+          render :new, status: :unprocessable_entity
         end
       end
 
@@ -41,7 +41,7 @@ module Spree
         else
           load_categories
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 

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

@@ -43,7 +43,7 @@ module Spree
           redirect_to @store.formatted_url + spree.admin_stores_path
         else
           flash[:error] = "#{Spree.t('store_errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
-          render :new
+          render :new, status: :unprocessable_entity
         end
       end
 
@@ -112,7 +112,7 @@ module Spree
       end
 
       def set_default_currency
-        @store.default_currency = Spree::Config[:currency]
+        @store.default_currency = Spree::Store.default.default_currency
       end
 
       def set_default_locale

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

@@ -1,30 +1,13 @@
 module Spree
   module Admin
-    class TaxonsController < Spree::Admin::BaseController
-      before_action :load_taxonomy, only: [:create, :edit, :update, :remove_icon]
-      before_action :load_taxon, only: [:edit, :update, :remove_icon]
-      before_action :set_permalink_part, only: [:edit, :update]
+    class TaxonsController < ResourceController
+      belongs_to 'spree/taxonomy'
+
+      before_action :set_permalink_part, only: [:edit]
       respond_to :html, :js
 
       def index; end
 
-      def create
-        @taxon = @taxonomy.taxons.build(params[:taxon].except(:icon))
-        @taxon.build_icon(attachment: taxon_params[:icon])
-        if @taxon.save
-          respond_with(@taxon) do |format|
-            format.json { render json: @taxon.to_json }
-          end
-        else
-          flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
-          respond_with(@taxon) do |format|
-            format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
-          end
-        end
-      end
-
-      def edit; end
-
       def update
         successful = @taxon.transaction do
           parent_id = params[:taxon][:parent_id]
@@ -51,13 +34,13 @@ module Spree
           rename_child_taxons if @update_children
 
           respond_with(@taxon) do |format|
-            format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
+            format.html { redirect_to spree.edit_admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) }
             format.json { render json: @taxon.to_json }
           end
         else
           respond_with(@taxon) do |format|
-            format.html { render :edit }
-            format.json { render json: @taxon.errors.full_messages.to_sentence, status: 422 }
+            format.html { render :edit, status: :unprocessable_entity }
+            format.json { render json: @taxon.errors.full_messages.to_sentence, status: :unprocessable_entity }
           end
         end
       end
@@ -68,12 +51,24 @@ module Spree
           redirect_to spree.edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
         else
           flash[:error] = Spree.t('errors.messages.cannot_remove_icon')
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 
       private
 
+      def location_after_save
+        spree.edit_admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id)
+      end
+
+      def parent_data
+        if action_name == 'index'
+          nil
+        else
+          super
+        end
+      end
+
       def set_permalink_part
         @permalink_part = @taxon.permalink.split('/').last
         @parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
@@ -84,28 +79,18 @@ module Spree
         params.require(:taxon).permit(permitted_taxon_attributes)
       end
 
-      def load_taxon
-        @taxon = @taxonomy.taxons.find(params[:id])
-      end
-
-      def load_taxonomy
-        @taxonomy = if defined?(SpreeGlobalize)
-                      scope.includes(:translations, taxons: [:translations]).find(params[:taxonomy_id])
-                    else
-                      scope.find(params[:taxonomy_id])
-                    end
-      end
-
       def set_position
         new_position = params[:taxon][:position]
         @taxon.child_index = new_position.to_i if new_position
       end
 
       def set_parent(parent_id)
-        @taxon.parent = current_store.taxons.find(parent_id.to_i) if parent_id
+        @taxon.parent = current_store.taxons.find(parent_id) if parent_id
       end
 
       def set_permalink_params
+        set_permalink_part
+
         if params.key? 'permalink_part'
           params[:taxon][:permalink] = @parent_permalink + params[:permalink_part]
         end

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

@@ -15,7 +15,7 @@ module Spree
           flash[:success] = flash_message_for(@user, :successfully_created)
           redirect_to spree.edit_admin_user_path(@user)
         else
-          render :new
+          render :new, status: :unprocessable_entity
         end
       end
 
@@ -29,7 +29,7 @@ module Spree
           flash[:success] = Spree.t(:account_updated)
           redirect_to spree.edit_admin_user_path(@user)
         else
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 
@@ -39,9 +39,10 @@ module Spree
           params[:user][:ship_address_attributes][:user_id] = @user.id if params[:user][:ship_address_attributes].present?
           if @user.update(user_params)
             flash.now[:success] = Spree.t(:account_updated)
+            redirect_to spree.addresses_admin_user_path(@user)
+          else
+            render :addresses, status: :unprocessable_entity
           end
-
-          render :addresses
         end
       end
 
@@ -61,20 +62,6 @@ module Spree
         @orders = @search.result.page(params[:page])
       end
 
-      def generate_api_key
-        if @user.generate_spree_api_key!
-          flash[:success] = Spree.t('api.key_generated')
-        end
-        redirect_to spree.edit_admin_user_path(@user)
-      end
-
-      def clear_api_key
-        if @user.clear_spree_api_key!
-          flash[:success] = Spree.t('api.key_cleared')
-        end
-        redirect_to spree.edit_admin_user_path(@user)
-      end
-
       def model_class
         Spree.user_class
       end
@@ -86,7 +73,7 @@ module Spree
 
         @collection = super
         @search = @collection.ransack(params[:q])
-        @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_users_per_page])
+        @collection = @search.result.page(params[:page]).per(Spree::Backend::Config[:admin_users_per_page])
       end
 
       private

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

@@ -40,8 +40,7 @@ module Spree
         return @collection if @collection.present?
 
         params[:q] ||= {}
-        @deleted = params.dig(:q, :deleted_at_null) || '0'
-
+        @deleted = params[:q].delete(:deleted_at_null) || '0'
         @collection = super
         @collection = @collection.deleted if @deleted == '1'
         # @search needs to be defined as this is passed to search_link

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

@@ -0,0 +1,48 @@
+module Spree
+  module Admin
+    class WebhooksSubscribersController < ResourceController
+      create.before :process_subscriptions
+      update.before :process_subscriptions
+
+      def index
+        params[:q] ||= {}
+        params[:q][:s] ||= 'created_at desc'
+
+        search = Webhooks::Subscriber.ransack(params[:q])
+        @webhooks_subscribers = search.result.
+                                includes(:events).
+                                page(params[:page]).
+                                per(params[:per_page])
+      end
+
+      def show
+        @webhooks_subscriber = Webhooks::Subscriber.find(params[:id])
+        @events = @webhooks_subscriber.events.order(created_at: :desc).page(params[:page]).per(params[:per_page])
+      end
+
+      private
+
+      def resource
+        @resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nil
+      end
+
+      def process_subscriptions
+        params[:webhooks_subscriber][:subscriptions] = if params[:subscribe_to_all_events] == 'true'
+                                                         ['*']
+                                                       else
+                                                         selected_events
+                                                       end
+
+        params[:webhooks_subscriber] = params[:webhooks_subscriber].except(*supported_events.keys)
+      end
+
+      def selected_events
+        supported_events.select { |resource, _events| params[:webhooks_subscriber][resource] == 'true' }.values.flatten
+      end
+
+      def supported_events
+        @supported_events ||= Spree::Webhooks::Subscriber.supported_events
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Spree
 
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
-        css_classes << 'field'
+        css_classes << 'form-group'
         css_classes << 'withError' if error_message_on(model, method).present?
         content_tag(
           :div, capture(&block),
@@ -237,18 +237,28 @@ module Spree
       end
 
       def product_preview_link(product)
-        button_link_to(
-          Spree.t(:preview_product),
-          spree_storefront_resource_url(product),
-          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank
-        )
+       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+         Admin::BaseHelper#product_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
+       DEPRECATION
+
+        external_page_preview_link(product)
       end
 
       def taxon_preview_link(taxon)
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::BaseHelper#taxon_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
+        DEPRECATION
+
+        external_page_preview_link(taxon)
+      end
+
+      def external_page_preview_link(resource, options = {})
+        resource_name = options[:name] || resource.class.name.demodulize
+
         button_link_to(
-          Spree.t(:preview_taxon),
-          spree_storefront_resource_url(taxon),
-          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
+          Spree.t('admin.utilities.preview', name: resource_name ),
+          spree_storefront_resource_url(resource),
+          class: 'btn-outline-secondary', icon: 'view.svg', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
         )
       end
 
@@ -285,6 +295,14 @@ module Spree
           'default'
         end
       end
+
+      def product_wysiwyg_editor_enabled?
+        Spree::Backend::Config[:product_wysiwyg_editor_enabled]
+      end
+
+      def taxon_wysiwyg_editor_enabled?
+        Spree::Backend::Config[:taxon_wysiwyg_editor_enabled]
+      end
     end
   end
 end

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

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    module DigitalHelper
+      def asset_icon(asset)
+        file_name = case asset.attachment.content_type
+                    when /pdf\z/
+                      'file-earmark-pdf.svg'
+                    when /\Aimage/
+                      'file-earmark-image.svg'
+                    when /zip\z/
+                      'file-earmark-zip.svg'
+                    when 'text/csv', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                      'file-earmark-spreadsheet.svg'
+                    when /\Avideo/
+                      'file-earmark-play.svg'
+                    when /\Aaudio/
+                      'file-earmark-music.svg'
+                    when /\Afont/
+                      'file-earmark-font.svg'
+                    else
+                      'file-earmark.svg'
+                    end
+
+        svg_icon name: file_name, width: 50, height: 50
+      end
+    end
+  end
+end

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

@@ -1,27 +1,6 @@
 module Spree
   module Admin
     module MenuHelper
-      def menu_item_bar(menu, item)
-        render 'spree/admin/menus/nested_menu_items/item_bar', menu: menu, item: item
-      end
-
-      def build_menu_item(menu, item)
-        decendents = []
-
-        unless item.leaf?
-          item.children.each do |child_item|
-            decendents << build_menu_item(menu, child_item) unless item.leaf?
-          end
-        end
-
-        info_row = menu_item_bar(menu, item)
-        menu_container = content_tag(:div, raw(decendents.join), class: 'menu-container', data: { parent_id: item.id })
-
-        content_tag(:div, info_row + menu_container,
-                    class: 'menu-item menu-container-item dragable removable-dom-element',
-                    data: { item_id: item.id })
-      end
-
       def default_menu_for_store?(menu)
         menu.store.default_locale == menu.locale
       end