solidus_admin 0.2.0 → 0.3.1

data/app/controllers/solidus_admin/return_reasons_controller.rb

@@ -4,19 +4,86 @@ module SolidusAdmin
   class ReturnReasonsController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      return_reasons = apply_search_to(
-        Spree::ReturnReason.unscoped.order(id: :desc),
-        param: :q,
-      )
+    before_action :set_return_reason, only: %i[edit update]
 
-      set_page_and_extract_portion_from(return_reasons)
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('return_reasons/index').new(page: @page) }
       end
     end
 
+    def new
+      @return_reason = Spree::ReturnReason.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('return_reasons/new').new(page: @page, return_reason: @return_reason) }
+      end
+    end
+
+    def create
+      @return_reason = Spree::ReturnReason.new(return_reason_params)
+
+      if @return_reason.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.return_reasons_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('return_reasons/new').new(page: @page, return_reason: @return_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('return_reasons/edit').new(page: @page, return_reason: @return_reason) }
+      end
+    end
+
+    def update
+      if @return_reason.update(return_reason_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.return_reasons_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('return_reasons/edit').new(page: @page, return_reason: @return_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
     def destroy
       @return_reason = Spree::ReturnReason.find_by!(id: params[:id])
 
@@ -28,13 +95,21 @@ module SolidusAdmin
 
     private
 
-    def load_return_reason
-      @return_reason = Spree::ReturnReason.find_by!(id: params[:id])
-      authorize! action_name, @return_reason
+    def set_return_reason
+      @return_reason = Spree::ReturnReason.find(params[:id])
+    end
+
+    def set_index_page
+      return_reasons = apply_search_to(
+        Spree::ReturnReason.unscoped.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(return_reasons)
     end
 
     def return_reason_params
-      params.require(:return_reason).permit(:return_reason_id, permitted_return_reason_attributes)
+      params.require(:return_reason).permit(:name, :active)
     end
   end
 end

data/app/controllers/solidus_admin/roles_controller.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  class RolesController < SolidusAdmin::BaseController
+    include SolidusAdmin::ControllerHelpers::Search
+
+    before_action :set_role, only: %i[edit update]
+
+    search_scope(:all)
+    search_scope(:admin) { _1.where(name: "admin") }
+
+    def index
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('roles/index').new(page: @page) }
+      end
+    end
+
+    def new
+      @role = Spree::Role.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('roles/new').new(page: @page, role: @role) }
+      end
+    end
+
+    def create
+      @role = Spree::Role.new(role_params)
+
+      if @role.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.roles_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('roles/new').new(page: @page, role: @role)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('roles/edit').new(page: @page, role: @role) }
+      end
+    end
+
+    def update
+      if @role.update(role_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.roles_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('roles/edit').new(page: @page, role: @role)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def destroy
+      @roles = Spree::Role.where(id: params[:id])
+
+      Spree::Role.transaction { @roles.destroy_all }
+
+      flash[:notice] = t('.success')
+      redirect_back_or_to solidus_admin.roles_path, status: :see_other
+    end
+
+    private
+
+    def set_role
+      @role = Spree::Role.find(params[:id])
+    end
+
+    def set_index_page
+      roles = apply_search_to(
+        Spree::Role.unscoped.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(roles)
+    end
+
+    def role_params
+      params.require(:role).permit(:role_id, :name, :description, permission_set_ids: [])
+    end
+  end
+end

data/app/controllers/solidus_admin/shipping_categories_controller.rb

@@ -4,19 +4,88 @@ module SolidusAdmin
   class ShippingCategoriesController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      shipping_categories = apply_search_to(
-        Spree::ShippingCategory.order(id: :desc),
-        param: :q,
-      )
+    before_action :set_shipping_category, only: %i[edit update]
 
-      set_page_and_extract_portion_from(shipping_categories)
+    def new
+      @shipping_category = Spree::ShippingCategory.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('shipping_categories/new').new(page: @page, shipping_category: @shipping_category) }
+      end
+    end
+
+    def create
+      @shipping_category = Spree::ShippingCategory.new(shipping_category_params)
+
+      if @shipping_category.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.shipping_categories_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            # we need to explicitly write the refresh tag for now.
+            # See https://github.com/hotwired/turbo-rails/issues/579
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('shipping_categories/new').new(page: @page, shipping_category: @shipping_category)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('shipping_categories/index').new(page: @page) }
       end
     end
 
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('shipping_categories/edit').new(page: @page, shipping_category: @shipping_category) }
+      end
+    end
+
+    def update
+      if @shipping_category.update(shipping_category_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.shipping_categories_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('shipping_categories/edit').new(page: @page, shipping_category: @shipping_category)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
     def destroy
       @shipping_category = Spree::ShippingCategory.find_by!(id: params[:id])
 
@@ -28,13 +97,21 @@ module SolidusAdmin
 
     private
 
-    def load_shipping_category
-      @shipping_category = Spree::ShippingCategory.find_by!(id: params[:id])
-      authorize! action_name, @shipping_category
+    def set_shipping_category
+      @shipping_category = Spree::ShippingCategory.find(params[:id])
     end
 
     def shipping_category_params
-      params.require(:shipping_category).permit(:shipping_category_id, permitted_shipping_category_attributes)
+      params.require(:shipping_category).permit(:name)
+    end
+
+    def set_index_page
+      shipping_categories = apply_search_to(
+        Spree::ShippingCategory.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(shipping_categories)
     end
   end
 end

data/app/controllers/solidus_admin/shipping_methods_controller.rb

@@ -28,11 +28,6 @@ module SolidusAdmin
 
     private
 
-    def load_shipping_method
-      @shipping_method = Spree::ShippingMethod.find_by!(number: params[:id])
-      authorize! action_name, @shipping_method
-    end
-
     def shipping_method_params
       params.require(:shipping_method).permit(:shipping_method_id, permitted_shipping_method_attributes)
     end

data/app/controllers/solidus_admin/stock_items_controller.rb

@@ -26,14 +26,14 @@ module SolidusAdmin
 
     def update
       quantity_adjustment = params[:quantity_adjustment].to_i
-      @stock_item.assign_attributes(stock_item_params.except(:page, :q))
+      @stock_item.assign_attributes(stock_item_params)
       @stock_item.stock_movements.build(quantity: quantity_adjustment, originator: current_solidus_admin_user)
 
       if @stock_item.save
-        redirect_to solidus_admin.stock_items_path(
-          page: stock_item_params[:page].to_i.presence,
-          q: stock_item_params[:q].presence&.then { |q| JSON.parse(q) }
-        ), status: :see_other
+        respond_to do |format|
+          format.html { redirect_to solidus_admin.stock_items_path, status: :see_other }
+          format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+        end
       else
         respond_to do |format|
           format.html { render component('stock_items/edit').new(stock_item: @stock_item, page: @page), status: :unprocessable_entity }
@@ -61,7 +61,7 @@ module SolidusAdmin
     end
 
     def stock_item_params
-      params.require(:stock_item).permit(:backorderable, :page, :q)
+      params.require(:stock_item).permit(:backorderable)
     end
   end
 end

data/app/controllers/solidus_admin/stock_locations_controller.rb

@@ -28,11 +28,6 @@ module SolidusAdmin
 
     private
 
-    def load_stock_location
-      @stock_location = Spree::StockLocation.find_by!(number: params[:id])
-      authorize! action_name, @stock_location
-    end
-
     def stock_location_params
       params.require(:stock_location).permit(:stock_location_id, permitted_stock_location_attributes)
     end

data/app/controllers/solidus_admin/store_credit_reasons_controller.rb

@@ -4,19 +4,86 @@ module SolidusAdmin
   class StoreCreditReasonsController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      store_credit_reasons = apply_search_to(
-        Spree::StoreCreditReason.unscoped.order(id: :desc),
-        param: :q,
-      )
+    before_action :set_store_credit_reason, only: %i[edit update]
 
-      set_page_and_extract_portion_from(store_credit_reasons)
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('store_credit_reasons/index').new(page: @page) }
       end
     end
 
+    def new
+      @store_credit_reason = Spree::StoreCreditReason.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('store_credit_reasons/new').new(page: @page, store_credit_reason: @store_credit_reason) }
+      end
+    end
+
+    def create
+      @store_credit_reason = Spree::StoreCreditReason.new(store_credit_reason_params)
+
+      if @store_credit_reason.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.store_credit_reasons_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('store_credit_reasons/new').new(page: @page, store_credit_reason: @store_credit_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('store_credit_reasons/edit').new(page: @page, store_credit_reason: @store_credit_reason) }
+      end
+    end
+
+    def update
+      if @store_credit_reason.update(store_credit_reason_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.store_credit_reasons_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('store_credit_reasons/edit').new(page: @page, store_credit_reason: @store_credit_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
     def destroy
       @store_credit_reason = Spree::StoreCreditReason.find_by!(id: params[:id])
 
@@ -28,13 +95,21 @@ module SolidusAdmin
 
     private
 
-    def load_store_credit_reason
-      @store_credit_reason = Spree::StoreCreditReason.find_by!(id: params[:id])
-      authorize! action_name, @store_credit_reason
+    def set_store_credit_reason
+      @store_credit_reason = Spree::StoreCreditReason.find(params[:id])
     end
 
     def store_credit_reason_params
-      params.require(:store_credit_reason).permit(:store_credit_reason_id, permitted_store_credit_reason_attributes)
+      params.require(:store_credit_reason).permit(:name, :active)
+    end
+
+    def set_index_page
+      store_credit_reasons = apply_search_to(
+        Spree::StoreCreditReason.unscoped.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(store_credit_reasons)
     end
   end
 end

data/app/controllers/solidus_admin/stores_controller.rb

@@ -28,11 +28,6 @@ module SolidusAdmin
 
     private
 
-    def load_store
-      @store = Spree::Store.find_by!(number: params[:id])
-      authorize! action_name, @store
-    end
-
     def store_params
       params.require(:store).permit(:store_id, permitted_store_attributes)
     end

data/app/controllers/solidus_admin/tax_categories_controller.rb

@@ -4,13 +4,84 @@ module SolidusAdmin
   class TaxCategoriesController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      tax_categories = apply_search_to(
-        Spree::TaxCategory.order(created_at: :desc, id: :desc),
-        param: :q,
-      )
+    before_action :set_tax_category, only: %i[edit update]
 
-      set_page_and_extract_portion_from(tax_categories)
+    def new
+      @tax_category = Spree::TaxCategory.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('tax_categories/new').new(page: @page, tax_category: @tax_category) }
+      end
+    end
+
+    def edit
+      @tax_category = Spree::TaxCategory.find(params[:id])
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('tax_categories/edit').new(page: @page, tax_category: @tax_category) }
+      end
+    end
+
+    def create
+      @tax_category = Spree::TaxCategory.new(tax_category_params)
+
+      if @tax_category.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.tax_categories_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            # we need to explicitly write the refresh tag for now.
+            # See https://github.com/hotwired/turbo-rails/issues/579
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('tax_categories/new').new(page: @page, tax_category: @tax_category)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def update
+      if @tax_category.update(tax_category_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.tax_categories_path, status: :see_other
+          end
+
+          format.turbo_stream do
+            render turbo_stream: '<turbo-stream action="refresh" />'
+          end
+        end
+      else
+        set_index_page
+
+        respond_to do |format|
+          format.html do
+            page_component = component('tax_categories/edit').new(page: @page, tax_category: @tax_category)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('tax_categories/index').new(page: @page) }
@@ -28,13 +99,21 @@ module SolidusAdmin
 
     private
 
-    def load_tax_category
-      @tax_category = Spree::TaxCategory.find_by!(number: params[:id])
-      authorize! action_name, @tax_category
+    def set_tax_category
+      @tax_category = Spree::TaxCategory.find(params[:id])
     end
 
     def tax_category_params
-      params.require(:tax_category).permit(:tax_category_id, permitted_tax_category_attributes)
+      params.require(:tax_category).permit(:name, :description, :is_default, :tax_code)
+    end
+
+    def set_index_page
+      tax_categories = apply_search_to(
+        Spree::TaxCategory.order(created_at: :desc, id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(tax_categories)
     end
   end
 end

data/app/controllers/solidus_admin/tax_rates_controller.rb

@@ -28,11 +28,6 @@ module SolidusAdmin
 
     private
 
-    def load_tax_rate
-      @tax_rate = Spree::TaxRate.find_by!(number: params[:id])
-      authorize! action_name, @tax_rate
-    end
-
     def tax_rate_params
       params.require(:tax_rate).permit(:tax_rate_id, permitted_tax_rate_attributes)
     end