spree_admin 5.2.6 → 5.3.0.rc1

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

@@ -0,0 +1,77 @@
+module Spree
+  module Admin
+    class CustomerGroupUsersController < ResourceController
+      include BulkOperationsConcern
+
+      prepend_before_action :set_customer_group
+
+      def bulk_new
+        # Render the drawer form for adding users
+      end
+
+      def bulk_create
+        @customer_group.add_customers(bulk_collection.pluck(:id))
+
+        @collection = collection
+
+        flash.now[:success] = Spree.t(:customers_added_to_group, count: bulk_collection.size)
+      end
+
+      def create
+        user_ids = params[:user_ids].to_a.reject(&:blank?)
+
+        if user_ids.empty?
+          flash[:error] = Spree.t(:no_users_selected)
+          redirect_to spree.admin_customer_group_path(@customer_group)
+          return
+        end
+
+        added_count = @customer_group.add_customers(user_ids)
+
+        flash[:success] = Spree.t(:customers_added_to_group, count: added_count)
+        redirect_to spree.admin_customer_group_path(@customer_group)
+      end
+
+      def destroy
+        deleted_count = @customer_group.remove_customers([params[:id]])
+
+        if deleted_count > 0
+          flash[:success] = Spree.t(:customer_removed_from_group)
+        else
+          flash[:error] = Spree.t(:customer_could_not_be_removed_from_group)
+        end
+
+        redirect_to spree.admin_customer_group_path(@customer_group)
+      end
+
+      def bulk_destroy
+        user_ids = Array(params[:ids]).reject(&:blank?)
+
+        if user_ids.empty?
+          flash.now[:error] = Spree.t(:no_users_selected)
+        else
+          deleted_count = @customer_group.remove_customers(user_ids)
+          flash.now[:success] = Spree.t(:customers_removed_from_group, count: deleted_count)
+        end
+      end
+
+      private
+
+      def set_customer_group
+        @customer_group = current_store.customer_groups.find(params[:customer_group_id])
+      end
+
+      def model_class
+        Spree.user_class
+      end
+
+      def scope
+        @customer_group.users.includes(:bill_address, :ship_address, avatar_attachment: :blob)
+      end
+
+      def collection_includes
+        [:bill_address, :ship_address, { avatar_attachment: :blob }]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Spree
+  module Admin
+    class CustomerGroupsController < ResourceController
+      add_breadcrumb_icon 'users'
+      add_breadcrumb Spree.t(:customer_groups), :admin_customer_groups_path
+
+      def select_options
+        q = params[:q]
+        ransack_params = q.is_a?(String) ? { name_cont: q } : q
+        customer_groups = current_store.customer_groups.accessible_by(current_ability).ransack(ransack_params).result.order(:name).limit(50)
+
+        render json: customer_groups.pluck(:id, :name).map { |id, name| { id: id, name: name } }
+      end
+
+      def show
+        add_breadcrumb @customer_group.name
+      end
+
+      private
+
+      def location_after_create
+        spree.admin_customer_group_path(@customer_group)
+      end
+
+      def update_turbo_stream_enabled?
+        true
+      end
+
+      def model_class
+        Spree::CustomerGroup
+      end
+
+      def collection
+        return @collection if defined?(@collection)
+
+        @collection = super.for_store(current_store)
+      end
+
+      def permitted_resource_params
+        params.require(:customer_group).permit(permitted_customer_group_attributes)
+      end
+    end
+  end
+end

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

@@ -50,6 +50,7 @@ module Spree
       end
 
       def gift_cards_filter_dropdown_value
+        Spree::Deprecation.warn("gift_cards_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
         if params.dig(:q, :active).present?
           Spree.t('admin.gift_cards.active')
         elsif params.dig(:q, :expired).present?

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

@@ -4,7 +4,7 @@ module Spree
       belongs_to 'spree/option_type', find_by: :id
 
       def select_options
-        render json: @option_type.option_values.to_tom_select_json
+        render json: @option_type.option_values.accessible_by(current_ability).to_tom_select_json
       end
 
       private

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

@@ -0,0 +1,120 @@
+module Spree
+  module Admin
+    module Orders
+      class AdjustmentsController < Spree::Admin::BaseController
+        include Spree::Admin::OrderConcern
+
+        before_action :load_order
+        before_action :load_adjustment, except: [:new, :create]
+
+        layout 'turbo_rails/frame'
+
+        # GET /admin/orders/:order_id/adjustments/new
+        def new
+          @adjustment = @order.adjustments.new
+        end
+
+        # POST /admin/orders/:order_id/adjustments
+        def create
+          @adjustment = @order.adjustments.new(permitted_resource_params)
+          @adjustment.order = @order
+          @adjustment.label = params.dig(:adjustment, :label).presence || Spree.t(:manual_adjustment)
+          @adjustment.state = 'closed'
+
+          if @adjustment.save
+            @order.update_with_updater!
+            flash.now[:success] = Spree.t(:successfully_created, resource: Spree.t(:adjustment))
+
+            load_order_items
+
+            respond_to do |format|
+              format.turbo_stream
+              format.html { redirect_to spree.edit_admin_order_path(@order) }
+            end
+          else
+            flash.now[:error] = @adjustment.errors.full_messages.to_sentence
+            respond_to do |format|
+              format.turbo_stream
+              format.html { render :new, status: :unprocessable_entity }
+            end
+          end
+        end
+
+        # GET /admin/orders/:order_id/adjustments/:id/edit
+        def edit; end
+
+        # PATCH /admin/orders/:order_id/adjustments/:id
+        def update
+          if @adjustment.update(permitted_resource_params)
+            @adjustment.close if @adjustment.open?
+            @order.update_with_updater!
+            flash.now[:success] = Spree.t(:successfully_updated, resource: Spree.t(:adjustment))
+
+            load_order_items
+
+            respond_to do |format|
+              format.turbo_stream
+              format.html { redirect_to spree.edit_admin_order_path(@order) }
+            end
+          else
+            flash.now[:error] = @adjustment.errors.full_messages.to_sentence
+            render :edit, status: :unprocessable_entity
+          end
+        end
+
+        # DELETE /admin/orders/:order_id/adjustments/:id
+        def destroy
+          if @adjustment.destroy
+            @order.update_with_updater!
+            load_order_items
+            flash.now[:success] = Spree.t(:successfully_removed, resource: Spree.t(:adjustment))
+          else
+            flash.now[:error] = @adjustment.errors.full_messages.to_sentence
+          end
+
+          respond_to do |format|
+            format.turbo_stream
+            format.html { redirect_to spree.edit_admin_order_path(@order) }
+          end
+        end
+
+        # PUT /admin/orders/:order_id/adjustments/:id/toggle_state
+        def toggle_state
+          if @adjustment.closed?
+            @adjustment.open
+          else
+            @adjustment.close
+          end
+
+          @order.update_with_updater!
+          flash.now[:success] = Spree.t(:successfully_updated, resource: Spree.t(:adjustment))
+
+          respond_to do |format|
+            format.turbo_stream
+            format.html { redirect_to spree.edit_admin_order_path(@order) }
+          end
+        end
+
+        private
+
+        def model_class
+          Spree::Adjustment
+        end
+
+        def load_order
+          @order = current_store.orders.find_by!(number: params[:order_id])
+          authorize! :update, @order
+        end
+
+        def load_adjustment
+          @adjustment = @order.all_adjustments.find(params[:id])
+          authorize! action, @adjustment
+        end
+
+        def permitted_resource_params
+          params.require(:adjustment).permit(:amount, :label)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module Spree
+  module Admin
+    module Orders
+      class OrderPromotionsController < Spree::Admin::BaseController
+        include Spree::Admin::OrderConcern
+
+        before_action :load_order
+        before_action :load_order_promotion, only: :destroy
+
+        layout 'turbo_rails/frame'
+
+        # GET /admin/orders/:order_id/order_promotions/new
+        def new; end
+
+        # POST /admin/orders/:order_id/order_promotions
+        def create
+          authorize! :update, @order
+
+          @order.coupon_code = params[:coupon_code]
+
+          @handler = Spree::PromotionHandler::Coupon.new(@order)
+          @handler.apply
+
+          if @handler.successful?
+            flash.now[:success] = @handler.success
+            @order.reload
+            load_order_items
+          else
+            flash.now[:error] = @handler.error
+          end
+        end
+
+        # DELETE /admin/orders/:order_id/promotions/:id
+        def destroy
+          authorize! :update, @order
+
+          coupon_code = @order_promotion.code.presence || @order_promotion.name
+
+          @handler = Spree::PromotionHandler::Coupon.new(@order)
+          @handler.remove(coupon_code)
+
+          if @handler.successful?
+            flash.now[:success] = @handler.success
+            @order.reload
+            load_order_items
+          else
+            flash.now[:error] = @handler.error
+          end
+        end
+
+        private
+
+        def load_order_promotion
+          @order_promotion = @order.order_promotions.find(params[:id])
+        end
+      end
+    end
+  end
+end

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

@@ -4,14 +4,13 @@ module Spree
       include Spree::Admin::OrderConcern
       include Spree::Admin::OrdersFiltersHelper
       include Spree::Admin::OrderBreadcrumbConcern
+      include Spree::Admin::TableConcern
 
       before_action :initialize_order_events
-      before_action :load_order, only: %i[edit cancel resend destroy]
-      before_action :load_order_items, only: :edit
+      before_action :load_order, only: %i[show edit cancel resend destroy]
+      before_action :load_order_items, only: :show
       before_action :load_user, only: [:index]
 
-      helper_method :model_class, :object_url
-
       # GET /admin/orders/new
       def new
         @order = current_store.orders.new
@@ -29,23 +28,23 @@ module Spree
         end
       end
 
-      # GET /admin/orders/:id/edit
-      def edit
+      # GET /admin/orders/:id
+      def show
         unless @order.completed?
           add_breadcrumb Spree.t(:draft_orders), :admin_checkouts_path
         end
 
-        add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
+        add_breadcrumb @order.number, spree.admin_order_path(@order)
       end
 
-      # GET /admin/orders
-      def index
-        params[:q] ||= {}
-        params[:q][:s] ||= 'completed_at desc'
-
-        load_orders
+      # GET /admin/orders/:id/edit
+      def edit
+        redirect_to spree.admin_order_path(@order)
       end
 
+      # GET /admin/orders
+      def index; end
+
       # PUT /admin/orders/:id/cancel
       def cancel
         @order.canceled_by(try_spree_current_user)
@@ -55,11 +54,11 @@ module Spree
 
       # POST /admin/orders/:id/resend
       def resend
-        @order.deliver_order_confirmation_email
-        if @order.errors.any?
-          flash[:error] = @order.errors.full_messages.join(', ')
-        else
+        if @order.completed?
+          Spree::Events.publish('order.resend_confirmation_email', { 'id' => @order.id })
           flash[:success] = Spree.t(:order_email_resent)
+        else
+          flash[:error] = Spree.t(:order_email_resent_error)
         end
 
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
@@ -86,7 +85,15 @@ module Spree
           base_scope.complete
         else
           base_scope
-        end
+        end.includes(collection_includes)
+      end
+
+      def collection_default_sort
+        'completed_at desc'
+      end
+
+      def collection_includes
+        { user: [], payments: [], refunds: [], shipments: :stock_location }
       end
 
       def order_params
@@ -99,17 +106,6 @@ module Spree
         authorize! action, @order
       end
 
-      def load_order_items
-        @line_items = @order.line_items.includes(variant: [:product, :option_values])
-        @shipments = @order.shipments.includes(:inventory_units, :selected_shipping_rate,
-                                               shipping_rates: [:shipping_method, :tax_rate]).order(:created_at)
-        @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
-        @refunds = @order.refunds
-
-        @return_authorizations = @order.return_authorizations.includes(:return_items)
-        @customer_returns = @order.customer_returns.distinct
-      end
-
       # Used for extensions which need to provide their own custom event links on the order details view.
       def initialize_order_events
         @order_events = %w{approve cancel resume}
@@ -127,6 +123,10 @@ module Spree
       def permitted_resource_params
         params.require(:order).permit(permitted_order_attributes)
       end
+
+      def update_turbo_stream_enabled?
+        true
+      end
     end
   end
 end

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

@@ -1,10 +1,16 @@
 module Spree
   module Admin
     class PostCategoriesController < ResourceController
-      include StorefrontBreadcrumbConcern
+      include Spree::Admin::TableConcern
+
       add_breadcrumb Spree.t(:posts), :admin_posts_path
       add_breadcrumb Spree.t(:categories), :admin_post_categories_path
 
+      def select_options
+        post_categories = current_store.post_categories.accessible_by(current_ability)
+        render json: post_categories.pluck(:id, :title).map { |id, title| { id: id, name: title } }
+      end
+
       private
 
       def permitted_resource_params

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

@@ -1,15 +1,16 @@
 module Spree
   module Admin
     class PostsController < ResourceController
+      include Spree::Admin::TableConcern
+
       before_action :load_post_categories
 
-      include StorefrontBreadcrumbConcern
       add_breadcrumb Spree.t(:posts), :admin_posts_path
 
       before_action :add_breadcrumb_for_post, only: [:edit, :update]
 
       def select_options
-        render json: current_store.posts.published.to_tom_select_json
+        render json: current_store.posts.published.accessible_by(current_ability).to_tom_select_json
       end
 
       private

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

@@ -0,0 +1,49 @@
+module Spree
+  module Admin
+    class PriceListProductsController < ResourceController
+      include BulkOperationsConcern
+
+      belongs_to 'spree/price_list', find_by: :id
+
+      before_action :set_price_list
+
+      # GET /admin/price_lists/:price_list_id/products/bulk_new
+      def bulk_new
+        @currency = params[:currency] || current_store.default_currency
+      end
+
+      # POST /admin/price_lists/:price_list_id/products/bulk_create.turbo_stream
+      def bulk_create
+        @price_list.add_products(bulk_collection.pluck(:id))
+
+        @collection = collection
+
+        flash.now[:success] = Spree.t(:products_added)
+      end
+
+      # DELETE /admin/price_lists/:price_list_id/products/bulk_destroy.turbo_stream
+      def bulk_destroy
+        @price_list.remove_products(bulk_collection.pluck(:id))
+        flash.now[:success] = Spree.t(:products_removed)
+      end
+
+      private
+
+      def set_price_list
+        @price_list = parent
+      end
+
+      def model_class
+        Spree::Product
+      end
+
+      def scope
+        parent.products.distinct
+      end
+
+      def edit_object_url(object, options = {})
+        spree.edit_admin_product_path(object, options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+module Spree
+  module Admin
+    class PriceListsController < ResourceController
+      include ProductsBreadcrumbConcern
+
+      # GET /admin/price_lists/:price_list_id/edit_prices
+      def edit_prices
+        @currency = params[:currency] || current_store.default_currency
+        @currency_symbol = ::Money::Currency.find(@currency).symbol
+        @prices = @price_list.prices.
+                  includes(variant: [:product, { option_values: :option_type }]).
+                  where(currency: @currency).
+                  joins(variant: :product).
+                  order("#{Spree::Product.table_name}.name ASC", "#{Spree::Variant.table_name}.position ASC")
+      end
+
+      # PUT /admin/price_lists/:id/activate
+      def activate
+        if @price_list.starts_at.present?
+          @price_list.schedule!
+          flash[:success] = Spree.t('admin.price_lists.scheduled')
+        else
+          @price_list.activate!
+          flash[:success] = Spree.t('admin.price_lists.activated')
+        end
+        redirect_to spree.admin_price_list_path(@price_list)
+      end
+
+      # PUT /admin/price_lists/:id/deactivate
+      def deactivate
+        @price_list.deactivate!
+        flash[:success] = Spree.t('admin.price_lists.deactivated')
+        redirect_to spree.admin_price_list_path(@price_list)
+      end
+
+      private
+
+      def location_after_save
+        spree.admin_price_list_path(@price_list)
+      end
+
+      def update_turbo_stream_enabled?
+        true
+      end
+
+      def permitted_resource_params
+        params.require(:price_list).permit(
+          permitted_price_list_attributes,
+          prices_attributes: [:id, :variant_id, :currency, :amount, :compare_at_amount]
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module Spree
+  module Admin
+    class PriceRulesController < ResourceController
+      belongs_to 'spree/price_list', find_by: :id
+
+      helper_method :allowed_rule_types
+
+      private
+
+      def model_class
+        @model_class = if params.dig(:price_rule, :type).present?
+                         rule_type = params.dig(:price_rule, :type)
+                         rule_class = allowed_rule_types.find { |klass| klass.name.to_s == rule_type }
+
+                         raise 'Unknown price rule type' unless rule_class
+
+                         rule_class
+                       else
+                         Spree::PriceRule
+                       end
+      end
+
+      def build_resource
+        model_class.new(price_list: parent)
+      end
+
+      def allowed_rule_types
+        Spree.pricing.rules
+      end
+
+      def location_after_save
+        collection_url
+      end
+
+      def collection_url
+        spree.admin_price_list_path(parent)
+      end
+
+      def permitted_resource_params
+        permitted_preference_keys = @object.preferences.map do |key, value|
+          if value.is_a?(Array)
+            { "preferred_#{key}" => [] }
+          else
+            "preferred_#{key}"
+          end
+        end
+
+        params.require(:price_rule).permit(:type, *permitted_preference_keys)
+      end
+    end
+  end
+end